Merge remote-tracking branch 'origin/master'

# Conflicts:

#	TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache

#	TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt

#	TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache
#	TimeHACK.Main/bin/Release/TimeHACK.application
#	TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache

#	TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
#	TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache

#	TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache
#	TimeHACK.Main/obj/Release/TimeHACK.application

3 files changed, 28 insertions, 0 deletions

diff --git a/TimeHACK.Engine/WCMessageParser.cs b/TimeHACK.Engine/WCMessageParser.cs
new file mode 100644
index 0000000..ed16afd
--- /dev/null
+++ b/TimeHACK.Engine/WCMessageParser.cs
@@ -0,0 +1,24 @@
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TimeHACK.Engine
+{
+    class WCMessageParser
+    {
+        public string ParseMessage(string json, int index, string user)
+        {
+            JObject message = JObject.Parse(JObject.Parse(json)["messages"][index].ToString());
+            string newmsg = message["message"].ToString().Replace("@user", user);
+            return message["user"].ToString() + ": " + newmsg;
+        }
+        public int GetMessageDelay(string json, int index)
+        {
+            JObject message = JObject.Parse(JObject.Parse(json)["messages"][index].ToString());
+            return message["delay"].ToObject<int>();
+        }
+    }
+}
diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt
index fb39c27..8ed1e7f 100644
--- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt
+++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt
@@ -35,5 +35,9 @@ D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Propert
 D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache
 D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll
 D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb
+<<<<<<< HEAD
 D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Main.Template.WinClassic.resources
 D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Main.Template.Infobox95.resources
+=======
+C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csprojResolveAssemblyReference.cache
+>>>>>>> origin/master
diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache
index 6f79d45..af4ea3d 100644
--- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache
+++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache