Rename Mixed Network puzzle to "Adding Devices"

EduNetworkBuilder/EduNetworkBuilder.csproj

@@ -140,6 +140,11 @@
     <Compile Include="PacketMessage.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="Resources\languages\edustrings.fr.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -177,14 +182,9 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
     <EmbeddedResource Include="Resources\languages\edustrings.resx" />
     <EmbeddedResource Include="Resources\languages\edustrings.fr.resx">
       <Generator>ResXFileCodeGenerator</Generator>
@@ -221,8 +221,9 @@
     <None Include="Resources\Level1-BadIP.enbx" />
     <None Include="Resources\Level1-DuplicateIPs.enbx" />
     <None Include="Resources\Level1-MidDHCP.enbx" />
-    <None Include="Resources\Level1-MixedNetwork.enbx" />
     <None Include="Resources\Level1-NoGateway.enbx" />
+    <None Include="Resources\Level1_AddingDevices.enbx" />
+    <None Include="Resources\Level1_AddingDevicesenbx" />
     <None Include="Resources\Level1_BadGateway.enbx" />
     <None Include="Resources\Level1_DuplicateMAC.enbx" />
     <None Include="Resources\Level1_OneNetTwoSubnets.enbx" />

EduNetworkBuilder/NB.cs

@@ -56,7 +56,7 @@ namespace EduNetworkBuilder
     {
         Level0_IP, Level1_NoGateway, Level0_NeedsLink, Level0_NoSwitch, Level1_BadDHCP, Level1_BadGateway,
         Level0_SimpleDHCP, Level1_BadIP, Level0_Help, Level0_Ping, Level0_HubVsSwitch, 
-        Level0_PacketCorruption1, Level0_PacketCorruption2, Level1_MixedNetwork,
+        Level0_PacketCorruption1, Level0_PacketCorruption2, Level1_AddingDevices,
         Level1_MidDHCP, Level1_OneNetTwoSubnets, Level1_DuplicateIPs, Level0_NetworkLoop, Level1_DuplicateMAC,
         Level2_FirewallDemo, Level1_OneNetTwoSubnets2, Level2_VPN_Demo, Level2_Bad_VPN_IP, Level2_Bad_Encryption,
         Level2_Bad_Route, Level2_Blast_From_Past, Level2_Not_Working, Level2_Build_A_VPN, Level2_Connect_The_Dots,

EduNetworkBuilder/Properties/Resources.Designer.cs

@@ -61,13 +61,8 @@ namespace EduNetworkBuilder.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033{\fonttbl{\f0\fnil\fcharset0 Calibri;}}
+        ///   Looks up a localized string similar to {\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff31507\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi31507\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f34\fbidi \froman\fcharset1\fprq2{\*\panose 02040503050406030204}Cambria Math;}
-        ///{\colortbl ;\red0\green0\blue255;}
+        ///{\f39\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}T [rest of string was truncated]&quot;;.
-        ///{\*\generator Riched20 6.3.9600}\viewkind4\uc1 
-        ///\pard\sa200\sl276\slmult1\f0\fs22\lang9 About EduNetworkBuilder\par
-        ///Written by Tim Young\par
-        ///{{\field{\*\fldinst{HYPERLINK http://tyounglightsys.ddns.info/EduNetworkBuilder }}{\fldrslt{http://tyounglightsys.ddns.info/EduNetworkBuilder\ul0\cf0}}}}\f0\fs22\par
-        ///This program was inspired by all the people I met in Africa who had a di [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string about {
             get {
@@ -145,8 +140,11 @@ namespace EduNetworkBuilder.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi0\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f2\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;}
+        ///   Looks up a localized string similar to {\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Calibri;}{\f1\fnil\fcharset0 Calibri;}{\f2\fmodern\fprq1\fcharset0 Courier New;}{\f3\fmodern\fprq1\fcharset0 Consolas;}}
-        ///{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}{\f39\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\f40\fb [rest of string was truncated]&quot;;.
+        ///{\colortbl ;\red0\green0\blue255;}
+        ///{\*\generator Riched20 10.0.10240}{\*\mmathPr\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 
+        ///\pard\widctlpar\sa200\sl276\slmult1\b\f0\fs22\lang9 Help:\b0\par
+        ///This is a basic help document for EduNetworkBuilder.  You can get to this by going to &quot;Help&quot; -&gt; [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string Help {
             get {
@@ -304,6 +302,16 @@ namespace EduNetworkBuilder.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] Level1_AddingDevices {
+            get {
+                object obj = ResourceManager.GetObject("Level1_AddingDevices", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
@@ -364,16 +372,6 @@ namespace EduNetworkBuilder.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Byte[].
-        /// </summary>
-        internal static byte[] Level1_MixedNetwork {
-            get {
-                object obj = ResourceManager.GetObject("Level1_MixedNetwork", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
@@ -844,13 +842,8 @@ namespace EduNetworkBuilder.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Calibri;}}
+        ///   Looks up a localized string similar to {\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff31507\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi31507\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f34\fbidi \froman\fcharset1\fprq2{\*\panose 02040503050406030204}Cambria Math;}
-        ///{\*\generator Riched20 10.0.10240}{\*\mmathPr\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 
+        ///{\f39\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}T [rest of string was truncated]&quot;;.
-        ///\pard\nowidctlpar\sa200\sl276\slmult1\b\f0\fs22\lang9 Version 1.0.24   \par
-        ///\b0 * Add sound when ctrl-s is pressed so we know we saved.\par
-        ///* Add sound fail when save is canceled (will use it later if ctrl-s fails)\par
-        ///* Added some wireless puzzles\par
-        ///* Fix issue with WAP not forwarding packets correc [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string ReleaseNotes {
             get {

EduNetworkBuilder/Properties/Resources.resx

@@ -205,9 +205,6 @@
   <data name="Level1_MidDHCP" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Level1-MidDHCP.enbx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="Level1_MixedNetwork" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Level1-MixedNetwork.enbx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="Level1_NoGateway" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Level1-NoGateway.enbx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -391,4 +388,7 @@
   <data name="Level5_HereComesTrouble" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Level5_HereComesTrouble.enbx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="Level1_AddingDevices" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Level1_AddingDevices.enbx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>