From 8f533e8fd7dd1f790393726fb6fcbb71b215399a Mon Sep 17 00:00:00 2001
From: Ben <ben-wallis@users.noreply.github.com>
Date: Fri, 3 Jul 2015 21:19:25 +0100
Subject: [PATCH] Fixed localised decimal bug and tidied up About Window

---
 Filtration/Properties/AssemblyInfo.cs        | 2 +-
 Filtration/Resources/ItemBaseTypes.txt       | 1 +
 Filtration/ViewModels/MainWindowViewModel.cs | 4 ++--
 Filtration/Views/ReplaceColorsWindow.xaml    | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Filtration/Properties/AssemblyInfo.cs b/Filtration/Properties/AssemblyInfo.cs
index dc4bb9b..7713caa 100644
--- a/Filtration/Properties/AssemblyInfo.cs
+++ b/Filtration/Properties/AssemblyInfo.cs
@@ -50,7 +50,7 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.4.*")]
+[assembly: AssemblyVersion("0.5.*")]
 
 [assembly: InternalsVisibleTo("Filtration.Tests")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
\ No newline at end of file
diff --git a/Filtration/Resources/ItemBaseTypes.txt b/Filtration/Resources/ItemBaseTypes.txt
index f9e7323..1c77a50 100644
--- a/Filtration/Resources/ItemBaseTypes.txt
+++ b/Filtration/Resources/ItemBaseTypes.txt
@@ -23,6 +23,7 @@ Decoy Totem
 Desecrate
 Determination
 Detonate Dead
+Detonate Mines
 Devouring Totem
 Discharge
 Discipline
diff --git a/Filtration/ViewModels/MainWindowViewModel.cs b/Filtration/ViewModels/MainWindowViewModel.cs
index 453df95..eb99a0f 100644
--- a/Filtration/ViewModels/MainWindowViewModel.cs
+++ b/Filtration/ViewModels/MainWindowViewModel.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Reflection;
 using System.Threading.Tasks;
@@ -139,7 +140,6 @@ namespace Filtration.ViewModels
                 }
             });
             CheckForUpdates();
-            throw new Exception("Test of dispatcher exception handler");
         }
 
         public RelayCommand OpenScriptCommand { get; private set; }
@@ -178,7 +178,7 @@ namespace Filtration.ViewModels
         {
             var assembly = Assembly.GetExecutingAssembly();
             var assemblyVersion = FileVersionInfo.GetVersionInfo(assembly.Location);
-            var currentVersion = Convert.ToDecimal(assemblyVersion.FileMajorPart + "." + assemblyVersion.FileMinorPart);
+            var currentVersion = Convert.ToDecimal(assemblyVersion.FileMajorPart + CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator + assemblyVersion.FileMinorPart);
 
             var result = await _updateCheckService.GetUpdateData();
 
diff --git a/Filtration/Views/ReplaceColorsWindow.xaml b/Filtration/Views/ReplaceColorsWindow.xaml
index a932a5e..918f707 100644
--- a/Filtration/Views/ReplaceColorsWindow.xaml
+++ b/Filtration/Views/ReplaceColorsWindow.xaml
@@ -8,7 +8,7 @@
         xmlns:userControls="clr-namespace:Filtration.UserControls"
         mc:Ignorable="d"
         d:DataContext="{d:DesignInstance Type=viewModels:ReplaceColorsViewModel}"
-        Title="Replace Script Colors" Height="245" Width="515"
+        Title="Replace Script Colors" Height="280" Width="540"
         BorderThickness="1" BorderBrush="Black"
         Loaded="ReplaceColorsWindow_OnLoaded" ResizeMode="CanMinimize">
     <!--ShowMaxRestoreButton="False"-->