Skip to content

Commit

Permalink
Merge pull request #30 from tobitege/master
Browse files Browse the repository at this point in the history
v1.1.5 rollup
  • Loading branch information
Dimencia authored Apr 23, 2023
2 parents c61dd62 + d75f08a commit 316608b
Show file tree
Hide file tree
Showing 23 changed files with 418 additions and 488 deletions.
214 changes: 0 additions & 214 deletions DU-Industry-Tool.favdoc

This file was deleted.

9 changes: 6 additions & 3 deletions DU-Industry-Tool/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
<userSettings>
<DU_Industry_Tool.Properties.Settings>
<setting name="ProdListDirectory" serializeAs="String">
<value/>
<value />
</setting>
<setting name="LaunchProdList" serializeAs="String">
<value>False</value>
</setting>
<setting name="LastProductionList" serializeAs="String">
<value/>
<value />
</setting>
<setting name="LastLeftTop" serializeAs="String">
<value>0, 0</value>
Expand All @@ -29,11 +29,14 @@
<value>True</value>
</setting>
<setting name="RecentProdLists" serializeAs="String">
<value/>
<value />
</setting>
<setting name="ThemeId" serializeAs="String">
<value>-1</value>
</setting>
<setting name="FullSchematicQuantities" serializeAs="String">
<value>True</value>
</setting>
</DU_Industry_Tool.Properties.Settings>
</userSettings>
<System.Windows.Forms.ApplicationConfigurationSection>
Expand Down
2 changes: 1 addition & 1 deletion DU-Industry-Tool/Classes/Calculator2OutputClass.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public void Fill(CalculatorClass calc)
_tlview.BeginInvoke((MethodInvoker)delegate()
{
_tlview.Collapse(x);
MessageBox.Show(ex.Message, "Recipes Error", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
MessageBox.Show(ex.Message, @"Recipes Error", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
});
return new ArrayList();
}
Expand Down
Loading

0 comments on commit 316608b

Please sign in to comment.