From 9a1b910ea32f518b605c88315f192afc6fc40f28 Mon Sep 17 00:00:00 2001 From: Zoryn Date: Thu, 3 Mar 2016 15:06:25 -0500 Subject: resync for merge conflicts --- .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 0 -> 7163 bytes .../StardewInjector.csproj.FileListAbsolute.txt | 22 +++++++++++++++++++++ ...ewInjector.csprojResolveAssemblyReference.cache | Bin 0 -> 60415 bytes StardewInjector/obj/Debug/StardewInjector.dll | Bin 0 -> 18432 bytes StardewInjector/obj/Debug/StardewInjector.pdb | Bin 0 -> 42496 bytes ...tedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs | 0 ...tedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs | 0 ...tedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs | 0 8 files changed, 22 insertions(+) create mode 100644 StardewInjector/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache create mode 100644 StardewInjector/obj/Debug/StardewInjector.csproj.FileListAbsolute.txt create mode 100644 StardewInjector/obj/Debug/StardewInjector.csprojResolveAssemblyReference.cache create mode 100644 StardewInjector/obj/Debug/StardewInjector.dll create mode 100644 StardewInjector/obj/Debug/StardewInjector.pdb create mode 100644 StardewInjector/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs create mode 100644 StardewInjector/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs create mode 100644 StardewInjector/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs (limited to 'StardewInjector/obj/Debug') diff --git a/StardewInjector/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/StardewInjector/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache new file mode 100644 index 00000000..836ea946 Binary files /dev/null and b/StardewInjector/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/StardewInjector/obj/Debug/StardewInjector.csproj.FileListAbsolute.txt b/StardewInjector/obj/Debug/StardewInjector.csproj.FileListAbsolute.txt new file mode 100644 index 00000000..95f28c1a --- /dev/null +++ b/StardewInjector/obj/Debug/StardewInjector.csproj.FileListAbsolute.txt @@ -0,0 +1,22 @@ +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\obj\Debug\StardewInjector.csprojResolveAssemblyReference.cache +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\steam_appid.txt +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\StardewInjector.dll.config +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\StardewInjector.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\StardewInjector.pdb +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Microsoft.Xna.Framework.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Microsoft.Xna.Framework.Game.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Mono.Cecil.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\StardewModdingAPI.exe +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Stardew Valley.exe +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Microsoft.Xna.Framework.Graphics.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\xTile.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Lidgren.Network.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Microsoft.Xna.Framework.Xact.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Steamworks.NET.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\StardewModdingAPI.pdb +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Microsoft.Xna.Framework.xml +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Microsoft.Xna.Framework.Game.xml +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Microsoft.Xna.Framework.Graphics.xml +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\bin\Debug\Microsoft.Xna.Framework.Xact.xml +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\obj\Debug\StardewInjector.dll +C:\Users\zoryn\Documents\GitHub\SMAPI\StardewInjector\obj\Debug\StardewInjector.pdb diff --git a/StardewInjector/obj/Debug/StardewInjector.csprojResolveAssemblyReference.cache b/StardewInjector/obj/Debug/StardewInjector.csprojResolveAssemblyReference.cache new file mode 100644 index 00000000..e17ed343 Binary files /dev/null and b/StardewInjector/obj/Debug/StardewInjector.csprojResolveAssemblyReference.cache differ diff --git a/StardewInjector/obj/Debug/StardewInjector.dll b/StardewInjector/obj/Debug/StardewInjector.dll new file mode 100644 index 00000000..ec198674 Binary files /dev/null and b/StardewInjector/obj/Debug/StardewInjector.dll differ diff --git a/StardewInjector/obj/Debug/StardewInjector.pdb b/StardewInjector/obj/Debug/StardewInjector.pdb new file mode 100644 index 00000000..ea65643b Binary files /dev/null and b/StardewInjector/obj/Debug/StardewInjector.pdb differ diff --git a/StardewInjector/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/StardewInjector/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs new file mode 100644 index 00000000..e69de29b diff --git a/StardewInjector/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/StardewInjector/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs new file mode 100644 index 00000000..e69de29b diff --git a/StardewInjector/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/StardewInjector/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs new file mode 100644 index 00000000..e69de29b -- cgit