Merge branch 'master' into master

27 files changed, 3 insertions, 64 deletions

diff --git a/TimeHACK.Engine/obj/Debug/CoreCompileInputs.cache b/TimeHACK.Engine/obj/Debug/CoreCompileInputs.cache
deleted file mode 100644
index e643aba..0000000
--- a/TimeHACK.Engine/obj/Debug/CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-460f0157ea76b7d34a5b2804ca785964642b50da
diff --git a/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferences.cache
deleted file mode 100644
index 8ab60bb..0000000
--- a/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferences.cache
+++ /dev/null
diff --git a/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index ccee681..0000000
--- a/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ /dev/null
diff --git a/TimeHACK.Engine/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/TimeHACK.Engine/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
deleted file mode 100644
index c174fa7..0000000
--- a/TimeHACK.Engine/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
+++ /dev/null
diff --git a/TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
deleted file mode 100644
index e69de29..0000000
--- a/TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
+++ /dev/null
diff --git a/TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
deleted file mode 100644
index e69de29..0000000
--- a/TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
+++ /dev/null
diff --git a/TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
deleted file mode 100644
index e69de29..0000000
--- a/TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
+++ /dev/null
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.OSProgramTemplates.WinClassic.resources b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.OSProgramTemplates.WinClassic.resources
deleted file mode 100644
index 2a79d99..0000000
--- a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.OSProgramTemplates.WinClassic.resources
+++ /dev/null
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.WinClassic.resources b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.WinClassic.resources
deleted file mode 100644
index 2a79d99..0000000
--- a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.WinClassic.resources
+++ /dev/null
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.FileListAbsolute.txt b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.FileListAbsolute.txt
deleted file mode 100644
index 4a48440..0000000
--- a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\bin\Debug\TimeHACK.Engine.dll
-D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\bin\Debug\TimeHACK.Engine.pdb
-D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.csprojResolveAssemblyReference.cache
-D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Properties.Resources.resources
-D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.csproj.GenerateResource.Cache
-D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.dll
-D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.pdb
-D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.WinClassic.resources
-C:\Users\Liam\Documents\GitHub\TimeHACK-lempfork\TimeHACK.Engine\bin\Debug\TimeHACK.Engine.dll
-C:\Users\Liam\Documents\GitHub\TimeHACK-lempfork\TimeHACK.Engine\bin\Debug\TimeHACK.Engine.pdb
-C:\Users\Liam\Documents\GitHub\TimeHACK-lempfork\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.csprojResolveAssemblyReference.cache
-C:\Users\Liam\Documents\GitHub\TimeHACK-lempfork\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Properties.Resources.resources
-C:\Users\Liam\Documents\GitHub\TimeHACK-lempfork\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.WinClassic.resources
-C:\Users\Liam\Documents\GitHub\TimeHACK-lempfork\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.csproj.GenerateResource.Cache
-C:\Users\Liam\Documents\GitHub\TimeHACK-lempfork\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.dll
-C:\Users\Liam\Documents\GitHub\TimeHACK-lempfork\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.pdb
-F:\Users\force\Documents\TimeHACK-master\TimeHACK.Engine\bin\Debug\TimeHACK.Engine.dll
-F:\Users\force\Documents\TimeHACK-master\TimeHACK.Engine\bin\Debug\TimeHACK.Engine.pdb
-F:\Users\force\Documents\TimeHACK-master\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.csprojResolveAssemblyReference.cache
-F:\Users\force\Documents\TimeHACK-master\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Properties.Resources.resources
-F:\Users\force\Documents\TimeHACK-master\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.WinClassic.resources
-F:\Users\force\Documents\TimeHACK-master\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.csproj.GenerateResource.Cache
-F:\Users\force\Documents\TimeHACK-master\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.dll
-F:\Users\force\Documents\TimeHACK-master\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.pdb
-C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.csprojResolveAssemblyReference.cache
-C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Properties.Resources.resources
-C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.WinClassic.resources
-C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.csproj.GenerateResource.Cache
-C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.dll
-C:\Users\Liam\Documents\GitHub\TimeHACK-fork\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
deleted file mode 100644
index f56c00b..0000000
--- a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.GenerateResource.Cache
+++ /dev/null
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csprojResolveAssemblyReference.cache b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csprojResolveAssemblyReference.cache
deleted file mode 100644
index 934fb3e..0000000
--- a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csprojResolveAssemblyReference.cache
+++ /dev/null
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll
deleted file mode 100644
index 4dce794..0000000
--- a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll
+++ /dev/null
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb
deleted file mode 100644
index 7d792d6..0000000
--- a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb
+++ /dev/null
diff --git a/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache b/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache
index 92e7a42..20462da 100644
--- a/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache
+++ b/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache
@@ -1 +1 @@
-6df66cf222f539a000e42b43e1a270bbc9342c86
+476b7a55df50518a8e0b6090961e3fa4581c5b5f
diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache
index 22cb9e6..928595b 100644
--- a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache
+++ b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache
diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
index 4b8aab4..5eb069d 100644
--- a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
index 2ef289a..dbb0d34 100644
--- a/TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
+++ b/TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources
index b31c83c..5b2609b 100644
--- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources
+++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources
diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.WinClassic.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.WinClassic.resources
deleted file mode 100644
index f52d56e..0000000
--- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.WinClassic.resources
+++ /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 72e6bb9..07ae83e 100644
--- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt
+++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt
@@ -1,39 +1,9 @@
-C:\Users\Liam\Documents\GitHub\TimeHACK-lempfork\TimeHACK.Engine\bin\Release\TimeHACK.Engine.dll
-C:\Users\Liam\Documents\GitHub\TimeHACK-lempfork\TimeHACK.Engine\bin\Release\TimeHACK.Engine.pdb
-C:\Users\Liam\Documents\GitHub\TimeHACK-lempfork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Properties.Resources.resources
-C:\Users\Liam\Documents\GitHub\TimeHACK-lempfork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.WinClassic.resources
-C:\Users\Liam\Documents\GitHub\TimeHACK-lempfork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache
-C:\Users\Liam\Documents\GitHub\TimeHACK-lempfork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll
-C:\Users\Liam\Documents\GitHub\TimeHACK-lempfork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb
-C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\bin\Release\TimeHACK.Engine.dll
-C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\bin\Release\TimeHACK.Engine.pdb
-C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Properties.Resources.resources
-C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.WinClassic.resources
-C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache
-C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll
-C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb
-C:\Users\Liam\Documents\GitHub\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.dll
-C:\Users\Liam\Documents\GitHub\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.pdb
-C:\Users\Liam\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csprojResolveAssemblyReference.cache
-C:\Users\Liam\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Properties.Resources.resources
-C:\Users\Liam\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.WinClassic.resources
-C:\Users\Liam\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache
-C:\Users\Liam\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll
-C:\Users\Liam\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb
-F:\Users\force\Documents\TimeHackGIT\TimeHACK.Engine\bin\Release\TimeHACK.Engine.dll
-F:\Users\force\Documents\TimeHackGIT\TimeHACK.Engine\bin\Release\TimeHACK.Engine.pdb
-F:\Users\force\Documents\TimeHackGIT\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csprojResolveAssemblyReference.cache
-F:\Users\force\Documents\TimeHackGIT\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Properties.Resources.resources
-F:\Users\force\Documents\TimeHackGIT\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.WinClassic.resources
-F:\Users\force\Documents\TimeHackGIT\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache
-F:\Users\force\Documents\TimeHackGIT\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll
-F:\Users\force\Documents\TimeHackGIT\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb
 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.Engine.Template.WinClassic.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
-C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csprojResolveAssemblyReference.cache
diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache
index 53df2c1..1412226 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.csprojResolveAssemblyReference.cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache
index af4ea3d..b980bb4 100644
--- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache
+++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache
diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll
index 1f723ec..74df9a1 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 3f23fba..c4e9182 100644
--- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb
+++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb
diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Main.Template.Infobox95.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Main.Template.Infobox95.resources
new file mode 100644
index 0000000..28199df
--- /dev/null
+++ b/TimeHACK.Engine/obj/Release/TimeHACK.Main.Template.Infobox95.resources
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Properties.Resources.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Main.Template.WinClassic.resources
index 9629cd7..690267a 100644
--- a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Properties.Resources.resources
+++ b/TimeHACK.Engine/obj/Release/TimeHACK.Main.Template.WinClassic.resources