From e2213726e627553783571fa631dd032f773f8794 Mon Sep 17 00:00:00 2001 From: AShifter Date: Fri, 31 Mar 2017 09:04:48 -0600 Subject: Fix stuff don't give me any conflicts k thx --- TimeHACK.Main/obj/Release/CoreCompileInputs.cache | 2 +- .../DesignTimeResolveAssemblyReferences.cache | Bin 52637 -> 52637 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 13003 -> 11911 bytes .../TempPE/Properties.Resources.Designer.cs.dll | Bin 9728 -> 9728 bytes .../TimeHACK.Main.csproj.FileListAbsolute.txt | 5 +++-- .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 4291 -> 948 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 34774 -> 44159 bytes .../TimeHACK.Properties.Resources.resources | Bin 3837216 -> 3837216 bytes .../obj/Release/TimeHACK.TitleScreen.resources | Bin 193409 -> 193409 bytes .../Release/TimeHACK.WinClassicTemplate.resources | Bin 2609 -> 0 bytes .../obj/Release/TimeHACK.Windows95.resources | Bin 142120 -> 142120 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 4 ++-- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 4304896 -> 4304896 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 13 +++++++++++-- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 116224 -> 116224 bytes 15 files changed, 17 insertions(+), 7 deletions(-) delete mode 100644 TimeHACK.Main/obj/Release/TimeHACK.WinClassicTemplate.resources (limited to 'TimeHACK.Main/obj') diff --git a/TimeHACK.Main/obj/Release/CoreCompileInputs.cache b/TimeHACK.Main/obj/Release/CoreCompileInputs.cache index 776edbb..5b282f5 100644 --- a/TimeHACK.Main/obj/Release/CoreCompileInputs.cache +++ b/TimeHACK.Main/obj/Release/CoreCompileInputs.cache @@ -1 +1 @@ -a0c030752221b02cd9f21ad9ef12e0e842c270ff +824f4cc0e075c255e2f4f1df0919d162affd7f9b diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache index ffe0bea..b21e519 100644 Binary files a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index 5bad892..7d7e180 100644 Binary files a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll index 905e810..02752c2 100644 Binary files a/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll and b/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt index 906757d..c780125 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt @@ -1,8 +1,6 @@ D:\Documents\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Main.csprojResolveAssemblyReference.cache -D:\Documents\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.WinClassicIE4.resources D:\Documents\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Windows95.resources D:\Documents\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.TitleScreen.resources -D:\Documents\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.WinClassicTemplate.resources D:\Documents\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Main.csproj.GenerateResource.Cache D:\Documents\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.exe D:\Documents\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.pdb @@ -114,3 +112,6 @@ F:\Users\force\Documents\TimeHackGIT\TimeHACK.Main\bin\Release\TimeHACK.Engine.p F:\Users\force\Documents\TimeHackGIT\TimeHACK.Main\bin\Release\Newtonsoft.Json.xml F:\Users\force\Documents\TimeHackGIT\TimeHACK.Main\obj\Release\TimeHACK.exe.manifest F:\Users\force\Documents\TimeHackGIT\TimeHACK.Main\obj\Release\TimeHACK.application +D:\Documents\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicDownloader.resources +D:\Documents\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicIE4.resources +D:\Documents\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicInstaller.resources diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index a4f1091..e302cc7 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache index 56d08cd..8d183db 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources b/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources index 0d51bea..319d5f5 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources and b/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.TitleScreen.resources b/TimeHACK.Main/obj/Release/TimeHACK.TitleScreen.resources index 96f2158..51ab95c 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.TitleScreen.resources and b/TimeHACK.Main/obj/Release/TimeHACK.TitleScreen.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicTemplate.resources b/TimeHACK.Main/obj/Release/TimeHACK.WinClassicTemplate.resources deleted file mode 100644 index 2a79d99..0000000 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicTemplate.resources and /dev/null differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Windows95.resources b/TimeHACK.Main/obj/Release/TimeHACK.Windows95.resources index eeb8589..72a3dd8 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Windows95.resources and b/TimeHACK.Main/obj/Release/TimeHACK.Windows95.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index 83d1107..3564ab7 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -7,14 +7,14 @@ - + - 5a9h2X2t0Dj9rJMnIryLPsaET63h0tHbHFwSEBh2QPA= + qaapyX2jr0UWaYXTbselFOkiBXRtz6ImXgg1+L1diVE= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 6369938..479bc96 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.exe and b/TimeHACK.Main/obj/Release/TimeHACK.exe differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest index 1d7c3d4..fb36093 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -63,7 +63,7 @@ - plR98K+NhvVW+NWDVr/6Ridl1ZBQjbEHLs+io1Ljf4k= + U7Kekeyx6Ql+9uqUNh8/OwQYQaKLz8r3pS1n2eI6994= @@ -75,7 +75,7 @@ - JcbRZTkAsDszUwGNpbxDF8k8HOqul6OO1xlMBp+H1As= + egCP83neM3apVMcIH6zkNIiRVob2rALwSMmYPhotJik= @@ -457,6 +457,15 @@ yrDBF1QPiJUsw5OapnDIEykQ8dj5guyF87IFQaEAs2w= + + + + + + + T9l945vYoKcCSIEDDqot2H3OVrkVxqkoQ/E6pZokY8g= + + diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index 70c79d8..6239284 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3