Commit Graph

31 Commits

Author SHA1 Message Date
yangzhi 8dbd00eade Fix loader's link error problem 2023-06-16 16:19:45 +08:00
zhiyang7 3e43d69745 Merge remote-tracking branch 'pathoschild/stable' into develop
# Conflicts:
#	.gitignore
#	build/common.targets
#	src/SMAPI.Mods.ConsoleCommands/SMAPI.Mods.ConsoleCommands.csproj
#	src/SMAPI.Mods.SaveBackup/SMAPI.Mods.SaveBackup.csproj
#	src/SMAPI.Tests/SMAPI.Tests.csproj
#	src/SMAPI.Toolkit/ModToolkit.cs
#	src/SMAPI.Toolkit/SMAPI.Toolkit.csproj
#	src/SMAPI.sln
#	src/SMAPI/Constants.cs
#	src/SMAPI/Framework/ContentManagers/ModContentManager.cs
#	src/SMAPI/Framework/Input/GamePadStateBuilder.cs
#	src/SMAPI/Framework/Logging/LogManager.cs
#	src/SMAPI/Framework/ModLoading/AssemblyLoader.cs
#	src/SMAPI/Framework/ModLoading/Framework/RewriteHelper.cs
#	src/SMAPI/Framework/Models/SConfig.cs
#	src/SMAPI/Framework/Patching/GamePatcher.cs
#	src/SMAPI/Framework/Reflection/Reflector.cs
#	src/SMAPI/Framework/SCore.cs
#	src/SMAPI/Framework/SGame.cs
#	src/SMAPI/Framework/SMultiplayer.cs
#	src/SMAPI/Framework/StateTracking/LocationTracker.cs
#	src/SMAPI/Metadata/CoreAssetPropagator.cs
#	src/SMAPI/Metadata/InstructionMetadata.cs
#	src/SMAPI/SMAPI.csproj
2023-01-16 17:28:55 +08:00
Jesse Plamondon-Willard 72ba455d5a
simplify .gitignore 2022-07-08 19:36:09 -04:00
Ishan Jalan 173bc4f517
Updated pufferchick cool 2022-07-08 19:31:37 -04:00
Ishan Jalan 8eeda8b4c4
SVGs for pufferchick and pufferchick-cool
SVG > PNG
2022-07-08 19:31:28 -04:00
Jesse Plamondon-Willard 01f59000e9
ignore WebDeploy files 2021-10-31 14:37:51 -04:00
ZaneYork 2bcee41151 Merge branch 'develop' of https://github.com/Pathoschild/SMAPI into harmony2
 Conflicts:
	src/SMAPI/Constants.cs
	src/SMAPI/Framework/SCore.cs
	src/SMAPI/SMAPI.csproj
2020-06-22 10:12:01 +08:00
Jesse Plamondon-Willard a7cf886b71
switch to custom build of Harmony 1.2.0.1 2020-06-20 00:13:23 -04:00
ZaneYork db61312dc6 Merge branch 'develop' of https://github.com/Pathoschild/SMAPI into harmony2
 Conflicts:
	src/SMAPI.Installer/SMAPI.Installer.csproj
	src/SMAPI.Mods.ConsoleCommands/SMAPI.Mods.ConsoleCommands.csproj
	src/SMAPI.Mods.SaveBackup/SMAPI.Mods.SaveBackup.csproj
	src/SMAPI.Toolkit.CoreInterfaces/SMAPI.Toolkit.CoreInterfaces.csproj
	src/SMAPI.Toolkit/SMAPI.Toolkit.csproj
	src/SMAPI/SMAPI.csproj
2020-06-19 16:21:02 +08:00
Jesse Plamondon-Willard 2d19095169
add support for using a custom Harmony build (#711) 2020-06-14 11:29:07 -04:00
yangzhi 7de4ed09af Ignore VSHistory backups 2020-02-13 11:28:34 +08:00
yangzhi e0a30f6cce Git ignore 2020-02-11 17:21:56 +08:00
Jesse Plamondon-Willard f692af269c
ignore deployment slot profiles 2019-12-16 20:37:41 -05:00
Jesse Plamondon-Willard 4711d19b3e
fix .gitignore and line endings for Linux 2019-12-15 10:50:05 -05:00
Jesse Plamondon-Willard 5f532c259d
migrate from AWS to Azure
This commit migrates from subdomains to paths (due to the cost of a wildcard HTTPS certificate on Azure), adds a web project to redirect the old subdomains from AWS to Azure, and removes AWS-specific hacks.
2019-12-02 20:14:07 -05:00
Jesse Plamondon-Willard 23fe0c24a0
ignore AWS Beanstalk data file 2019-09-13 16:15:45 -04:00
Jesse Plamondon-Willard f895fedc6a move credentials into git-ignored file (#358) 2017-10-28 14:03:53 -04:00
Jesse Plamondon-Willard 1f32d72099 simplify .gitignore 2017-09-21 23:39:20 -04:00
Jesse Plamondon-Willard 57d9d28554 Merge remote-tracking branch 'dewdrop/master' into feature/update-check-api (#336)
# Conflicts:
#	.gitignore
2017-09-21 23:34:52 -04:00
James Stine 06ed54b2c6 First commit. 2017-08-13 17:44:00 -04:00
Jesse Plamondon-Willard e8825947ca fix crlf 2017-01-16 16:10:50 -05:00
Zoryn Aaron b225568b59 do ignore packages I derped 2016-03-20 15:49:36 -04:00
Zoryn Aaron 2be0c20ff7 don't ignore packages what's wrong with you 2016-03-20 15:47:50 -04:00
Zoryn Aaron c50891a093 Zoryn returns. Added JSON. Added Config.cs. 2016-03-20 15:43:31 -04:00
ClxS f77e922ad0 Merged Zoryn4163/master into master 2016-03-03 20:17:40 +00:00
Zoryn 9a1b910ea3 resync for merge conflicts 2016-03-03 15:06:25 -05:00
ClxS d3f0e00db9 Updated gitignore to ignore C# and VS files 2016-03-03 19:56:54 +00:00
Zoryn eee4e9c0fe updates to change working location 2016-03-03 14:01:32 -05:00
Zoryn Aaron 57bc4aa552 commands
im tired
2016-02-29 05:21:45 -05:00
Zoryn Aaron a9955e0a73 binaries 2016-02-28 16:15:53 -05:00
Zoryn Aaron ca4706f53d ignore binaries 2016-02-28 14:41:31 -05:00