Merge pull request #1 from TimeHACKDevs/master

Merge

20 files changed, 43 insertions, 5 deletions

diff --git a/TimeHACK.Engine/obj/Debug/CoreCompileInputs.cache b/TimeHACK.Engine/obj/Debug/CoreCompileInputs.cache
index fbbd8f0..fc241b3 100644
--- a/TimeHACK.Engine/obj/Debug/CoreCompileInputs.cache
+++ b/TimeHACK.Engine/obj/Debug/CoreCompileInputs.cache
@@ -1 +1 @@
-7aea260e995a5c8b26639269dc8e3704ae145c65
+34172df9cedd638ac7a23f9204409797a1d64c7b
diff --git a/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index bac2e0d..c2faf9c 100644
--- a/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/TimeHACK.Engine/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/TimeHACK.Engine/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
new file mode 100644
index 0000000..3b060b6
--- /dev/null
+++ b/TimeHACK.Engine/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Properties.Resources.resources b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Properties.Resources.resources
new file mode 100644
index 0000000..db7dda3
--- /dev/null
+++ b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Properties.Resources.resources
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.AboutBox95.resources b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.AboutBox95.resources
new file mode 100644
index 0000000..6c05a97
--- /dev/null
+++ b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.AboutBox95.resources
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.Infobox95.resources b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.Infobox95.resources
new file mode 100644
index 0000000..6c05a97
--- /dev/null
+++ b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.Infobox95.resources
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.Win9XBSOD.resources b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.Win9XBSOD.resources
new file mode 100644
index 0000000..6c05a97
--- /dev/null
+++ b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.Win9XBSOD.resources
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.WinClassic.resources b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.WinClassic.resources
new file mode 100644
index 0000000..690267a
--- /dev/null
+++ b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.WinClassic.resources
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.FileListAbsolute.txt b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..4854434
--- /dev/null
+++ b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.FileListAbsolute.txt
@@ -0,0 +1,12 @@
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\bin\Debug\TimeHACK.Engine.dll
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\bin\Debug\TimeHACK.Engine.pdb
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\bin\Debug\Newtonsoft.Json.dll
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.csprojResolveAssemblyReference.cache
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Properties.Resources.resources
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.Win9XBSOD.resources
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.AboutBox95.resources
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.Infobox95.resources
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.WinClassic.resources
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.csproj.GenerateResource.Cache
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.dll
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.pdb
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.GenerateResource.Cache b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.GenerateResource.Cache
new file mode 100644
index 0000000..c63151a
--- /dev/null
+++ b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.GenerateResource.Cache
diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csprojResolveAssemblyReference.cache
index 7f234df..97183e6 100644
--- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache
+++ b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csprojResolveAssemblyReference.cache
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll
new file mode 100644
index 0000000..a041063
--- /dev/null
+++ b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb
new file mode 100644
index 0000000..7d98108
--- /dev/null
+++ b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb
diff --git a/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache b/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache
index 016901c..fc241b3 100644
--- a/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache
+++ b/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache
@@ -1 +1 @@
-03f745c6a0e75bab98ef9919670fab0f1de5ece4
+34172df9cedd638ac7a23f9204409797a1d64c7b
diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache
deleted file mode 100644
index 53f448c..0000000
--- a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache
+++ /dev/null
diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index 4103602..0000000
--- a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
+++ /dev/null
diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt
index ff60e63..f9bcb5d 100644
--- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt
+++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt
@@ -2,8 +2,6 @@ D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.dll
 D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.pdb
 D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csprojResolveAssemblyReference.cache
 D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Properties.Resources.resources
-D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Main.Template.Infobox95.resources
-D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Main.Template.WinClassic.resources
 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
@@ -30,7 +28,6 @@ I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK
 I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache
 I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll
 I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb
-I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csprojResolveAssemblyReference.cache
 C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\bin\Release\TimeHACK.Engine.dll
 C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\bin\Release\TimeHACK.Engine.pdb
 C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\bin\Release\Newtonsoft.Json.dll
@@ -43,3 +40,32 @@ C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\Time
 C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache
 C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll
 C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb
+D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\bin\Release\Newtonsoft.Json.dll
+D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Win9XBSOD.resources
+D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.AboutBox95.resources
+D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Infobox95.resources
+D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.WinClassic.resources
+C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.dll
+C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.pdb
+C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\bin\Release\Newtonsoft.Json.dll
+C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csprojResolveAssemblyReference.cache
+C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Properties.Resources.resources
+C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Win9XBSOD.resources
+C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.AboutBox95.resources
+C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Infobox95.resources
+C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.WinClassic.resources
+C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache
+C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll
+C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb
+C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.dll
+C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.pdb
+C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\bin\Release\Newtonsoft.Json.dll
+C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csprojResolveAssemblyReference.cache
+C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Properties.Resources.resources
+C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Win9XBSOD.resources
+C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.AboutBox95.resources
+C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Infobox95.resources
+C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.WinClassic.resources
+C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache
+C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll
+C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb
diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache
index 7b238df..5860591 100644
--- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache
+++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache
diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll
index 4bb4674..6e12988 100644
--- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll
+++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll
diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb
index bea88dc..7eebc93 100644
--- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb
+++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb