Skip to content

Commit

Permalink
published version 1.0.8.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@msarilar
msarilar committed Oct 3, 2017
1 parent 3fc7e5e commit 5716ae6
Show file tree
Hide file tree
Showing 23 changed files with 412 additions and 13 deletions.
2 changes: 1 addition & 1 deletion EDEngineer/Resources/Data/releaseNotes.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"Version": "1.0.8.4",
"Content": "*"
"Content": "* New materials and datas are available, as well as updated names for 2.4! Thanks to @HighwaymanEd and @JohnXaverius on GitHub for providing the new data, as well as GoldenPablo on discord for providing his logs and screenshots.\r\nYour thresholds had to be cleared for this update, sorry!\r\n\r\n* Fixed an issue with the warning message when EDEngineer doesn't recognize a material such that it will now show correctly the unknown code from the game logs.\r\n\r\n* Translations might need to be updated, and apparently new synthesis are available (see issue #255 on GitHub if you would like to help)"
},
{
"Version": "1.0.8.3",
Expand Down
12 changes: 6 additions & 6 deletions EDEngineer/Utils/JournalEntryConverter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ private JournalOperation ExtractMaterialsDump(JObject data)
string materialName;
int? count = cc.Value ?? cc.Count;

if (!converter.TryGet(cc.Name.Value, out materialName))
if (!converter.TryGet((string) cc.Name, out materialName))
{
MessageBox.Show(string.Format(languages.Translate("Unknown material, please contact the author ! {0}"), cc.Name.Value));
MessageBox.Show(string.Format(languages.Translate("Unknown material, please contact the author ! {0}"), cc.Name));
continue;
}

Expand Down Expand Up @@ -194,9 +194,9 @@ private JournalOperation ExtractCargoDump(JObject data)
string materialName;
int? count = cc.Value ?? cc.Count;

if (!converter.TryGet(cc.Name.Value, out materialName))
if (!converter.TryGet((string) cc.Name, out materialName))
{
MessageBox.Show(string.Format(languages.Translate("Unknown material, please contact the author ! {0}"), cc.Name.Value));
MessageBox.Show(string.Format(languages.Translate("Unknown material, please contact the author ! {0}"), cc.Name));
continue;
}

Expand Down Expand Up @@ -402,9 +402,9 @@ private JournalOperation ExtractSynthesis(JObject data)
string synthesisIngredientName;
int? count = cc.Value ?? cc.Count;

if (!converter.TryGet(cc.Name.Value, out synthesisIngredientName))
if (!converter.TryGet((string) cc.Name, out synthesisIngredientName))
{
MessageBox.Show(string.Format(languages.Translate("Unknown material, please contact the author ! {0}"), cc.Name.Value));
MessageBox.Show(string.Format(languages.Translate("Unknown material, please contact the author ! {0}"), cc.Name));
continue;
}

Expand Down
Binary file added EDEngineer/releases/Application Files/EDEngineer_1_0_8_4/EDEngineer.Models.dll.deploy
View file
Binary file not shown.
Binary file added EDEngineer/releases/Application Files/EDEngineer_1_0_8_4/EDEngineer.Server.dll.deploy
View file
Binary file not shown.
28 changes: 28 additions & 0 deletions EDEngineer/releases/Application Files/EDEngineer_1_0_8_4/EDEngineer.application
View file
Original file line number Diff line number Diff line change
@@ -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.0.8.4" publicKeyToken="c7c2cd04d2cdd815" 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_0_8_4\EDEngineer.exe.manifest" size="17668">
<assemblyIdentity name="EDEngineer.exe" version="1.0.8.4" publicKeyToken="c7c2cd04d2cdd815" 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>KrU+V1wNeEZdbYJYUjZVzxYokmVrREV5H/IeIIkD/Cs=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
<publisherIdentity name="CN=GAMBIT6\Max" issuerKeyHash="11f40001e3715b07597e0eddab9728f9e30cc302" /><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-sha256" /><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#sha256" /><DigestValue>O4/2zfHfSzEIO9GsnhtAKgBEBz9n0xl7pw0xV/9A94g=</DigestValue></Reference></SignedInfo><SignatureValue>hluAfFkKdbB/YvyEAgHwVRybZhWon8qjxvktjV5Fot0HGMunw4vvdxc92pNTDM7HRJyHCxz/7ACECVe1ruq/TSpXbtGkp9GkS/32KdTQMccpg2Dqj38Mkye3qw3JpyVmWgN1sJQj4JaNfH9nLMwDy4V/QbXNJqb/hx+CHORGjvc=</SignatureValue><KeyInfo Id="StrongNameKeyInfo"><KeyValue><RSAKeyValue><Modulus>s3Rgw7x2D3+SLtMKutluM5M8B4WEs+Ug20EfdfHXvLbLVmZQc6zcjTSNAVuXx+DFhTw7Xfvs5y0MXW10LdLfiKq6aazW3Jt9gKcxqv/3nADJB/f2RuyVbpmLpwbG5ZTjAKRvo+VM6u+VI5UIM66zasrgjqympr2YoaV4wjeSXk0=</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="88f740ff57310da77b19d3673f0744002a401b9eacd13b08314bdff1cdf68f3b" Description="" Url=""><as:assemblyIdentity name="EDEngineer.application" version="1.0.8.4" publicKeyToken="c7c2cd04d2cdd815" 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-sha256" /><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#sha256" /><DigestValue>iHlMZY6bhnJwFe3kriYsHVbCC1/wh5IvMN8sQMx3c6A=</DigestValue></Reference></SignedInfo><SignatureValue>Psi+SxjhdceOLuZtA2WK9uvFi4lQQwjroBJBM1kzhdW3gtci6JuwU5GZ5rMdpQMA1Cb5DnIWTInPr8YHpwuZ7jUfjnxqHeQh96swHSXvxIq3/K88dABqg4FbkslVnpVDKTV894gGUtjDOZHyttQ4FeGiOyOpdig4cvYqxphUJpg=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>s3Rgw7x2D3+SLtMKutluM5M8B4WEs+Ug20EfdfHXvLbLVmZQc6zcjTSNAVuXx+DFhTw7Xfvs5y0MXW10LdLfiKq6aazW3Jt9gKcxqv/3nADJB/f2RuyVbpmLpwbG5ZTjAKRvo+VM6u+VI5UIM66zasrgjqympr2YoaV4wjeSXk0=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue><X509Data><X509Certificate>MIIBxTCCAS6gAwIBAgIQfKLD0d6RorlAQCjrdfkDHTANBgkqhkiG9w0BAQsFADAhMR8wHQYDVQQDHhYARwBBAE0AQgBJAFQANgBcAE0AYQB4MB4XDTE2MTEwMTE1MDgxOVoXDTE3MTEwMTIxMDgxOVowITEfMB0GA1UEAx4WAEcAQQBNAEIASQBUADYAXABNAGEAeDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs3Rgw7x2D3+SLtMKutluM5M8B4WEs+Ug20EfdfHXvLbLVmZQc6zcjTSNAVuXx+DFhTw7Xfvs5y0MXW10LdLfiKq6aazW3Jt9gKcxqv/3nADJB/f2RuyVbpmLpwbG5ZTjAKRvo+VM6u+VI5UIM66zasrgjqympr2YoaV4wjeSXk0CAwEAATANBgkqhkiG9w0BAQsFAAOBgQA0l6SGR8ROw2A3Wxp1znVUThSCab6lWc0o/x6VJXn8PmxpvzLDNKqvz4PqP9GDv9DUiPSamsNCRA5yMmsIqD9q8bbtTRN6wYAtBwcP7tHi4OvYggM9UW3cBtJKBV9r+UvywN4847zsC3TPF0FgjEb3xqdCJEqYe3OXzdi0FLScSA==</X509Certificate></X509Data></KeyInfo></Signature></r:issuer></r:license></msrel:RelData></KeyInfo></Signature></asmv1:assembly>
116 changes: 116 additions & 0 deletions EDEngineer/releases/Application Files/EDEngineer_1_0_8_4/EDEngineer.exe.config.deploy
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
<?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-9.0.0.0" newVersion="9.0.0.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.0.0" newVersion="4.4.0.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.0.8.4</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="NotificationKindCargoAlmostFull" 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="Thresholds" serializeAs="String">
<value />
</setting>
<setting name="NotificationKindThresholdReached" 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>
</EDEngineer.Properties.Settings>
</userSettings>
</configuration>
Binary file added EDEngineer/releases/Application Files/EDEngineer_1_0_8_4/EDEngineer.exe.deploy
View file
Binary file not shown.
Loading

0 comments on commit 5716ae6

Please sign in to comment.