published version 1.1.2.5

msarilar · May 16, 2018 · 1c5e020 · 1c5e020
1 parent 9f4385e
commit 1c5e020
Show file tree

Hide file tree

Showing 27 changed files with 418 additions and 11 deletions.
diff --git a/EDEngineer.Models/MaterialTrading/MaterialTrader.cs b/EDEngineer.Models/MaterialTrading/MaterialTrader.cs
@@ -13,6 +13,9 @@ public static IEnumerable<MaterialTrade> FindPossibleTrades(StateCargo cargo, Di
             var ingredients = cargo.Ingredients.Values
                                    .Where(i => i.Count > 0 && 
                                                i.Data.Group.HasValue && 
+                                               i.Data.Group != Group.Thargoid &&
+                                               i.Data.Group != Group.Guardian &&
+                                               i.Data.Group != Group.Commodities &&
                                                i.Data.Rarity.Rank() != null &&
                                                !missingIngredients.ContainsKey(i)).ToList();
 

diff --git a/EDEngineer/App.config b/EDEngineer/App.config
@@ -33,7 +33,7 @@
                 <value>True</value>
             </setting>
             <setting name="Version" serializeAs="String">
-                <value>1.1.2.4</value>
+                <value>1.1.2.5</value>
             </setting>
             <setting name="WindowWidth" serializeAs="String">
                 <value>0</value>

diff --git a/EDEngineer/EDEngineer.csproj b/EDEngineer/EDEngineer.csproj
@@ -32,8 +32,8 @@
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>4</ApplicationRevision>
-    <ApplicationVersion>1.1.2.4</ApplicationVersion>
+    <ApplicationRevision>5</ApplicationRevision>
+    <ApplicationVersion>1.1.2.5</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>

diff --git a/EDEngineer/Properties/Settings.Designer.cs b/EDEngineer/Properties/Settings.Designer.cs
diff --git a/EDEngineer/Properties/Settings.settings b/EDEngineer/Properties/Settings.settings
@@ -21,7 +21,7 @@
       <Value Profile="(Default)">True</Value>
     </Setting>
     <Setting Name="Version" Type="System.String" Scope="User">
-      <Value Profile="(Default)">1.1.2.4</Value>
+      <Value Profile="(Default)">1.1.2.5</Value>
     </Setting>
     <Setting Name="WindowWidth" Type="System.Double" Scope="User">
       <Value Profile="(Default)">0</Value>

diff --git a/EDEngineer/Resources/Data/releaseNotes.json b/EDEngineer/Resources/Data/releaseNotes.json
@@ -1,4 +1,8 @@
 [
+  {
+    "Version": "1.1.2.5",
+    "Content": "* Material Trader suggestions won't include non-tradable ingredients (like thargoid ingredients or others)"
+  },
   {
     "Version": "1.1.2.4",
     "Content": "* Fixed an issue with multi-commanders disappearing. If you still don't see your multiple commanders, please delete the aggregation.json file located in your AppData/Roaming/EDEngineer directory.\r\n* Fixed Thargoid Carapace rarity (Common instead of Very Rare) which impacts the maximum number you can carry."

diff --git a/EDEngineer/releases/Application Files/EDEngineer_1_1_2_5/EDEngineer.Models.dll.deploy b/EDEngineer/releases/Application Files/EDEngineer_1_1_2_5/EDEngineer.Models.dll.deploy
diff --git a/EDEngineer/releases/Application Files/EDEngineer_1_1_2_5/EDEngineer.Server.dll.deploy b/EDEngineer/releases/Application Files/EDEngineer_1_1_2_5/EDEngineer.Server.dll.deploy
diff --git a/EDEngineer/releases/Application Files/EDEngineer_1_1_2_5/EDEngineer.application b/EDEngineer/releases/Application Files/EDEngineer_1_1_2_5/EDEngineer.application
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
+  <assemblyIdentity name="EDEngineer.application" version="1.1.2.5" publicKeyToken="b9c6c2d0b4f2eae5" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <description asmv2:publisher="Max" asmv2:product="EDEngineer" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <deployment install="true" mapFileExtensions="true">
+    <subscription>
+      <update>
+        <beforeApplicationStartup />
+      </update>
+    </subscription>
+    <deploymentProvider codebase="https://raw.githubusercontent.com/msarilar/EDEngineer/master/EDEngineer/releases/EDEngineer.application" />
+  </deployment>
+  <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
+    <framework targetVersion="4.6.1" profile="Full" supportedRuntime="4.0.30319" />
+  </compatibleFrameworks>
+  <dependency>
+    <dependentAssembly dependencyType="install" codebase="Application Files\EDEngineer_1_1_2_5\EDEngineer.exe.manifest" size="17607">
+      <assemblyIdentity name="EDEngineer.exe" version="1.1.2.5" publicKeyToken="b9c6c2d0b4f2eae5" language="neutral" processorArchitecture="msil" type="win32" />
+      <hash>
+        <dsig:Transforms>
+          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
+        </dsig:Transforms>
+        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
+        <dsig:DigestValue>sHfYuSldFk/GIh5tYNw1EYCFuzFCl3QtSVBIxkbGcqI=</dsig:DigestValue>
+      </hash>
+    </dependentAssembly>
+  </dependency>
+<publisherIdentity name="CN=GAMBIT6\Max" issuerKeyHash="6687de5b05b744dd15e7bf3fa97baeff26a4cb22" /><Signature Id="StrongNameSignature" xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>6rOTDYj83qyBc6fWAZA4IK7w3NQ=</DigestValue></Reference></SignedInfo><SignatureValue>iRbBrxeH6A3tna4relBLtqre1suW2NkUX5s9I3c92Zq/4j096++BR2xZmcTasjKPjVmdqsC9Votzn/u/73BREj+/cvsVVrPcyF2CfQygYkFO3XOotSGsT5Svr+9vfy3zZ0slVYrTMBxmtB/vh67b5yF6YQAGQplt7fWIDWiGH4M=</SignatureValue><KeyInfo Id="StrongNameKeyInfo"><KeyValue><RSAKeyValue><Modulus>zB6rYAktApBKezEf3ToJb/hC2LaPWb8R3QWSNpWgwbTHnGTILhNEg78mvtu7KthLjGjMkCZB32e6wJ6+uBFvIzZi8qhBngBBggbJWRVNJh1l++UYZqJrFM/dg1rHM+XVJEwGL00fm0B4VQpaTigMfeFprRNXW1CP3JVbQs8Vtm0=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue><msrel:RelData xmlns:msrel="http://schemas.microsoft.com/windows/rel/2005/reldata"><r:license xmlns:r="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:as="http://schemas.microsoft.com/windows/pki/2005/Authenticode"><r:grant><as:ManifestInformation Hash="d4dcf0ae20389001d6a77381acdefc880d93b3ea" Description="" Url=""><as:assemblyIdentity name="EDEngineer.application" version="1.1.2.5" publicKeyToken="b9c6c2d0b4f2eae5" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" /></as:ManifestInformation><as:SignedBy /><as:AuthenticodePublisher><as:X509SubjectName>CN=GAMBIT6\Max</as:X509SubjectName></as:AuthenticodePublisher></r:grant><r:issuer><Signature Id="AuthenticodeSignature" xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue>FFjjLKhV4HHRxXXMCq2wpbyGHE8=</DigestValue></Reference></SignedInfo><SignatureValue>oNzJfm5cbD0bCVF0nKJSvxIP8mcEeJpg0w4kglchZGTvoW5eM3M1QzNKFR8WsgL+ku8QTmsdYd1bALI0q7xUn/CL3eI98uI1xFqz7DUDQP7Wz/UW1++p36o6YoSxb/+4IbHlwyxk+OWfSov/FMCj6+GT4Avxuh8H1WdziNRauEY=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>zB6rYAktApBKezEf3ToJb/hC2LaPWb8R3QWSNpWgwbTHnGTILhNEg78mvtu7KthLjGjMkCZB32e6wJ6+uBFvIzZi8qhBngBBggbJWRVNJh1l++UYZqJrFM/dg1rHM+XVJEwGL00fm0B4VQpaTigMfeFprRNXW1CP3JVbQs8Vtm0=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue><X509Data><X509Certificate>MIIBxzCCATCgAwIBAgIQO259Pwzl9Z5B6O5NZ4UgXjANBgkqhkiG9w0BAQUFADAhMR8wHQYDVQQDHhYARwBBAE0AQgBJAFQANgBcAE0AYQB4MCAXDTE4MDEwNzE3NTEzMFoYDzIxMjMwMTA3MTc1MTMwWjAhMR8wHQYDVQQDHhYARwBBAE0AQgBJAFQANgBcAE0AYQB4MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDMHqtgCS0CkEp7MR/dOglv+ELYto9ZvxHdBZI2laDBtMecZMguE0SDvya+27sq2EuMaMyQJkHfZ7rAnr64EW8jNmLyqEGeAEGCBslZFU0mHWX75RhmomsUz92DWscz5dUkTAYvTR+bQHhVClpOKAx94WmtE1dbUI/clVtCzxW2bQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAKkajbWmp5e2elVw+9KmK8Byzq4OnUOP7rS2F/qu1zn+JTyY9yu9FyQLK1cBCfiW8dpuWrAF4XA8Bvd0fNLJ3ZaVLdZFlxHY87jfzOP7wyoXkAq25KmPjUT0Tn6S7oaeSKqGI1JUO+ZydXg18IWDrVQDT+NzoUCfpplOh5DmuU9+</X509Certificate></X509Data></KeyInfo></Signature></r:issuer></r:license></msrel:RelData></KeyInfo></Signature></asmv1:assembly>
diff --git a/EDEngineer/releases/Application Files/EDEngineer_1_1_2_5/EDEngineer.exe.config.deploy b/EDEngineer/releases/Application Files/EDEngineer_1_1_2_5/EDEngineer.exe.config.deploy
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <configSections>
+    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="EDEngineer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+    </sectionGroup>
+  </configSections>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+  </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="NodaTime" publicKeyToken="4226afe0d9b296d1" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.1.0" newVersion="2.2.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.4.3.0" newVersion="4.4.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+  <userSettings>
+    <EDEngineer.Properties.Settings>
+      <setting name="LogDirectory" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="Shortcut" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="UpgradeRequired" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="Version" serializeAs="String">
+        <value>1.1.2.5</value>
+      </setting>
+      <setting name="WindowWidth" serializeAs="String">
+        <value>0</value>
+      </setting>
+      <setting name="WindowHeight" serializeAs="String">
+        <value>0</value>
+      </setting>
+      <setting name="WindowTop" serializeAs="String">
+        <value>0</value>
+      </setting>
+      <setting name="WindowLeft" serializeAs="String">
+        <value>0</value>
+      </setting>
+      <setting name="CurrentVersion" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="LeftSideWidth" serializeAs="String">
+        <value>0</value>
+      </setting>
+      <setting name="RightSideWidth" serializeAs="String">
+        <value>0</value>
+      </setting>
+      <setting name="ResetUI" serializeAs="String">
+        <value>False</value>
+      </setting>
+      <setting name="WindowUnlocked" serializeAs="String">
+        <value>False</value>
+      </setting>
+      <setting name="Language" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="AutoRunServer" serializeAs="String">
+        <value>False</value>
+      </setting>
+      <setting name="ServerPort" serializeAs="String">
+        <value>0</value>
+      </setting>
+      <setting name="CargoTabIndex" serializeAs="String">
+        <value>0</value>
+      </setting>
+      <setting name="SelectedCommander" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="Comparer" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="SilentLaunch" serializeAs="String">
+        <value>False</value>
+      </setting>
+      <setting name="NotificationKindBlueprintReady" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="NotificationVoice" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="LeftFontRatio" serializeAs="String">
+        <value>100</value>
+      </setting>
+      <setting name="RightRatio" serializeAs="String">
+        <value>100</value>
+      </setting>
+      <setting name="BottomFontRatio" serializeAs="String">
+        <value>100</value>
+      </setting>
+      <setting name="Opacity" serializeAs="String">
+        <value>0.9</value>
+      </setting>
+      <setting name="IngredientsGrouped" serializeAs="String">
+        <value>True</value>
+      </setting>
+      <setting name="SyncShoppingList" serializeAs="String">
+        <value>True</value>
+      </setting>
+    </EDEngineer.Properties.Settings>
+  </userSettings>
+</configuration>
diff --git a/EDEngineer/releases/Application Files/EDEngineer_1_1_2_5/EDEngineer.exe.deploy b/EDEngineer/releases/Application Files/EDEngineer_1_1_2_5/EDEngineer.exe.deploy