Merge pull request #27 from Slivo-fr/develop

Release 1.11

Author: Slivo-fr

Elinor/CalculateDataThread.cs

@@ -48,7 +48,7 @@ internal static double NpcBroker(Profile profile)
 
         internal static double SalesTax(int accounting)
         {
-            return .080*(1 - (accounting*.11));
+            return .045*(1 - (accounting*.11));
         }
 
         internal void Run()

Elinor/Properties/AssemblyInfo.cs

@@ -49,5 +49,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.10.0.0")]
-[assembly: AssemblyFileVersion("1.10.0.0")]
+[assembly: AssemblyVersion("1.11.0.0")]
+[assembly: AssemblyFileVersion("1.11.0.0")]

Elinor/currentVersion.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <elinor>
-	<version>1.10.0.0</version>
+	<version>1.11.0.0</version>
 	<url>https://github.com/Slivo-fr/elinor-reloaded/releases</url>
 </elinor>
 

Setup/Setup.vdproj

@@ -266,15 +266,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Elinor reloaded"
-        "ProductCode" = "8:{DE8E1C55-71C7-4745-AEC1-C1D95C3F8801}"
-        "PackageCode" = "8:{96889B37-4514-4ECE-B44D-1D5503213283}"
+        "ProductCode" = "8:{C2C51E60-8FAB-45A3-8E8B-38666D98392A}"
+        "PackageCode" = "8:{EC7EB054-626B-44A2-917F-A9868EC2425A}"
         "UpgradeCode" = "8:{F54F50ED-FDA6-4419-B476-E665ADA1FCBC}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.10.0"
+        "ProductVersion" = "8:1.11.0"
         "Manufacturer" = "8:Slivo"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
@@ -849,7 +849,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_03585DC2BD1048A19B1FB7CB5F6533F2"
             {
-            "SourcePath" = "8:..\\Elinor\\obj\\x86\\Debug\\Elinor.exe"
+            "SourcePath" = "8:..\\Elinor\\obj\\x86\\Release\\Elinor.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_1022C19006BB4A9C811CB9D8739B72B3"