Skip to content

Commit 44c717b

Browse files
committed
Merge branch 'dev'
2 parents 150c58d + b640cbf commit 44c717b

File tree

6 files changed

+4
-94
lines changed

6 files changed

+4
-94
lines changed

ARKBreedingStats/App.config

-15
Original file line numberDiff line numberDiff line change
@@ -312,9 +312,6 @@
312312
<setting name="Highlight255Level" serializeAs="String">
313313
<value>False</value>
314314
</setting>
315-
<setting name="HighlightEvenOdd" serializeAs="String">
316-
<value>False</value>
317-
</setting>
318315
<setting name="LastUsedCollectionFolder" serializeAs="String">
319316
<value />
320317
</setting>
@@ -408,18 +405,6 @@
408405
<setting name="InfoGraphicShowRegionNamesIfNoImage" serializeAs="String">
409406
<value>False</value>
410407
</setting>
411-
<setting name="ChartHueEvenMin" serializeAs="String">
412-
<value>0</value>
413-
</setting>
414-
<setting name="ChartHueEvenMax" serializeAs="String">
415-
<value>120</value>
416-
</setting>
417-
<setting name="ChartHueOddMin" serializeAs="String">
418-
<value>240</value>
419-
</setting>
420-
<setting name="ChartHueOddMax" serializeAs="String">
421-
<value>320</value>
422-
</setting>
423408
<setting name="PatternNameToClipboardAfterManualApplication"
424409
serializeAs="String">
425410
<value>False</value>

ARKBreedingStats/Pedigree/PedigreeCreature.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ public Creature Creature
214214
_labels[s].Text = _creature.levelsWild[si].ToString();
215215
if (Properties.Settings.Default.Highlight255Level && _creature.levelsWild[si] > 253) // 255 is max, 254 is the highest that allows dom leveling
216216
_labels[s].BackColor = Utils.AdjustColorLight(_creature.levelsWild[si] == 254 ? Utils.Level254 : Utils.Level255, _creature.IsTopStat(si) ? 0.2 : 0.7);
217-
else if (Properties.Settings.Default.HighlightEvenOdd)
217+
else
218218
_labels[s].BackColor = Utils.AdjustColorLight(levelColorOptions.StatOptions[si].GetLevelColor(_creature.levelsWild[si]),
219219
_creature.IsTopStat(si) ? 0.2 : 0.7);
220220

ARKBreedingStats/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
// Revision
3131
//
3232
[assembly: AssemblyVersion("1.0.0.0")]
33-
[assembly: AssemblyFileVersion("0.63.1.2")]
33+
[assembly: AssemblyFileVersion("0.63.1.3")]
3434
[assembly: NeutralResourcesLanguage("en")]
3535

ARKBreedingStats/Properties/Settings.Designer.cs

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

ARKBreedingStats/Properties/Settings.settings

-15
Original file line numberDiff line numberDiff line change
@@ -350,9 +350,6 @@
350350
<Setting Name="Highlight255Level" Type="System.Boolean" Scope="User">
351351
<Value Profile="(Default)">False</Value>
352352
</Setting>
353-
<Setting Name="HighlightEvenOdd" Type="System.Boolean" Scope="User">
354-
<Value Profile="(Default)">False</Value>
355-
</Setting>
356353
<Setting Name="LastUsedCollectionFolder" Type="System.String" Scope="User">
357354
<Value Profile="(Default)" />
358355
</Setting>
@@ -461,18 +458,6 @@
461458
<Setting Name="InfoGraphicShowRegionNamesIfNoImage" Type="System.Boolean" Scope="User">
462459
<Value Profile="(Default)">False</Value>
463460
</Setting>
464-
<Setting Name="ChartHueEvenMin" Type="System.Int32" Scope="User">
465-
<Value Profile="(Default)">0</Value>
466-
</Setting>
467-
<Setting Name="ChartHueEvenMax" Type="System.Int32" Scope="User">
468-
<Value Profile="(Default)">120</Value>
469-
</Setting>
470-
<Setting Name="ChartHueOddMin" Type="System.Int32" Scope="User">
471-
<Value Profile="(Default)">240</Value>
472-
</Setting>
473-
<Setting Name="ChartHueOddMax" Type="System.Int32" Scope="User">
474-
<Value Profile="(Default)">320</Value>
475-
</Setting>
476461
<Setting Name="PatternNameToClipboardAfterManualApplication" Type="System.Boolean" Scope="User">
477462
<Value Profile="(Default)">False</Value>
478463
</Setting>

ARKBreedingStats/_manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"ARK Smart Breeding": {
55
"Id": "ARK Smart Breeding",
66
"Category": "main",
7-
"version": "0.63.1.2"
7+
"version": "0.63.1.3"
88
},
99
"SpeciesColorImages": {
1010
"Id": "SpeciesColorImages",

0 commit comments

Comments
 (0)