Skip to content

Commit

Permalink
published version 1.1.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@msarilar
msarilar committed Jun 7, 2021
1 parent 4ede84c commit c3e338f
Show file tree
Hide file tree
Showing 30 changed files with 468 additions and 30 deletions.
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.6.0</value>
<value>1.1.6.1</value>
</setting>
<setting name="WindowWidth" serializeAs="String">
<value>0</value>
Expand Down
6 changes: 3 additions & 3 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>0</ApplicationRevision>
<ApplicationVersion>1.1.6.0</ApplicationVersion>
<ApplicationRevision>1</ApplicationRevision>
<ApplicationVersion>1.1.6.1</ApplicationVersion>
<UseApplicationTrust>true</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
Expand Down Expand Up @@ -88,7 +88,7 @@
<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
</PropertyGroup>
<PropertyGroup>
<SignManifests>false</SignManifests>
<SignManifests>true</SignManifests>
</PropertyGroup>
<ItemGroup>
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
Expand Down
12 changes: 6 additions & 6 deletions 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.6.0</Value>
<Value Profile="(Default)">1.1.6.1</Value>
</Setting>
<Setting Name="WindowWidth" Type="System.Double" Scope="User">
<Value Profile="(Default)">0</Value>
Expand Down
5 changes: 5 additions & 0 deletions EDEngineer/Resources/Data/releaseNotes.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
[
{
"Version": "1.1.6.1",
"Content": "Great contributions from @DrDoomDmc:\r\n* handling of new journal events to update odyssey ingredients in cargo\r\n* performance improvement with filtering blueprints\r\n* ingredient names fix\r\n* the app remembers if it was maximized\r\n* @Synthesis and @Technology filters fixed",
"Reset": true
},
{
"Version": "1.1.6.0",
"Content": "* Odyssey materials and blueprints are now integrated in EDEngineer\r\nthanks a lot for the amazing contributions from @DrDoomDmc and @Gimi1967\r\n\r\nstock in the cargo might not update properly yet - it hopefully should come soon\r\n\r\n* french localization update ; thanks a lot to @drmagoo33450 and @DrDoomDmc "
Expand Down
4 changes: 2 additions & 2 deletions EDEngineer/Utils/UI/PersistGroupExpandedStateBehavior.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ private void OnExpanded(object sender, RoutedEventArgs e)
private void SetExpanded(bool expanded)
{
if (GroupName == null)
{
{
return;
}
}

if(expanded)
{
Expand Down
22 changes: 11 additions & 11 deletions EDEngineer/Views/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@
<MultiBinding Converter="{x:Static localization:Languages.Instance}">
<Binding/>
<Binding Path="DataContext.Languages.CurrentLanguage"
RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}"/>
RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}"/>
</MultiBinding>
</TextBlock.Text>
</TextBlock>
Expand Down Expand Up @@ -977,7 +977,7 @@
<MultiBinding Converter="{x:Static localization:Languages.Instance}">
<Binding Converter="{StaticResource FilterToLabel}"/>
<Binding Path="DataContext.Languages.CurrentLanguage"
RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}"/>
RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}"/>
</MultiBinding>
</TextBlock.Text>
</TextBlock>
Expand All @@ -1000,7 +1000,7 @@
<MultiBinding Converter="{x:Static localization:Languages.Instance}">
<Binding Converter="{StaticResource FilterToLabel}"/>
<Binding Path="DataContext.Languages.CurrentLanguage"
RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}"/>
RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}"/>
</MultiBinding>
</TextBlock.Text>
</TextBlock>
Expand Down Expand Up @@ -1028,7 +1028,7 @@
<MultiBinding Converter="{x:Static localization:Languages.Instance}">
<Binding Converter="{StaticResource FilterToLabel}"/>
<Binding Path="DataContext.Languages.CurrentLanguage"
RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}"/>
RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}"/>
</MultiBinding>
</TextBlock.Text>
</TextBlock>
Expand All @@ -1050,7 +1050,7 @@
<MultiBinding Converter="{x:Static localization:Languages.Instance}">
<Binding Path="Label"/>
<Binding Path="DataContext.Languages.CurrentLanguage"
RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}"/>
RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}"/>
</MultiBinding>
</TextBlock.Text>
</TextBlock>
Expand All @@ -1073,7 +1073,7 @@
<MultiBinding Converter="{x:Static localization:Languages.Instance}">
<Binding Path="Label" />
<Binding Path="DataContext.Languages.CurrentLanguage"
RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}"/>
RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}"/>
</MultiBinding>
</TextBlock.Text>
</TextBlock>
Expand Down Expand Up @@ -1231,7 +1231,7 @@
<MultiBinding Converter="{x:Static localization:Languages.Instance}" FallbackValue="Material">
<Binding Path="Entry.Data.KindStringForGui" Mode="OneWay"/>
<Binding Path="DataContext.Languages.CurrentLanguage"
RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}"/>
RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}"/>
</MultiBinding>
</Run.Text>
</Run>
Expand All @@ -1253,7 +1253,7 @@
<MultiBinding Converter="{x:Static localization:Languages.Instance}" FallbackValue="Modular Terminals">
<Binding Path="Entry.Data.Name"/>
<Binding Path="DataContext.Languages.CurrentLanguage"
RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}"/>
RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}"/>
</MultiBinding>
</TextBlock.Text>
</TextBlock>
Expand Down Expand Up @@ -1642,7 +1642,7 @@
<MultiBinding Converter="{x:Static localization:Languages.Instance}" FallbackValue="Material">
<Binding Path="Entry.Data.KindStringForGui" Mode="OneWay"/>
<Binding Path="DataContext.Languages.CurrentLanguage"
RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}"/>
RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}"/>
</MultiBinding>
</Run.Text>
</Run>
Expand All @@ -1669,7 +1669,7 @@
<MultiBinding Converter="{x:Static localization:Languages.Instance}" FallbackValue="Modular Terminals">
<Binding Path="Entry.Data.Name"/>
<Binding Path="DataContext.Languages.CurrentLanguage"
RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}"/>
RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}"/>
</MultiBinding>
</TextBlock.Text>
</TextBlock>
Expand Down Expand Up @@ -1759,7 +1759,7 @@
Grid.Row="0">
<TextBlock Text="Material Trader"/>

