embeddedt
754e7741c7
Merge 1.18 into 1.19.2
2023-07-19 17:32:36 -04:00
embeddedt
4f428b0e5d
Merge 1.16 into 1.18
2023-07-19 17:32:18 -04:00
embeddedt
ad60b1dec6
Fix timing of dynamic baked model registry handoff
2023-07-19 17:31:24 -04:00
embeddedt
d1a1fce7e1
Improve reliability of ItemOverrideBakedModel if not replaced
2023-07-19 17:08:23 -04:00
embeddedt
af5ece3fe9
Merge 1.18 into 1.19.2
2023-07-19 16:46:13 -04:00
embeddedt
91980319d2
Merge 1.16 into 1.18
2023-07-19 16:46:13 -04:00
embeddedt
8383053b5c
Fix wall block deduplication crashing when invasive mods replace vanilla walls
...
Related: #168
2023-07-19 16:45:32 -04:00
embeddedt
12ec9b08bf
Update ItemOverrideBakedModel for 1.19
2023-07-19 12:15:29 -04:00
embeddedt
3fed2ef08d
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-07-19 12:09:39 -04:00
embeddedt
d9b9586af3
Update item override patch to 1.18
2023-07-19 12:08:15 -04:00
embeddedt
6fda7393b3
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-19 11:51:00 -04:00
embeddedt
ac436db456
Add support to dynamic resources for item overrides
2023-07-19 11:50:16 -04:00
embeddedt
e65f8fbb32
Add option to override overrides
...
Absolutely no support is guaranteed when this is used
2023-07-19 10:05:09 -04:00
embeddedt
ab7c982589
Merge 1.18 into 1.19.2
2023-07-17 16:08:28 -04:00
embeddedt
92643a244e
Merge 1.16 into 1.18
2023-07-17 16:08:27 -04:00
embeddedt
5ec070843d
Use CachedResourcePath in resource finder
...
Reduces memory usage by ~50%
2023-07-17 13:42:50 -04:00
embeddedt
594c47f08b
Merge 1.18 into 1.19.2
2023-07-16 20:00:06 -04:00
embeddedt
94d5121a26
Merge 1.16 into 1.18
2023-07-16 20:00:06 -04:00
embeddedt
4f186c03f5
Filter valid paths using explicit joiner instead of Path.toString
...
to avoid issues on Windows
2023-07-16 19:59:22 -04:00
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
