diff --git a/Dead Matter Server Manager/.vs/Dead Matter Server Manager/v16/.suo b/Dead Matter Server Manager/.vs/Dead Matter Server Manager/v16/.suo index 105e316..aa263e2 100644 Binary files a/Dead Matter Server Manager/.vs/Dead Matter Server Manager/v16/.suo and b/Dead Matter Server Manager/.vs/Dead Matter Server Manager/v16/.suo differ diff --git a/Dead Matter Server Manager/Dead Matter Server Manager/Form1.cs b/Dead Matter Server Manager/Dead Matter Server Manager/Form1.cs index aa43108..28b922e 100644 --- a/Dead Matter Server Manager/Dead Matter Server Manager/Form1.cs +++ b/Dead Matter Server Manager/Dead Matter Server Manager/Form1.cs @@ -170,7 +170,14 @@ private void CheckAppData() if (s.StartsWith("TimerRestartTime")) { String[] temp = s.Split('='); - restartServerTime.Text = Convert.ToString(Convert.ToDouble(temp[1]) * 60); + try + { + restartServerTime.Text = Convert.ToString(Convert.ToDouble(temp[1]) * 60); + } + catch + { + //do nowt + } } if (s.StartsWith("MinsTimerRestartTime")) diff --git a/Dead Matter Server Manager/Dead Matter Server Manager/Properties/AssemblyInfo.cs b/Dead Matter Server Manager/Dead Matter Server Manager/Properties/AssemblyInfo.cs index 167ee66..793a7ab 100644 --- a/Dead Matter Server Manager/Dead Matter Server Manager/Properties/AssemblyInfo.cs +++ b/Dead Matter Server Manager/Dead Matter Server Manager/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // 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("1.6.12.0")] -[assembly: AssemblyFileVersion("1.6.12.0")] +[assembly: AssemblyVersion("1.6.13.0")] +[assembly: AssemblyFileVersion("1.6.13.0")] diff --git a/Dead Matter Server Manager/Dead Matter Server Manager/bin/x64/Debug/Dead Matter Server Manager.exe b/Dead Matter Server Manager/Dead Matter Server Manager/bin/x64/Debug/Dead Matter Server Manager.exe index b1753fb..797ee64 100644 Binary files a/Dead Matter Server Manager/Dead Matter Server Manager/bin/x64/Debug/Dead Matter Server Manager.exe and b/Dead Matter Server Manager/Dead Matter Server Manager/bin/x64/Debug/Dead Matter Server Manager.exe differ diff --git a/Dead Matter Server Manager/Dead Matter Server Manager/bin/x64/Debug/Dead Matter Server Manager.pdb b/Dead Matter Server Manager/Dead Matter Server Manager/bin/x64/Debug/Dead Matter Server Manager.pdb index 993d62c..0a8f31e 100644 Binary files a/Dead Matter Server Manager/Dead Matter Server Manager/bin/x64/Debug/Dead Matter Server Manager.pdb and b/Dead Matter Server Manager/Dead Matter Server Manager/bin/x64/Debug/Dead Matter Server Manager.pdb differ diff --git a/Dead Matter Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.csproj.GenerateResource.cache b/Dead Matter Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.csproj.GenerateResource.cache index a7deabb..4510bb8 100644 Binary files a/Dead Matter Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.csproj.GenerateResource.cache and b/Dead Matter Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.csproj.GenerateResource.cache differ diff --git a/Dead Matter Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.csprojAssemblyReference.cache b/Dead Matter Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.csprojAssemblyReference.cache index fbe3917..3d588d2 100644 Binary files a/Dead Matter Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.csprojAssemblyReference.cache and b/Dead Matter Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.csprojAssemblyReference.cache differ diff --git a/Dead Matter Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.exe b/Dead Matter Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.exe index b1753fb..797ee64 100644 Binary files a/Dead Matter Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.exe and b/Dead Matter Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.exe differ diff --git a/Dead Matter Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.pdb b/Dead Matter Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.pdb index 993d62c..0a8f31e 100644 Binary files a/Dead Matter Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.pdb and b/Dead Matter Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.pdb differ diff --git a/Dead Matter Server Manager/DeadMatterServerManagerInstaller/DeadMatterServerManagerInstaller.vdproj b/Dead Matter Server Manager/DeadMatterServerManagerInstaller/DeadMatterServerManagerInstaller.vdproj index f238454..ea525b4 100644 --- a/Dead Matter Server Manager/DeadMatterServerManagerInstaller/DeadMatterServerManagerInstaller.vdproj +++ b/Dead Matter Server Manager/DeadMatterServerManagerInstaller/DeadMatterServerManagerInstaller.vdproj @@ -529,15 +529,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Dead Matter Server Manager" - "ProductCode" = "8:{FEC110B2-AA52-42AB-B5BD-AFB7045DF93F}" - "PackageCode" = "8:{EF4A9CAD-3A2D-478B-A761-A9AE6C721B90}" + "ProductCode" = "8:{EDFCAA39-1F4E-4966-96CF-6061F15E0523}" + "PackageCode" = "8:{B92DE7C4-74A1-4F65-8ACD-3EAFEB0034E6}" "UpgradeCode" = "8:{BC345328-E944-4F2F-9559-E95043070B11}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.6.12" + "ProductVersion" = "8:1.6.13" "Manufacturer" = "8:winglessraven" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" @@ -546,7 +546,7 @@ "ARPCONTACT" = "8:Dave Ross" "Keywords" = "8:" "ARPCOMMENTS" = "8:Dead Matter Server Manager" - "ARPURLINFOABOUT" = "8:www.winglessraven.com" + "ARPURLINFOABOUT" = "8:www.winglessraven.com/DMSM" "ARPPRODUCTICON" = "8:_06460ADA370849B79DB9F36DEE9D1A94" "ARPIconIndex" = "3:0" "SearchPath" = "8:" diff --git a/Dead Matter Server Manager/DeadMatterServerManagerInstaller/Debug/DeadMatterServerManager.msi b/Dead Matter Server Manager/DeadMatterServerManagerInstaller/Debug/DeadMatterServerManager.msi index 7d9225c..95843e7 100644 Binary files a/Dead Matter Server Manager/DeadMatterServerManagerInstaller/Debug/DeadMatterServerManager.msi and b/Dead Matter Server Manager/DeadMatterServerManagerInstaller/Debug/DeadMatterServerManager.msi differ