Commit Graph

1080 Commits

Author SHA1 Message Date
embeddedt
5294503483
Merge 1.18 into 1.19.2 2023-07-12 19:30:46 -04:00
embeddedt
f2d05c1355
Merge 1.16 into 1.18 2023-07-12 19:30:45 -04:00
embeddedt
8f806e6285
Use shared branch list script 2023-07-12 19:30:37 -04:00
embeddedt
5318347ab2
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-07-12 11:49:19 -04:00
embeddedt
40ddd2dfdb
Merge 1.16 into 1.18 2023-07-12 11:48:01 -04:00
Kichura
d36cc4acc1
Fix python3 not having friendly name. (#160) 2023-07-12 11:37:46 -04:00
Kichura
09aae6e34c
Enhance the workflow scripts and update Gradle. (#159)
* Update workflow actions and Gradle.
* Introduce friendly names to wiki_update and release scripts.
* Only embeddedt can run release and update wiki workflows.
2023-07-12 11:19:19 -04:00
embeddedt
aff4e0c2d0
Drop chunk status transition patch from paper_chunk_patches
Research by ishland suggests that vanilla already does this, at least
since 1.18
2023-07-12 10:53:12 -04:00
embeddedt
08daaa38e9
Do not cancel running wiki jobs [skip ci] 2023-07-11 22:16:07 -04:00
embeddedt
061806eb8f
Merge 1.18 into 1.19.2 2023-07-11 22:15:09 -04:00
embeddedt
8067cb6e65
Merge 1.16 into 1.18 2023-07-11 22:15:08 -04:00
embeddedt
b31381ed4d
Prevent race condition when updating wikis 2023-07-11 22:14:54 -04:00
embeddedt
f715a0c8a3
Merge 1.18 into 1.19.2 2023-07-11 22:13:39 -04:00
embeddedt
f7259f745f
Merge 1.16 into 1.18 2023-07-11 22:13:38 -04:00
embeddedt
423a550303
Add wiki update action 2023-07-11 22:12:15 -04:00
embeddedt
eded461866
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-07-11 21:23:38 -04:00
embeddedt
c1e40ebe1f
Update item empty cache patch for 1.18 2023-07-11 21:23:22 -04:00
embeddedt
406a4a3a91
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-07-11 21:17:59 -04:00
embeddedt
896c8d1f5f
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-07-11 21:14:47 -04:00
embeddedt
816346e919
Make mod overrides higher priority than user configuration
Prevents players inadvertently enabling incompatible options
2023-07-11 21:13:02 -04:00
embeddedt
4c484f5125
Recognize ThreadTweak when disabling overlapping patches 2023-07-11 19:03:20 -04:00
embeddedt
c7aaa15a19
Remove emptyCacheFlag from item stacks (fixes MC-258939) 2023-07-11 17:25:26 -04:00
embeddedt
2ca29efd77
Merge 1.18 into 1.19.2 2023-07-11 17:00:19 -04:00
embeddedt
3c9e5d2f0f
Disable deduplicate_climate_parameters by default
The 1.5-2MB this saves in vanilla isn't worth the cost of deduplication
in larger modpacks. Option still works fine and can be re-enabled
2023-07-11 16:58:19 -04:00
embeddedt
84cc58d30b
Merge 1.18 into 1.19.2 2023-07-11 14:25:33 -04:00
embeddedt
1f043c7088
Attempt fix for occasional world holes when paper_chunk_patches is enabled
1.18 seems to never return an unloaded Either here, instead always calling
scheduleChunkGeneration, so we do the same. This hasn't regressed
memory usage from some testing on 1.20.
2023-07-11 14:22:12 -04:00
embeddedt
1ba2a1fae0
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-07-10 20:28:20 -04:00
embeddedt
e87c85b75c
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-07-10 20:24:38 -04:00
embeddedt
bd351197b2
Backport https://github.com/MinecraftForge/MinecraftForge/pull/8959 to 1.18 2023-07-10 20:23:54 -04:00
embeddedt
4537f86bbc
Add mod menu in dev 2023-07-10 19:40:22 -04:00
embeddedt
546d1df48f
Prevent mixin.perf suboptions from defaulting to on if an explicit
option is not added
2023-07-10 19:13:01 -04:00
embeddedt
4ea7b864a8
Add facility to hide mixin options outside dev 2023-07-10 19:00:37 -04:00
embeddedt
11f107d60b
Merge 1.18 into 1.19.2 2023-07-10 09:02:43 -04:00
embeddedt
829994f5b5
Merge 1.16 into 1.18 2023-07-10 09:02:42 -04:00
embeddedt
5315d80859
Use synchronized HashMap instead of CHM to permit null keys for buggy mods
Related: #157
2023-07-10 09:01:18 -04:00
embeddedt
a189927b22
Fix Decorative Blocks keybind being unconfigurable 2023-07-09 21:17:37 -04:00
embeddedt
4962d855af
Merge 1.18 into 1.19.2 2023-07-09 20:37:23 -04:00
embeddedt
ef47883262
Merge 1.16 into 1.18 2023-07-09 20:37:22 -04:00
embeddedt
dfdbf8544a
Guard against early parent resolution failing 2023-07-09 20:36:57 -04:00
embeddedt
a34ac84e00
Merge 1.18 into 1.19.2 2023-07-09 20:35:40 -04:00
embeddedt
e248e2966a
Merge 1.16 into 1.18 2023-07-09 20:35:39 -04:00
embeddedt
49b31c347b
Resolve parents in getModel rather than at bake time
Fixes EBE chests
2023-07-09 20:35:31 -04:00
embeddedt
f040f66bf9
Make backing maps in ItemProperties thread-safe
Helps prevent CMEs on Forge 1.16
2023-07-09 19:02:59 -04:00
embeddedt
6bc2b5b36e
Fix version autodetection when autoreleasing [skip ci] 2023-07-09 14:21:18 -04:00
embeddedt
637f844601
Merge 1.18 into 1.19.2 2023-07-09 14:15:12 -04:00
embeddedt
1815554070
Merge 1.16 into 1.18 2023-07-09 14:15:11 -04:00
embeddedt
5f255a83dc
Implement Map.replace on DynamicBakedModelProvider
Related: #154
2023-07-09 14:14:34 -04:00
embeddedt
28c456e4c5
Merge 1.18 into 1.19.2 2023-07-09 13:32:34 -04:00
embeddedt
2d12c6e282
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-07-09 13:31:01 -04:00
embeddedt
d987c1227b
Scan fallback resource managers as well as main resource manager
For buggy mods such as https://github.com/FoundationGames/EnhancedBlockEntities/issues/162
2023-07-09 13:27:18 -04:00