embeddedt
48fdb94343
Merge 1.18 into 1.19.2
2023-07-15 20:37:18 -04:00
embeddedt
67343b5680
Merge 1.16 into 1.18
2023-07-15 20:37:17 -04:00
embeddedt
ad948f0ec1
Rework wall block caching to cache collision shapes as well
2023-07-15 20:36:56 -04:00
embeddedt
c63a8fa21e
Deduplicate wall block shapes
2023-07-15 20:23:59 -04:00
embeddedt
09d24c542e
Merge 1.18 into 1.19.2
2023-07-15 15:07:17 -04:00
embeddedt
9fcc1f5dc2
Merge 1.16 into 1.18
2023-07-15 15:05:56 -04:00
embeddedt
dff181accb
Allow corrupt JSONs when scanning models for textures
...
Fixes Hexerei textures being missing on 1.18
2023-07-15 15:05:25 -04:00
embeddedt
c684b56124
Merge 1.18 into 1.19.2
2023-07-13 21:43:48 -04:00
embeddedt
dccde1a422
Merge 1.16 into 1.18
2023-07-13 21:43:47 -04:00
embeddedt
6cd99383b9
Disable item_cache_flag when Lithium or derivatives are present,
...
as they rely on the broken cache logic
2023-07-13 21:43:40 -04:00
embeddedt
0116a31616
Hotfix for Class.descriptorString() not existing on Java 8
2023-07-13 21:20:16 -04:00
embeddedt
17d479bc93
Merge 1.18 into 1.19.2
2023-07-13 19:40:38 -04:00
embeddedt
5f59fdf471
Merge 1.16 into 1.18
2023-07-13 19:40:37 -04:00
其智乃反不能及
a1ee34bb1c
Update zh_cn.json ( #153 )
2023-07-13 19:39:48 -04:00
embeddedt
bd179f817f
Merge 1.18 into 1.19.2
2023-07-13 17:08:57 -04:00
embeddedt
fd72aa4fac
Merge 1.16 into 1.18
2023-07-13 17:08:57 -04:00
embeddedt
793fb5f388
Allow spam_thread_dump to work even earlier
2023-07-13 17:08:32 -04:00
embeddedt
5318347ab2
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-07-12 11:49: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
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
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
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
f040f66bf9
Make backing maps in ItemProperties thread-safe
...
Helps prevent CMEs on Forge 1.16
2023-07-09 19:02:59 -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
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
87cd49a291
Merge 1.18 into 1.19.2
2023-07-07 20:23:40 -04:00
