diff options
| author | AShifter <[email protected]> | 2017-06-10 10:28:06 -0600 |
|---|---|---|
| committer | AShifter <[email protected]> | 2017-06-10 10:28:06 -0600 |
| commit | 6fe33a8837e18a65c063bc38f447a7c4fc60e540 (patch) | |
| tree | 3cf6cc895dde155b262da818b05d85e403d4751f | |
| parent | 22b7ec620f8708c0f922e3883b82b01431b5ef05 (diff) | |
| download | histacom2-6fe33a8837e18a65c063bc38f447a7c4fc60e540.tar.gz histacom2-6fe33a8837e18a65c063bc38f447a7c4fc60e540.tar.bz2 histacom2-6fe33a8837e18a65c063bc38f447a7c4fc60e540.zip | |
re fix things
yoy
19 files changed, 24 insertions, 2 deletions
diff --git a/.vs/TimeHACK/v15/.suo b/.vs/TimeHACK/v15/.suo Binary files differindex b597e51..63ad0c8 100644 --- a/.vs/TimeHACK/v15/.suo +++ b/.vs/TimeHACK/v15/.suo diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll Binary files differindex 843ed25..746c4e9 100644 --- a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll +++ b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb Binary files differindex d856f49..9b17eca 100644 --- a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb +++ b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb diff --git a/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache b/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache index 2a875f4..653c3c4 100644 --- a/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache +++ b/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache @@ -1 +1 @@ -ce9c5da841ac94441144344852958905f2496327 +2e843e63d81f85d28b296935356be2ecc6190ae4 diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache Binary files differindex e421fcc..4d12d8e 100644 --- a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache +++ b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources Binary files differindex 999bbc4..922e583 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 Binary files differindex bb123eb..690267a 100644 --- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.WinClassic.resources +++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.WinClassic.resources diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache Binary files differindex 888b842..4d43d2f 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 Binary files differindex a197860..1de6ed7 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 Binary files differindex 843ed25..746c4e9 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 Binary files differindex d856f49..9b17eca 100644 --- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb +++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index 6b78699..0cbdbf6 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -122,6 +122,19 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> + <Compile Include="OS\Win95\Win95Apps\Story\Hack1.cs" /> + <Compile Include="OS\Win95\Win95Apps\WinClassicFTPClient.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="OS\Win95\Win95Apps\WinClassicFTPClient.Designer.cs"> + <DependentUpon>WinClassicFTPClient.cs</DependentUpon> + </Compile> + <Compile Include="OS\Win95\Win95Apps\WinClassicTerminal.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="OS\Win95\Win95Apps\WinClassicTerminal.Designer.cs"> + <DependentUpon>WinClassicTerminal.cs</DependentUpon> + </Compile> <Compile Include="OS\Win95\Win95Apps\WinClassicWindowsExplorer.cs"> <SubType>UserControl</SubType> </Compile> @@ -255,6 +268,12 @@ <Compile Include="TitleScreen.Designer.cs"> <DependentUpon>TitleScreen.cs</DependentUpon> </Compile> + <EmbeddedResource Include="OS\Win95\Win95Apps\WinClassicFTPClient.resx"> + <DependentUpon>WinClassicFTPClient.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="OS\Win95\Win95Apps\WinClassicTerminal.resx"> + <DependentUpon>WinClassicTerminal.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="OS\Win95\Win95Apps\WinClassicWindowsExplorer.resx"> <DependentUpon>WinClassicWindowsExplorer.cs</DependentUpon> </EmbeddedResource> diff --git a/TimeHACK.Main/obj/Release/CoreCompileInputs.cache b/TimeHACK.Main/obj/Release/CoreCompileInputs.cache index b553a6e..a30e381 100644 --- a/TimeHACK.Main/obj/Release/CoreCompileInputs.cache +++ b/TimeHACK.Main/obj/Release/CoreCompileInputs.cache @@ -1 +1 @@ -8db664c2a85504fd808659509bebd1f75d52ef6c +114a75f89f00e735f973e97219ae38c3263d9c1a diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache Binary files differindex df5a199..d50643a 100644 --- a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache +++ b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt index 015f6d4..154e793 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt @@ -126,3 +126,6 @@ C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.exe C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.pdb
I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win98.Windows98.resources
I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.SaveDialogs.SaveFileTroubleShooter.resources
+C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.resources
+C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win98.Windows98.resources
+C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.SaveDialogs.SaveFileTroubleShooter.resources
diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache Binary files differindex a374a92..55f49ba 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache Binary files differindex b6c9aed..a25e678 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.resources Binary files differindex 9edd0e6..ffc7d5b 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.resources +++ b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.resources diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Windows95.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Windows95.resources Binary files differindex 073b485..0bbf7ee 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Windows95.resources +++ b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Windows95.resources |
