Trying to fix the conflicts

16 files changed, 36 insertions, 15 deletions

diff --git a/.vs/TimeHACK/v15/.suo b/.vs/TimeHACK/v15/.suo
index 801d8c8..196d511 100644
--- a/.vs/TimeHACK/v15/.suo
+++ b/.vs/TimeHACK/v15/.suo
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
new file mode 100644
index 0000000..6ccf169
--- /dev/null
+++ b/.vs/VSWorkspaceState.json
@@ -0,0 +1,8 @@
+{
+  "ExpandedNodes": [
+    "",
+    "\\TimeHACK.Engine"
+  ],
+  "SelectedNode": "\\TimeHACK.Engine\\MessageParser.cs",
+  "PreviewInSolutionExplorer": false
+}
\ No newline at end of file
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
new file mode 100644
index 0000000..62ecf7b
--- /dev/null
+++ b/.vs/slnx.sqlite
diff --git a/TimeHACK.Engine/WCMessageParser.cs b/TimeHACK.Engine/MessageParser.cs
index ef7efd0..168ab8d 100644
--- a/TimeHACK.Engine/WCMessageParser.cs
+++ b/TimeHACK.Engine/MessageParser.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace TimeHACK.Engine
 {
-    public class WCMessageParser
+    public class MessageParser
     {
         public string ParseMessage(string json, int index, string user)
         {
diff --git a/TimeHACK.Engine/TimeHACK.Engine.csproj b/TimeHACK.Engine/TimeHACK.Engine.csproj
index 8755faf..f110aaa 100644
--- a/TimeHACK.Engine/TimeHACK.Engine.csproj
+++ b/TimeHACK.Engine/TimeHACK.Engine.csproj
@@ -73,7 +73,7 @@
       <DependentUpon>WinClassic.cs</DependentUpon>
     </Compile>
     <Compile Include="WindowManager.cs" />
-    <Compile Include="WCMessageParser.cs" />
+    <Compile Include="MessageParser.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
diff --git a/TimeHACK.Engine/obj/Debug/CoreCompileInputs.cache b/TimeHACK.Engine/obj/Debug/CoreCompileInputs.cache
new file mode 100644
index 0000000..fbbd8f0
--- /dev/null
+++ b/TimeHACK.Engine/obj/Debug/CoreCompileInputs.cache
@@ -0,0 +1 @@
+7aea260e995a5c8b26639269dc8e3704ae145c65
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
index 26ad12b..2e24af2 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
@@ -19,7 +19,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
     {
         int chat_index = 0;
         WindowManager wm = new WindowManager();
-        WCMessageParser wcmp = new WCMessageParser();
+        MessageParser wcmp = new MessageParser();
         bool correctname = false;
         bool guessing = false;
 
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.Designer.cs
index 1355c93..d59f803 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.Designer.cs
@@ -1,6 +1,6 @@
 namespace TimeHACK.OS.Win95.Win95Apps
 {
-    partial class Win95Notepad
+    partial class WinClassicNotepad
     {
         /// <summary> 
         /// Required designer variable.
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs
index 390614d..24525ea 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs
@@ -11,9 +11,9 @@ using TimeHACK.Engine;
 
 namespace TimeHACK.OS.Win95.Win95Apps
 {
-    public partial class Win95Notepad : UserControl
+    public partial class WinClassicNotepad : UserControl
     {
-        public Win95Notepad()
+        public WinClassicNotepad()
         {
             InitializeComponent();
             foreach (ToolStripMenuItem item in menuStrip1.Items)
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.resx
index d5494e3..d5494e3 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.resx
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.resx
diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj
index e3fec35..5a548e9 100644
--- a/TimeHACK.Main/TimeHACK.Main.csproj
+++ b/TimeHACK.Main/TimeHACK.Main.csproj
@@ -137,12 +137,6 @@
     <Compile Include="OS\Win95\Win95Apps\WebChat1998.Designer.cs">
       <DependentUpon>WebChat1998.cs</DependentUpon>
     </Compile>
-    <Compile Include="OS\Win95\Win95Apps\Win95Notepad.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="OS\Win95\Win95Apps\Win95Notepad.Designer.cs">
-      <DependentUpon>Win95Notepad.cs</DependentUpon>
-    </Compile>
     <Compile Include="OS\Win95\Win95Apps\WinClassicAddressBook.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -173,6 +167,12 @@
     <Compile Include="OS\Win95\Win95Apps\WinClassicInstaller.Designer.cs">
       <DependentUpon>WinClassicInstaller.cs</DependentUpon>
     </Compile>
+    <Compile Include="OS\Win95\Win95Apps\WinClassicNotepad.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="OS\Win95\Win95Apps\WinClassicNotepad.Designer.cs">
+      <DependentUpon>WinClassicNotepad.cs</DependentUpon>
+    </Compile>
     <Compile Include="OS\Win95\Win95Apps\WinClassicWordPad.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -207,9 +207,6 @@
     <EmbeddedResource Include="OS\Win95\Win95Apps\WebChat1998.resx">
       <DependentUpon>WebChat1998.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OS\Win95\Win95Apps\Win95Notepad.resx">
-      <DependentUpon>Win95Notepad.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="OS\Win95\Win95Apps\WinClassicAddressBook.resx">
       <DependentUpon>WinClassicAddressBook.cs</DependentUpon>
     </EmbeddedResource>
@@ -225,6 +222,9 @@
     <EmbeddedResource Include="OS\Win95\Win95Apps\WinClassicInstaller.resx">
       <DependentUpon>WinClassicInstaller.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="OS\Win95\Win95Apps\WinClassicNotepad.resx">
+      <DependentUpon>WinClassicNotepad.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="OS\Win95\Win95Apps\WinClassicWordPad.resx">
       <DependentUpon>WinClassicWordPad.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/TimeHACK.Main/TimeHACK.Main.csproj.user b/TimeHACK.Main/TimeHACK.Main.csproj.user
index 2e3e041..c891eab 100644
--- a/TimeHACK.Main/TimeHACK.Main.csproj.user
+++ b/TimeHACK.Main/TimeHACK.Main.csproj.user
@@ -2,5 +2,14 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <EnableSecurityDebugging>false</EnableSecurityDebugging>
+    <PublishUrlHistory>C:\Users\Logan\Desktop\</PublishUrlHistory>
+    <InstallUrlHistory />
+    <SupportUrlHistory />
+    <UpdateUrlHistory />
+    <BootstrapperUrlHistory />
+    <ErrorReportUrlHistory />
+    <FallbackCulture>en-US</FallbackCulture>
+    <VerifyUploadedFiles>false</VerifyUploadedFiles>
+    <ProjectView>ProjectFiles</ProjectView>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/TimeHACK.Main/obj/Debug/CoreCompileInputs.cache b/TimeHACK.Main/obj/Debug/CoreCompileInputs.cache
new file mode 100644
index 0000000..c553562
--- /dev/null
+++ b/TimeHACK.Main/obj/Debug/CoreCompileInputs.cache
@@ -0,0 +1 @@
+ea0fa5f0221e27ece6217941417845db4b759e67
diff --git a/TimeHACK.Main/obj/Release/build.force b/TimeHACK.Main/obj/Release/build.force
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/TimeHACK.Main/obj/Release/build.force
diff --git a/TimeHACK.Main/obj/x86/Debug/CoreCompileInputs.cache b/TimeHACK.Main/obj/x86/Debug/CoreCompileInputs.cache
new file mode 100644
index 0000000..7c177d3
--- /dev/null
+++ b/TimeHACK.Main/obj/x86/Debug/CoreCompileInputs.cache
@@ -0,0 +1 @@
+86b5ff98b766c91f9ca0e0802e11415089e5b2c5
diff --git a/TimeHACK.Main/obj/x86/Release/CoreCompileInputs.cache b/TimeHACK.Main/obj/x86/Release/CoreCompileInputs.cache
new file mode 100644
index 0000000..7c177d3
--- /dev/null
+++ b/TimeHACK.Main/obj/x86/Release/CoreCompileInputs.cache
@@ -0,0 +1 @@
+86b5ff98b766c91f9ca0e0802e11415089e5b2c5