Merge pull request #167 from LoadedCamel/dev

3.5.5.10 to 3.6.5.3 - Approved

MRBResourceLib/MRBResourceLib.csproj

@@ -5,6 +5,22 @@
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
+    <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Update="Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
 </Project>

MRBResourceLib/Resources.resx

@@ -121,12 +121,18 @@
   <data name="AncientScroll" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\AncientScroll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Boilerplate" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\Boilerplate.htm;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
   <data name="ColorSpectrum" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\colorSpectrum.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="defaultAvatar" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\defaultAvatar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="DummyBoilerPlate" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\DummyBoilerPlate.htm;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
   <data name="EnhancementBooster" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\EnhancementBooster.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -136,6 +142,9 @@
   <data name="enhData" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\enhData.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="gradientBar" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\gradientBar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="HeroButton" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\HeroButton.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -175,6 +184,9 @@
   <data name="PictureBox1_Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\PictureBox1.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="selector" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\selector.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="VillainButton" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\VillainButton.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>