Merge branch 'dev'

Author: cadon

ARKBreedingStats/ARKBreedingStats.csproj

@@ -206,6 +206,9 @@
     <Compile Include="StatsOptions\LevelColorSettings\LevelGraphOptionsControl.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="uiControls\StatsDisplay.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="uiControls\StatSelector.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -522,12 +525,6 @@
     <Compile Include="uiControls\RegionColorChooser.Designer.cs">
       <DependentUpon>RegionColorChooser.cs</DependentUpon>
     </Compile>
-    <Compile Include="uiControls\StatsDisplay.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="uiControls\StatsDisplay.Designer.cs">
-      <DependentUpon>StatsDisplay.cs</DependentUpon>
-    </Compile>
     <Compile Include="uiControls\StatGraphs.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -726,6 +723,7 @@
     <Compile Include="utils\ExceptionMessages.cs" />
     <Compile Include="utils\ExtensionMethods.cs" />
     <Compile Include="utils\CreatureListSorter.cs" />
+    <Compile Include="utils\LevelColorBar.cs" />
     <Compile Include="utils\Logging.cs" />
     <Compile Include="utils\MessageBoxes.cs" />
     <Compile Include="NamePatterns\NamePatternFunctions.cs" />
@@ -966,9 +964,6 @@
     <EmbeddedResource Include="uiControls\RegionColorChooser.resx">
       <DependentUpon>RegionColorChooser.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="uiControls\StatsDisplay.resx">
-      <DependentUpon>StatsDisplay.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="uiControls\StatPotential.resx">
       <DependentUpon>StatPotential.cs</DependentUpon>
     </EmbeddedResource>

ARKBreedingStats/CreatureBox.Designer.cs

@@ -146,7 +146,6 @@ void SetParentLabel(Label l, string lbText = null, bool clickable = false)
                 statsDisplay1.SetCreatureValues(_creature);
                 labelNotes.Text = _creature.note;
                 _tt.SetToolTip(labelNotes, _creature.note);
-                labelSpecies.Text = _creature.SpeciesName;
                 pictureBox1.SetImageAndDisposeOld(CreatureColored.GetColoredCreature(_creature.colors, _creature.Species, _colorRegionUseds, creatureSex: _creature.sex, game: _cc.Game));
                 _tt.SetToolTip(pictureBox1, CreatureColored.RegionColorInfo(_creature.Species, _creature.colors)
                     + "\n\nClick to copy creature infos as image to the clipboard");
@@ -208,7 +207,6 @@ public void Clear()
             LbFather.Text = string.Empty;
             statsDisplay1.Clear();
             pictureBox1.Visible = false;
-            labelSpecies.Text = string.Empty;
             labelNotes.Text = string.Empty;
             regionColorChooser1.Clear();
         }