embeddedt
10bd3e1899
Merge 1.16 into 1.18
2023-07-12 19:37:02 -04:00
embeddedt
d14ae9d2c1
Fix formatting issue
2023-07-12 19:36:52 -04:00
embeddedt
9cedaf18a8
Merge 1.16 into 1.18
2023-07-12 19:35:50 -04:00
embeddedt
5fd02ffc96
Very bad hack for wiki race condition
...
GitHub's "concurrency" system just cancels pending jobs instead
of scheduling them
2023-07-12 19:35:23 -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
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
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
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
c1e40ebe1f
Update item empty cache patch for 1.18
2023-07-11 21:23:22 -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
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
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
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
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
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
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
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
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
embeddedt
a502a509ed
Merge 1.16 into 1.18
2023-07-08 14:51:43 -04:00
embeddedt
bb0c4fdf54
Ignore RuntimeException when gathering blockstate paths
2023-07-08 14:51:07 -04:00
embeddedt
2e31a4e2c1
Merge 1.16 into 1.18
2023-07-07 21:06:45 -04:00
embeddedt
352f8bb6d1
Upload changelog to GitHub on release
2023-07-07 21:06:11 -04:00
embeddedt
8fd31f3190
Merge 1.16 into 1.18
2023-07-07 20:23:39 -04:00
embeddedt
f3a2ca73e8
Log all option overrides once at startup rather than per mixin
2023-07-07 20:23:10 -04:00
embeddedt
f27d6e154c
Make disabling feature.measure_time also disable game/world load messages
2023-07-07 20:19:08 -04:00
embeddedt
b99e253715
Merge 1.16 into 1.18
2023-07-07 19:19:43 -04:00
embeddedt
1c0fca8f06
Spotless
2023-07-07 12:40:46 -04:00
embeddedt
003cad94a0
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-07 12:39:47 -04:00
embeddedt
98663fa416
Never replace search tree on 1.16 with REI present
2023-07-07 12:39:26 -04:00
