embeddedt
|
7ad09acec6
|
Add code to show default values of options (currently unused)
Related: #186
|
2023-07-26 09:00:45 -04:00 |
|
embeddedt
|
76d1c8e8bd
|
Merge 1.19.4 into 1.20
|
2023-07-24 17:19:03 -04:00 |
|
embeddedt
|
5d33805a6f
|
Merge 1.19.2 into 1.19.4
|
2023-07-24 17:19:01 -04:00 |
|
embeddedt
|
82445d2ba2
|
Merge 1.18 into 1.19.2
|
2023-07-24 17:19:00 -04:00 |
|
embeddedt
|
70fc67199f
|
Merge 1.16 into 1.18
|
2023-07-24 17:18:32 -04:00 |
|
embeddedt
|
84e27a7c4d
|
Fix ender dragon model leaking client world
|
2023-07-24 17:15:10 -04:00 |
|
embeddedt
|
c41728b97c
|
Merge 1.19.4 into 1.20
|
2023-07-24 16:05:01 -04:00 |
|
embeddedt
|
512ed02db2
|
Merge 1.19.2 into 1.19.4
|
2023-07-24 16:05:00 -04:00 |
|
embeddedt
|
5babe993df
|
Merge 1.18 into 1.19.2
|
2023-07-24 16:04:32 -04:00 |
|
embeddedt
|
6ae1992329
|
Merge 1.16 into 1.18
|
2023-07-24 16:04:31 -04:00 |
|
embeddedt
|
7f44701670
|
Display ModernFix version in early part of log
|
2023-07-24 16:03:29 -04:00 |
|
embeddedt
|
1889ef2d8c
|
Merge 1.19.4 into 1.20
|
2023-07-23 19:23:27 -04:00 |
|
embeddedt
|
3a96f63798
|
Merge 1.19.2 into 1.19.4
|
2023-07-23 19:23:26 -04:00 |
|
embeddedt
|
18db311712
|
Merge 1.18 into 1.19.2
|
2023-07-23 19:23:26 -04:00 |
|
embeddedt
|
000e9746ba
|
Merge 1.16 into 1.18
|
2023-07-23 19:23:25 -04:00 |
|
embeddedt
|
7fa6c45f07
|
Fix dragging in ModLoader too early
|
2023-07-23 19:21:00 -04:00 |
|
embeddedt
|
90f6f6d68d
|
Merge 1.19.4 into 1.20
|
2023-07-23 18:33:34 -04:00 |
|
embeddedt
|
b24f82d257
|
Merge 1.19.2 into 1.19.4
|
2023-07-23 18:33:33 -04:00 |
|
embeddedt
|
bbcc58f103
|
Merge 1.18 into 1.19.2
|
2023-07-23 18:33:26 -04:00 |
|
embeddedt
|
0c3cade976
|
Merge 1.16 into 1.18
|
2023-07-23 18:33:25 -04:00 |
|
embeddedt
|
2246b79a85
|
Fix mod mixins not being disabled if there is an early load error
|
2023-07-23 18:32:50 -04:00 |
|
embeddedt
|
4cdf5e6b3d
|
Fix missing ClientOnly annotations
|
2023-07-22 15:35:36 -04:00 |
|
embeddedt
|
4c80deae25
|
Backport Diagonal Fences fix to 1.19.2
Related: #171
|
2023-07-21 10:47:50 -04:00 |
|
embeddedt
|
a5fb8575a6
|
Merge 1.19.4 into 1.20
|
2023-07-20 20:18:46 -04:00 |
|
embeddedt
|
f9315a127f
|
Merge 1.19.2 into 1.19.4
|
2023-07-20 20:18:45 -04:00 |
|
embeddedt
|
22d0d55d79
|
Merge 1.18 into 1.19.2
|
2023-07-20 20:18:44 -04:00 |
|
embeddedt
|
50ab84af42
|
Merge 1.16 into 1.18
|
2023-07-20 20:18:43 -04:00 |
|
embeddedt
|
4397f274a5
|
Prevent CME from thread dumper
|
2023-07-20 20:18:34 -04:00 |
|
embeddedt
|
374aac7ff5
|
Merge 1.19.4 into 1.20
|
2023-07-20 10:57:47 -04:00 |
|
embeddedt
|
e8aa88b317
|
Fix Diagonal Fences breaking after resource reload
|
2023-07-20 10:57:29 -04:00 |
|
embeddedt
|
b7a1f16a9d
|
Merge 1.19.4 into 1.20
|
2023-07-19 17:34:39 -04:00 |
|
embeddedt
|
5994edcf17
|
Merge 1.19.2 into 1.19.4
|
2023-07-19 17:34:38 -04:00 |
|
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
|
3162a531b7
|
Merge 1.19.4 into 1.20
|
2023-07-19 16:46:15 -04:00 |
|
embeddedt
|
02f6431109
|
Merge 1.19.2 into 1.19.4
|
2023-07-19 16:46:14 -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
|
30f483245c
|
Merge 1.19.4 into 1.20
|
2023-07-19 12:20:52 -04:00 |
|
embeddedt
|
8527594b3b
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-07-19 12:17:13 -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
|
e34beb5775
|
Merge 1.19.4 into 1.20
|
2023-07-17 16:09:27 -04:00 |
|
embeddedt
|
95c3044a40
|
Merge 1.19.2 into 1.19.4
|
2023-07-17 16:09:26 -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
|
c51b0585a2
|
Merge 1.19.4 into 1.20
|
2023-07-16 20:00:08 -04:00 |
|
embeddedt
|
2f7bd0e083
|
Merge 1.19.2 into 1.19.4
|
2023-07-16 20:00:07 -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
|
9a5edb9431
|
Merge 1.19.4 into 1.20
|
2023-07-15 20:37:19 -04:00 |
|
embeddedt
|
2a328356cd
|
Merge 1.19.2 into 1.19.4
|
2023-07-15 20:37:18 -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
|
faccdb0ed7
|
Merge 1.19.4 into 1.20
|
2023-07-13 21:43:49 -04:00 |
|
embeddedt
|
b0815bcae6
|
Merge 1.19.2 into 1.19.4
|
2023-07-13 21:43:48 -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
|
a799afc19c
|
Merge 1.19.4 into 1.20
|
2023-07-13 17:08:59 -04:00 |
|
embeddedt
|
24130cde74
|
Merge 1.19.2 into 1.19.4
|
2023-07-13 17:08:58 -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
|
73e8631fcd
|
Merge 1.19.4 into 1.20
|
2023-07-12 11:49:31 -04:00 |
|
embeddedt
|
29c260f7ce
|
Merge 1.19.2 into 1.19.4
|
2023-07-12 11:49:30 -04:00 |
|
embeddedt
|
5318347ab2
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-07-12 11:49:19 -04:00 |
|
embeddedt
|
6548d5da80
|
Fix parity issue in paper_chunk_patches for 1.20+
Ensure scheduleChunkGeneration is correctly called if chunk status has load dependencies
Thanks to ishland for noticing this
|
2023-07-12 11:28: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
|
944e481f32
|
Remove item cache flag patch on 1.20 branch
|
2023-07-11 21:33:27 -04:00 |
|
embeddedt
|
b409db3e29
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-07-11 21:33:07 -04:00 |
|
embeddedt
|
6ae19f11ea
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-07-11 21:31:29 -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
|
a5ae6e0631
|
Merge 1.19.4 into 1.20
|
2023-07-11 17:00:20 -04:00 |
|
embeddedt
|
0e248f8b83
|
Merge 1.19.2 into 1.19.4
|
2023-07-11 17:00:20 -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
|
61288a17ac
|
Merge 1.19.4 into 1.20
|
2023-07-11 14:25:35 -04:00 |
|
embeddedt
|
fff28fdcbf
|
Merge 1.19.2 into 1.19.4
|
2023-07-11 14:25:34 -04:00 |
|