Updated my fork!

Conflicts:
	Histacom2/TitleScreen.Designer.cs
	Histacom2/TitleScreen.cs

2 files changed, 99 insertions, 1 deletions

diff --git a/Histacom2/Properties/Resources.resx b/Histacom2/Properties/Resources.resx
index 782693e..c34dd0c 100644
--- a/Histacom2/Properties/Resources.resx
+++ b/Histacom2/Properties/Resources.resx
@@ -1755,6 +1755,13 @@
       "message": "and let me remind you... MS-DOS IS USELESS! NEXT TIME, DONT PIRATE SOFTWARE!",
       "special": null,
       "userchat": true
+    },
+    {
+      "user": "12padams",
+      "delay": 5000,
+      "message": "",
+      "special": ".cmd-end",
+      "userchat": false
     }
   ]
 }</value>
@@ -2095,4 +2102,25 @@
   <data name="Win95PlusTravelWallpaper" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\win95plustravelwallpaper.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="sliveroldlace" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\WinClassic\sliveroldlace.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="TimeDistorter3Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\WinClassic\TimeDistorter3Icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="WinXPClose" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\WinClassic\WinXPClose.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="WinXPError" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\WinClassic\WinXPError.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="WinXPIE6Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\WinClassic\WinXPIE6Icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Win98Welcome" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\WinClassic\Win98Welcome.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="distort_fail" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\distort fail.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Histacom2/Properties/Resources1.Designer.cs b/Histacom2/Properties/Resources1.Designer.cs
index 07a3730..a053ed4 100644
--- a/Histacom2/Properties/Resources1.Designer.cs
+++ b/Histacom2/Properties/Resources1.Designer.cs
@@ -168,6 +168,15 @@ namespace Histacom2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
         /// </summary>
+        public static System.IO.UnmanagedMemoryStream distort_fail {
+            get {
+                return ResourceManager.GetStream("distort_fail", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream.
+        /// </summary>
         public static System.IO.UnmanagedMemoryStream distort1 {
             get {
                 return ResourceManager.GetStream("distort1", resourceCulture);
@@ -886,6 +895,16 @@ namespace Histacom2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
+        public static System.Drawing.Bitmap sliveroldlace {
+            get {
+                object obj = ResourceManager.GetObject("sliveroldlace", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
         public static System.Drawing.Bitmap sliversilver {
             get {
                 object obj = ResourceManager.GetObject("sliversilver", resourceCulture);
@@ -1096,6 +1115,16 @@ namespace Histacom2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
+        public static System.Drawing.Bitmap TimeDistorter3Icon {
+            get {
+                object obj = ResourceManager.GetObject("TimeDistorter3Icon", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
         public static System.Drawing.Bitmap TrueColor {
             get {
                 object obj = ResourceManager.GetObject("TrueColor", resourceCulture);
@@ -1128,7 +1157,8 @@ namespace Histacom2.Properties {
         ///      &quot;userchat&quot;: true
         ///    },
         ///    {
-        ///     [rest of string was truncated]&quot;;.
+        ///      &quot;user&quot;: &quot;SkyHigh&quot;,
+        ///    [rest of string was truncated]&quot;;.
         /// </summary>
         public static string webchat1998_convo {
             get {
@@ -1546,6 +1576,16 @@ namespace Histacom2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
+        public static System.Drawing.Bitmap Win98Welcome {
+            get {
+                object obj = ResourceManager.GetObject("Win98Welcome", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
         public static System.Drawing.Bitmap WinAboutSeparator95 {
             get {
                 object obj = ResourceManager.GetObject("WinAboutSeparator95", resourceCulture);
@@ -2166,6 +2206,16 @@ namespace Histacom2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
+        public static System.Drawing.Bitmap WinXPClose {
+            get {
+                object obj = ResourceManager.GetObject("WinXPClose", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
         public static System.Drawing.Bitmap WinXPComputerSmall {
             get {
                 object obj = ResourceManager.GetObject("WinXPComputerSmall", resourceCulture);
@@ -2196,6 +2246,16 @@ namespace Histacom2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
+        public static System.Drawing.Bitmap WinXPError {
+            get {
+                object obj = ResourceManager.GetObject("WinXPError", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
         public static System.Drawing.Bitmap WinXPIE6 {
             get {
                 object obj = ResourceManager.GetObject("WinXPIE6", resourceCulture);
@@ -2206,6 +2266,16 @@ namespace Histacom2.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
+        public static System.Drawing.Bitmap WinXPIE6Icon {
+            get {
+                object obj = ResourceManager.GetObject("WinXPIE6Icon", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
         public static System.Drawing.Bitmap WinXPMediaPlayer {
             get {
                 object obj = ResourceManager.GetObject("WinXPMediaPlayer", resourceCulture);