Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
cadaei committed Jun 1, 2020
2 parents 0b89e26 + ef2b304 commit e84ecd7
Show file tree
Hide file tree
Showing 83 changed files with 4,645 additions and 2,644 deletions.
13 changes: 13 additions & 0 deletions ARKBreedingStats/ARKBreedingStats.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Compression.FileSystem" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security" />
<Reference Include="System.Speech" />
Expand Down Expand Up @@ -154,6 +156,7 @@
<Compile Include="oldLibraryFormat\CreatureValuesOld.cs" />
<Compile Include="oldLibraryFormat\IncubationTimerEntryOld.cs" />
<Compile Include="oldLibraryFormat\TimerListEntryOld.cs" />
<Compile Include="Settings.cs" />
<Compile Include="settings\ATImportExportedFolderLocation.cs" />
<Compile Include="settings\ATImportFileLocation.cs" />
<Compile Include="settings\ATImportExportedFolderLoactionDialog.cs">
Expand Down Expand Up @@ -342,6 +345,12 @@
<Compile Include="mods\ModValuesManager.Designer.cs">
<DependentUpon>ModValuesManager.cs</DependentUpon>
</Compile>
<Compile Include="uiControls\LibraryFilter.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="uiControls\LibraryFilter.Designer.cs">
<DependentUpon>LibraryFilter.cs</DependentUpon>
</Compile>
<Compile Include="uiControls\MultiSetterTag.cs">
<SubType>UserControl</SubType>
</Compile>
Expand Down Expand Up @@ -597,6 +606,7 @@
<EmbeddedResource Include="local\strings.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>strings.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="local\strings.zh.resx" />
<EmbeddedResource Include="mods\CustomStatOverridesEditor.resx">
Expand Down Expand Up @@ -668,6 +678,9 @@
<EmbeddedResource Include="mods\ModValuesManager.resx">
<DependentUpon>ModValuesManager.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="uiControls\LibraryFilter.resx">
<DependentUpon>LibraryFilter.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="uiControls\MultiSetterTag.resx">
<DependentUpon>MultiSetterTag.cs</DependentUpon>
</EmbeddedResource>
Expand Down
76 changes: 70 additions & 6 deletions ARKBreedingStats/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,8 @@
<setting name="consideredStats" serializeAs="String">
<value>387</value>
</setting>
<setting name="formSize" serializeAs="String">
<value>1400, 1000</value>
</setting>
<setting name="formLocation" serializeAs="String">
<value>100, 100</value>
<setting name="MainWindowRect" serializeAs="String">
<value>100, 100, 1400, 1000</value>
</setting>
<setting name="autosave" serializeAs="String">
<value>False</value>
Expand All @@ -43,7 +40,7 @@
<setting name="celsius" serializeAs="String">
<value>True</value>
</setting>
<setting name="oxygenForAll" serializeAs="String">
<setting name="DisplayHiddenStats" serializeAs="String">
<value>False</value>
</setting>
<setting name="OCRApp" serializeAs="String">
Expand Down Expand Up @@ -121,6 +118,9 @@
<setting name="TribeNameLocked" serializeAs="String">
<value>False</value>
</setting>
<setting name="DefaultServerName" serializeAs="String">
<value />
</setting>
<setting name="showOCRButton" serializeAs="String">
<value>False</value>
</setting>
Expand Down Expand Up @@ -154,6 +154,9 @@
<setting name="IncludeCooldownsInBreedingPlan" serializeAs="String">
<value>False</value>
</setting>
<setting name="IncludeCryoedInBreedingPlan" serializeAs="String">
<value>False</value>
</setting>
<setting name="WarnWhenImportingMoreCreaturesThan" serializeAs="String">
<value>50</value>
</setting>
Expand Down Expand Up @@ -233,6 +236,67 @@
<setting name="TCLVSortAsc" serializeAs="String">
<value>True</value>
</setting>
<setting name="KeepExpiredTimersInOverlay" serializeAs="String">
<value>False</value>
</setting>
<setting name="BreedingPlanOnlyBestSuggestionForEachFemale" serializeAs="String">
<value>False</value>
</setting>
<setting name="BreedingPlanOnePartnerMoreMutationsThanLimit"
serializeAs="String">
<value>False</value>
</setting>
<setting name="LibraryHighlightTopCreatures" serializeAs="String">
<value>True</value>
</setting>
<setting name="SaveImportCryo" serializeAs="String">
<value>True</value>
</setting>
<setting name="UseCustomOverlayLocation" serializeAs="String">
<value>False</value>
</setting>
<setting name="CustomOverlayLocation" serializeAs="String">
<value>0, 0</value>
</setting>
<setting name="AdminConsoleCommandWithCheat" serializeAs="String">
<value>False</value>
</setting>
<setting name="FilterFlagsExclude" serializeAs="String">
<value>0</value>
</setting>
<setting name="useFiltersInTopStatCalculation" serializeAs="String">
<value>False</value>
</setting>
<setting name="FilterOnlyIfColorId" serializeAs="String">
<value>0</value>
</setting>
<setting name="LibraryGroupBySpecies" serializeAs="String">
<value>True</value>
</setting>
<setting name="LibraryFilterWindowRect" serializeAs="String">
<value>50, 50, 800, 600</value>
</setting>
<setting name="FilterFlagsAllNeeded" serializeAs="String">
<value>0</value>
</setting>
<setting name="FilterFlagsOneNeeded" serializeAs="String">
<value>0</value>
</setting>
<setting name="FilterByName" serializeAs="String">
<value />
</setting>
<setting name="ModManagerWindowRect" serializeAs="String">
<value>50, 50, 800, 600</value>
</setting>
<setting name="SpeciesSelectorCountLastSpecies" serializeAs="String">
<value>20</value>
</setting>
<setting name="applyNamePatternOnAutoImportForNewCreatures" serializeAs="String">
<value>False</value>
</setting>
<setting name="AskedToDownloadImageFiles" serializeAs="String">
<value>False</value>
</setting>
</ARKBreedingStats.Properties.Settings>
</userSettings>
</configuration>
70 changes: 53 additions & 17 deletions ARKBreedingStats/BreedingPlan.Designer.cs
View file

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

Loading

0 comments on commit e84ecd7

Please sign in to comment.