<iconPacks:PackIconMaterial Kind="InformationOutline"
<iconPacks:PackIconMaterial Kind="InformationOutline"
Foreground="Cyan"
Background="#1d2242"
Margin="10,0,0,0"
Expand Down
Binary file added EDEngineer/releases/Application Files/EDEngineer_1_1_6_1/ControlzEx.dll.deploy
View file
Binary file not shown.
Binary file added EDEngineer/releases/Application Files/EDEngineer_1_1_6_1/EDEngineer.Models.dll.deploy
View file
Binary file not shown.
Binary file added EDEngineer/releases/Application Files/EDEngineer_1_1_6_1/EDEngineer.Server.dll.deploy
View file
Binary file not shown.
28 changes: 28 additions & 0 deletions EDEngineer/releases/Application Files/EDEngineer_1_1_6_1/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.6.1" 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_6_1\EDEngineer.exe.manifest" size="18830">
<assemblyIdentity name="EDEngineer.exe" version="1.1.6.1" 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>7k7mXpvPXF6bLXU35tDk0ANhVY2FJZ1nkUvVdkleIog=</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>H9sWIUNeQd9e009lseAhF9GWqko=</DigestValue></Reference></SignedInfo><SignatureValue>spZQNQG50iuiOx/FU65lpam88R2Z1/trvNNLCVKBkST58M9ZnTM58h4wExCbg/fEr/S0FA10m1k4dFgaHyUqhRY3wAyvU+93pgXMyup7Mpc9ePFlNcUpK7zAQCoO0IPW/F1Mic+0VLh9izKA3RuSXH3Wnv9U4IHrBNi2l4ql6K0=</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="4aaa96d11721e0b1654fd35edf415e432116db1f" Description="" Url=""><as:assemblyIdentity name="EDEngineer.application" version="1.1.6.1" 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>FQ1MeTe3dktVBAA+HqxMX4VZxZo=</DigestValue></Reference></SignedInfo><SignatureValue>qcRynuaJ0sisWY8OHr2iPspcyapn8NM7JxXu3gkUF7wVntswSFgNvpQM//Awn10S0a2Qm0tOclWwYIVe5ZGI/LCBI5uYIb8KiH2pNRLX2wnF55sX5lA0cF3UuMIX6MnXjFIHZ5ewmRFoAKyVTd4ASGJLJbi938Os7mmJaCBQIPU=</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>
Loading

0 comments on commit c3e338f

Please sign in to comment.