Commit Graph

4260 Commits

Author SHA1 Message Date
zhiyang7 a42acb8176 Merge with latest branch 2023-01-30 16:58:14 +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 b4e95a92b3
Merge branch 'develop' into stable 2023-01-09 12:27:49 -05:00
Jesse Plamondon-Willard 25b8e13ba8
prepare for release 2023-01-09 12:27:29 -05:00
Jesse Plamondon-Willard e5407417a0
add delegating mod hooks for mod use 2023-01-08 22:05:22 -05:00
Jesse Plamondon-Willard 5518b8d461
update packages 2023-01-08 16:48:30 -05:00
Jesse Plamondon-Willard b246fe6145
update web to .NET 7 2023-01-08 16:43:23 -05:00
Jesse Plamondon-Willard d35f45fc32
fix game assemblies not excluded from release zip when bundle type not set 2023-01-07 17:55:15 -05:00
Jesse Plamondon-Willard 81d3baa3b5
simplify Save Backup compression
We don't need special handling for macOS anymore, since all platforms have .NET 5 now.
2022-12-28 11:35:05 -05:00
Jesse Plamondon-Willard d438e49f76
Merge pull request #889 from daleao/develop
Replace slingshot ID check with type field check
2022-12-28 11:33:31 -05:00
Jesse Plamondon-Willard 45979c57dd
defer weapon data parsing until needed, handle invalid formats 2022-12-28 11:30:35 -05:00
DaLion 8660742391 Replaced slingshot ID check with Type check. 2022-12-07 18:13:17 -03:00
Jesse Plamondon-Willard 368b25b541
Merge branch 'develop' into stable 2022-12-01 20:24:22 -05:00
Jesse Plamondon-Willard a2944eed5c
prepare for release 2022-12-01 19:43:56 -05:00
Jesse Plamondon-Willard 4c66aa63c5
update release notes 2022-11-14 17:45:43 -05:00
Jesse Plamondon-Willard 0f7026c1b1
Merge pull request #886 from atravita-mods/develop
Fix overlay transparency crop not always starting at end of pixel area
2022-11-14 17:34:40 -05:00
Jesse Plamondon-Willard ae5829a3ee
tweak variables for clarity 2022-11-14 17:28:59 -05:00
atravita-mods e2c1d2b1c9 more indexing errors joy 2022-11-14 11:38:10 -05:00
Jesse Plamondon-Willard 72f5df2d20
update release notes 2022-11-13 12:17:07 -05:00
Jesse Plamondon-Willard 0fbf99cd83
Merge pull request #885 from AnotherPillow/develop
Only check for Error Handler when on SMAPI 3.9+
2022-11-13 12:15:19 -05:00
AnotherPillow d521c20e8a Only check for Error Handler on SMAPI 3.9+ 2022-11-13 17:06:10 +00:00
Jesse Plamondon-Willard b95d2a3f93
Merge branch 'develop' into stable 2022-11-12 15:15:56 -05:00
Jesse Plamondon-Willard 613946003d
prepare for release 2022-11-12 15:14:59 -05:00
Jesse Plamondon-Willard 57d3e2b98e
also update multiplayer map cache for host player 2022-11-12 13:50:02 -05:00
Jesse Plamondon-Willard c1e3b25dca
fix load-early/late mods not correctly sorted relative to others in the same list 2022-11-11 21:43:42 -05:00
Jesse Plamondon-Willard 9771cefa6a
update release notes 2022-11-11 21:42:49 -05:00
Jesse Plamondon-Willard 1894cd831e
Merge pull request #884 from atravita-mods/develop
AssetName.StartsWith - fix yet another case with the trailing slash
2022-11-11 21:25:01 -05:00
Jesse Plamondon-Willard ad2dcc2879
expand code comments for clarity 2022-11-11 21:22:52 -05:00
Jesse Plamondon-Willard a52f888c3f
Merge pull request #883 from SinZ163/feature/sinz/farmhand-mapedit
Add logic to remove from the multiplayer map cache for asset propagation
2022-11-11 20:56:35 -05:00
Jesse Plamondon-Willard 286c2d2449
pass multiplayer into asset propagator to avoid reflection 2022-11-11 20:55:24 -05:00
atravita-mods 2bccdd9737 edit comment. 2022-11-11 06:52:46 -05:00
atravita-mods 4ca546a7a8 directly add tests over the trailing slash. 2022-11-11 06:38:35 -05:00
SinZ be84248a9a Add logic to remove from the multiplayer map cache for asset propagation 2022-11-11 22:01:48 +11:00
Jesse Plamondon-Willard 42bcd3068f
add unit test for assumption about HashSet<T> order
This will let us detect if the behavior ever changes in a future version of .NET, so we need to change the new ModsToLoadEarly/Late config fields.
2022-11-11 02:33:28 -05:00
Jesse Plamondon-Willard 28ba3408bc
raise all deprecation messages to the final level 2022-11-11 01:47:12 -05:00
Jesse Plamondon-Willard cefd9e23b0
set max game version 2022-11-11 01:38:45 -05:00
Jesse Plamondon-Willard e44562c9c5
update release notes 2022-11-11 01:35:42 -05:00
Jesse Plamondon-Willard 133aeab3fc
Merge pull request #882 from Shockah/mod-load-order
Add options to override mod load order

# Conflicts:
#	src/SMAPI/Framework/Models/SConfig.cs
2022-11-11 01:29:30 -05:00
Jesse Plamondon-Willard dbf7750f3e
only validate & apply custom load order if there is one 2022-11-11 01:22:46 -05:00
Jesse Plamondon-Willard 3059794622
adjust warning messages & log header when load order is edited 2022-11-11 01:22:46 -05:00
Jesse Plamondon-Willard 0629f19698
change new fields to hash sets & simplify sorting
This makes the mod IDs case-insensitive (like the 'SuppressUpdateChecks' field), fixes a build error in unit tests, and avoids re-scanning the mod list multiple times.
2022-11-11 01:22:45 -05:00
Jesse Plamondon-Willard eaacfd04b8
Merge pull request #881 from tylergibbs2/detailed-manifest-errors
Add detailed manifest validation errors at build time
2022-11-10 23:34:50 -05:00
Jesse Plamondon-Willard 867afdd96f
tweak new code 2022-11-10 23:27:38 -05:00
Jesse Plamondon-Willard 6ee0d2f93d
don't validate manifest if we're not deploying or zipping the mod
That would break cases like unit test projects, which don't have a manifest.json file.
2022-11-10 23:27:38 -05:00
Jesse Plamondon-Willard 346fddda67
move validation logic out of Manifest model
This avoids tightly coupling higher logic to the implementation class, since we can validate the interface.
2022-11-10 23:27:38 -05:00
Jesse Plamondon-Willard 2a8cb8c636
Merge pull request #878 from atravita-mods/develop
Rewrite asset name comparison to stop at the first mismatch
2022-11-10 21:52:00 -05:00
Jesse Plamondon-Willard 303b3924ae
fix case where prefix ends with a path separator 2022-11-10 21:50:01 -05:00
Jesse Plamondon-Willard 76e5588f02
add option to disable console input 2022-11-09 21:41:04 -05:00
Jesse Plamondon-Willard beb0b0aaf4
fix & improve split-screen column in log parser 2022-11-09 20:03:41 -05:00
Michał Dolaś 9fd8c35b46 Actually taking order into consideration 2022-11-09 20:26:50 +01:00