Merge branch 'master' of https://tyounglightsys.visualstudio.com/defaultcollection/_git/EduNetworkBuilder

EduNetworkBuilder/EduNetworkBuilder.csproj

@@ -255,6 +255,7 @@
     <None Include="Resources\Level4_SinglesLife.enbx" />
     <None Include="Resources\Level4_SmallSubnets.enbx" />
     <None Include="Resources\Level5_Failed.enbx" />
+    <None Include="Resources\Level5_HereComesTrouble.enbx" />
     <None Include="Resources\Level5_LostPacket.enbx" />
     <None Include="Resources\Level5_WirelessAccessPoint.enbx" />
     <None Include="Resources\Level5_WirelessBridge.enbx" />

EduNetworkBuilder/NB.cs

@@ -67,7 +67,7 @@ namespace EduNetworkBuilder
         Level4_DualWans, Level4_SinglesLife, Level4_SmallSubnets, Level4_OneRoute, Level4_RouterReplacement,
         Level4_InternalSubnetting, Level4_Internalhemorrhage,
         Level5_WirelessRouters, Level5_WirelessDevices, Level5_WirelessBridge, Level5_WirelessRepeater, Level5_WirelessRepeater2,
-        Level5_WirelessAccessPoint, Level5_WirelessCorruption, Level5_Failed, Level5_LostPacket
+        Level5_WirelessAccessPoint, Level5_WirelessCorruption, Level5_Failed, Level5_LostPacket, Level5_HereComesTrouble
     }
     public enum DebugPausePoint { none=0, packet_create=1, packet_kill=2, 
         packet_in=4, packet_out=8, packet_duplicate=16, all=63, 

EduNetworkBuilder/Properties/Resources.Designer.cs

@@ -145,11 +145,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;}{\f1\fnil\fcharset0 Calibri;}{\f2\fmodern\fprq1\fcharset0 Courier New;}{\f3\fmodern\fprq1\fcharset0 Consolas;}}
-        ///{\colortbl ;\red0\green0\blue255;}
-        ///{\*\generator Riched20 6.3.9600}{\*\mmathPr\mnaryLim0\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; [rest of string was truncated]&quot;;.
+        ///   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;}
+        ///{\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;;.
         /// </summary>
         internal static string Help {
             get {
@@ -687,6 +684,16 @@ namespace EduNetworkBuilder.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Byte[].
+        /// </summary>
+        internal static byte[] Level5_HereComesTrouble {
+            get {
+                object obj = ResourceManager.GetObject("Level5_HereComesTrouble", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
@@ -838,12 +845,12 @@ namespace EduNetworkBuilder.Properties {
         
         /// <summary>
         ///   Looks up a localized string similar to {\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Calibri;}}
-        ///{\*\generator Riched20 10.0.10240}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 
+        ///{\*\generator Riched20 10.0.10240}{\*\mmathPr\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 
         ///\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 pack [rest of string was truncated]&quot;;.
+        ///* Fix issue with WAP not forwarding packets correc [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string ReleaseNotes {
             get {

EduNetworkBuilder/Properties/Resources.resx

@@ -388,4 +388,7 @@
   <data name="Level5_WirelessRepeater2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Level5_WirelessRepeater2.enbx;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <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>
 </root>