Skip to content

Commit 71221cd

Browse files
committed
Merge branch 'dev'
2 parents e37a9c3 + ba8a5a3 commit 71221cd

21 files changed

+683
-398
lines changed

ARKBreedingStats/ARKBreedingStats.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,7 @@
636636
<Compile Include="utils\CreatureListSorter.cs" />
637637
<Compile Include="utils\MessageBoxes.cs" />
638638
<Compile Include="NamePatterns\NamePatternFunctions.cs" />
639+
<Compile Include="utils\NaturalComparer.cs" />
639640
<Compile Include="utils\RepositoryInfo.cs" />
640641
<Compile Include="utils\SoundFeedback.cs" />
641642
<Compile Include="utils\Themes.cs" />

ARKBreedingStats/App.config

+6
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,12 @@
481481
<setting name="LibraryColorInfoUseFilter" serializeAs="String">
482482
<value>False</value>
483483
</setting>
484+
<setting name="UseNaturalSort" serializeAs="String">
485+
<value>True</value>
486+
</setting>
487+
<setting name="NaturalSortIgnoreSpaces" serializeAs="String">
488+
<value>False</value>
489+
</setting>
484490
</ARKBreedingStats.Properties.Settings>
485491
</userSettings>
486492
</configuration>

ARKBreedingStats/CreatureBox.Designer.cs

+111-73
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ARKBreedingStats/CreatureInfoInput.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,8 @@ public bool ShowSaveButton
278278
set
279279
{
280280
btSaveChanges.Visible = value;
281-
btAdd2Library.Size = new Size((value ? 120 : 250), 37);
282-
btAdd2Library.Location = new Point(value ? 136 : 6, btAdd2Library.Location.Y);
281+
btAdd2Library.Size = new Size((value ? Width / 2 : Width) - 10, btAdd2Library.Size.Height);
282+
btAdd2Library.Location = new Point(value ? Width / 2 + 6 : 6, btAdd2Library.Location.Y);
283283
}
284284
}
285285

ARKBreedingStats/Form1.Designer.cs

+12-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)