Skip to content

Commit

Permalink
fixed empty engineering object in loadout entry + published version 1…
Browse files Browse the repository at this point in the history 
….1.4.5
  • Loading branch information
@msarilar
msarilar committed Apr 24, 2019
1 parent 5346603 commit eadcbd0
Show file tree
Hide file tree
Showing 30 changed files with 1,028 additions and 22 deletions.
593 changes: 584 additions & 9 deletions EDEngineer.Tests/LogParsingTests.cs
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion EDEngineer/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<value>True</value>
</setting>
<setting name="Version" serializeAs="String">
<value>1.1.4.4</value>
<value>1.1.4.5</value>
</setting>
<setting name="WindowWidth" serializeAs="String">
<value>0</value>
Expand Down
4 changes: 2 additions & 2 deletions EDEngineer/EDEngineer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.htm</WebPage>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
<ApplicationRevision>4</ApplicationRevision>
<ApplicationVersion>1.1.4.4</ApplicationVersion>
<ApplicationRevision>5</ApplicationRevision>
<ApplicationVersion>1.1.4.5</ApplicationVersion>
<UseApplicationTrust>true</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
Expand Down
2 changes: 1 addition & 1 deletion EDEngineer/Properties/Settings.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion EDEngineer/Properties/Settings.settings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="Version" Type="System.String" Scope="User">
<Value Profile="(Default)">1.1.4.4</Value>
<Value Profile="(Default)">1.1.4.5</Value>
</Setting>
<Setting Name="WindowWidth" Type="System.Double" Scope="User">
<Value Profile="(Default)">0</Value>
Expand Down
4 changes: 4 additions & 0 deletions EDEngineer/Resources/Data/releaseNotes.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
[
{
"Version": "1.1.4.5",
"Content": "* Fixed a bug that could occur when loading the initial journal entry (caused by latest patch)"
},
{
"Version": "1.1.4.4",
"Content": "* Portuguese localization update thanks to @MegaMMC\r\n* Spanish localization update thanks to @Tihersarc\r\n* Russian and French localization update thanks to @VChet\r\n* @CMDR-Cometborne updated the blueprints offered by the Colonia engineers, including the new blueprints exclusive to Colonia (SCB G4, life support G5) !"
Expand Down
4 changes: 2 additions & 2 deletions EDEngineer/Utils/JournalEntryConverter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
return entry;
}

private JournalOperation ExtractOperation(JObject data, JournalEvent journalEvent)
public JournalOperation ExtractOperation(JObject data, JournalEvent journalEvent)
{
switch (journalEvent)
{
Expand Down Expand Up @@ -186,7 +186,7 @@ private JournalOperation ExtractLoadout(JObject data)

var engineering = module["Engineering"];
var modifiers = new List<ModuleModifier>();
if (engineering != null)
if (engineering != null && engineering.Count() > 0)
{
engineer = (string) engineering["Engineer"];
experimentalEffect = (string)engineering["ExperimentalEffect_Localised"];
Expand Down
Binary file added EDEngineer/releases/Application Files/EDEngineer_1_1_4_5/ControlzEx.dll.deploy
View file
Binary file not shown.
Binary file added EDEngineer/releases/Application Files/EDEngineer_1_1_4_5/EDEngineer.Models.dll.deploy
View file
Binary file not shown.
Binary file added EDEngineer/releases/Application Files/EDEngineer_1_1_4_5/EDEngineer.Server.dll.deploy
View file
Binary file not shown.
28 changes: 28 additions & 0 deletions EDEngineer/releases/Application Files/EDEngineer_1_1_4_5/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.1.4.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_4_5\EDEngineer.exe.manifest" size="18830">
<assemblyIdentity name="EDEngineer.exe" version="1.1.4.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>nz3EHA78wnq0whRrSTFV5h2nTYyccbXJYl085x78Eio=</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>8+4xJVTzrDk58bynVKpZonr9JbI=</DigestValue></Reference></SignedInfo><SignatureValue>tLAJbnaP1M/bWGz/8wOpKriznCS7QbJ7abUN5MTeL/fTwIgB+2ECqf9k5m5/eOphCUOrYHj3c/PChazQxqETNO01ziyM1aCUsaXOlFooIVyNCcBFO2lve4LxBJv5m5b6OKXE5r22HEHpofhcxNmA7ZFwf3XUgrd/87JDYL2c0Hs=</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="b225fd7aa259aa54a7bcf13939acf3542531eef3" Description="" Url=""><as:assemblyIdentity name="EDEngineer.application" version="1.1.4.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>tHxZkFD9QIqMB7imKflXOe1wfAM=</DigestValue></Reference></SignedInfo><SignatureValue>QqxYufMcrlcrrtTjB459IGbP3JITam29E3I8fPnv0Qb9aVR5QKnKQN6UjNwVeBGUZfeX93fISGZ9OCgzJIbs3ujVUnYV/eG7u+9eZkSQZwPQZQZ21s/fJmsPY/Maix5bqBUInrUBugzAt8M++SnSziqsdMNSKoO1tCnaZhonNWU=</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>
120 changes: 120 additions & 0 deletions EDEngineer/releases/Application Files/EDEngineer_1_1_4_5/EDEngineer.exe.config.deploy
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?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-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NodaTime" publicKeyToken="4226afe0d9b296d1" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.0.0" newVersion="2.3.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.5.0.0" newVersion="4.5.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.1.4.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>
<setting name="ClearAggregation" serializeAs="String">
<value>False</value>
</setting>
</EDEngineer.Properties.Settings>
</userSettings>
</configuration>
Binary file added EDEngineer/releases/Application Files/EDEngineer_1_1_4_5/EDEngineer.exe.deploy
View file
Binary file not shown.
Loading

0 comments on commit eadcbd0

Please sign in to comment.