embeddedt
|
a0c5c90c8d
|
Prevent crash with mods calling getFluidState recursively
The returned fluid is meaningless, but vanilla doesn't crash here
Fixes #238
|
2023-09-15 09:32:30 -04:00 |
|
embeddedt
|
cb286c0bca
|
1.20.2-pre3
|
2023-09-13 22:01:13 -04:00 |
|
embeddedt
|
b56a65c192
|
Merge remote-tracking branch 'origin/1.20' into dev/1.20.2
|
2023-09-05 11:21:20 -04:00 |
|
embeddedt
|
501d24ddfd
|
Merge 1.19.4 into 1.20
|
2023-08-29 14:39:57 -04:00 |
|
embeddedt
|
2aab73220c
|
Merge 1.19.2 into 1.19.4
|
2023-08-29 14:39:56 -04:00 |
|
embeddedt
|
4f7a4cbf95
|
Merge 1.18 into 1.19.2
|
2023-08-29 14:39:55 -04:00 |
|
embeddedt
|
3bf2c86b07
|
Merge 1.16 into 1.18
|
2023-08-29 14:39:54 -04:00 |
|
embeddedt
|
8081e0db02
|
BLS compat improvement
|
2023-08-22 21:01:09 -04:00 |
|
embeddedt
|
16e1e37fd9
|
Merge 1.19.4 into 1.20
|
2023-08-20 16:50:45 -04:00 |
|
embeddedt
|
48c9d401db
|
Merge 1.19.2 into 1.19.4
|
2023-08-20 16:50:44 -04:00 |
|
embeddedt
|
37078ef962
|
Merge 1.18 into 1.19.2
|
2023-08-20 16:50:44 -04:00 |
|
embeddedt
|
5ad333703f
|
Merge 1.16 into 1.18
|
2023-08-20 16:50:43 -04:00 |
|
embeddedt
|
e1ea900ffb
|
Disable compress_biome_container when Modern Beta is installed
Related: #224
|
2023-08-20 14:21:11 -04:00 |
|
embeddedt
|
26bdb57972
|
Merge 1.19.4 into 1.20
|
2023-08-20 13:15:52 -04:00 |
|
embeddedt
|
c34974a555
|
Merge 1.19.2 into 1.19.4
|
2023-08-20 13:15:52 -04:00 |
|
embeddedt
|
ffa76b238e
|
Merge 1.18 into 1.19.2
|
2023-08-20 13:15:51 -04:00 |
|
embeddedt
|
ab4ded89e3
|
Merge 1.16 into 1.18
|
2023-08-20 13:15:50 -04:00 |
|
embeddedt
|
1f7da1d650
|
Fix mixin scanning fix not actually working due to typo when backporting
|
2023-08-20 13:15:22 -04:00 |
|
embeddedt
|
29e3d38c55
|
Merge 1.19.4 into 1.20
|
2023-08-19 19:32:24 -04:00 |
|
embeddedt
|
0df87a9f83
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-19 19:32:16 -04:00 |
|
embeddedt
|
26758e18b2
|
Merge 1.18 into 1.19.2
|
2023-08-19 19:30:55 -04:00 |
|
embeddedt
|
e8926c334c
|
Merge 1.16 into 1.18
|
2023-08-19 19:30:54 -04:00 |
|
embeddedt
|
dcbc3e033a
|
Tweak injection point of faster_item_rendering
|
2023-08-19 19:30:30 -04:00 |
|
embeddedt
|
501e498175
|
Merge 1.19.4 into 1.20
|
2023-08-19 19:19:59 -04:00 |
|
embeddedt
|
f8a35c5884
|
Merge 1.19.2 into 1.19.4
|
2023-08-19 19:19:58 -04:00 |
|
embeddedt
|
0b685d843e
|
Merge 1.18 into 1.19.2
|
2023-08-19 19:19:25 -04:00 |
|
embeddedt
|
89700c1e2e
|
Merge 1.16 into 1.18
|
2023-08-19 19:19:24 -04:00 |
|
embeddedt
|
58b7b0da0f
|
Fix MI pipes being invisible when faster_item_rendering is enabled
|
2023-08-19 19:18:52 -04:00 |
|
embeddedt
|
b171d4bf19
|
Merge 1.19.4 into 1.20
|
2023-08-19 14:59:19 -04:00 |
|
embeddedt
|
e827fba754
|
Merge 1.19.2 into 1.19.4
|
2023-08-19 14:59:19 -04:00 |
|
embeddedt
|
fac858e3cb
|
Merge 1.18 into 1.19.2
|
2023-08-19 14:59:18 -04:00 |
|
embeddedt
|
8290964c31
|
Merge 1.16 into 1.18
|
2023-08-19 14:59:17 -04:00 |
|
embeddedt
|
383d40e420
|
Detect mixins with calls to other merged methods
Related: #222
|
2023-08-19 14:59:11 -04:00 |
|
embeddedt
|
9f5ccf28df
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-08-18 15:39:58 -04:00 |
|
embeddedt
|
6536c49c3c
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-18 15:39:03 -04:00 |
|
embeddedt
|
59abaf6a7f
|
Merge 1.18 into 1.19.2
|
2023-08-18 15:37:02 -04:00 |
|
embeddedt
|
2a1685a2cb
|
Fix merge error
|
2023-08-18 15:36:50 -04:00 |
|
embeddedt
|
a35c605e73
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-18 15:34:55 -04:00 |
|
embeddedt
|
4dcb94e6a5
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-08-18 15:33:18 -04:00 |
|
embeddedt
|
ec66fbc05c
|
Add wiki button
Related: #202
|
2023-08-18 15:31:31 -04:00 |
|
embeddedt
|
9964693050
|
Merge 1.19.4 into 1.20
|
2023-08-18 14:35:25 -04:00 |
|
embeddedt
|
c51133f2c3
|
Merge 1.19.2 into 1.19.4
|
2023-08-18 14:35:25 -04:00 |
|
embeddedt
|
da944c330b
|
Merge 1.18 into 1.19.2
|
2023-08-18 14:35:24 -04:00 |
|
embeddedt
|
6b1f5232fa
|
Merge 1.16 into 1.18
|
2023-08-18 14:35:23 -04:00 |
|
embeddedt
|
672ca92aab
|
Show time to bootstrap stage on Forge
|
2023-08-18 14:35:15 -04:00 |
|
embeddedt
|
4aebee53ac
|
Merge 1.19.4 into 1.20
|
2023-08-18 14:19:48 -04:00 |
|
embeddedt
|
7faa29e84b
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-18 14:17:00 -04:00 |
|
embeddedt
|
8d1058cc3f
|
23w33a
|
2023-08-17 11:55:44 -04:00 |
|
embeddedt
|
eb15718023
|
Merge remote-tracking branch 'origin/1.20' into dev/1.20.2
|
2023-08-17 11:30:19 -04:00 |
|
embeddedt
|
3acaa1dd49
|
Merge 1.18 into 1.19.2
|
2023-08-16 08:54:15 -04:00 |
|
embeddedt
|
2e8b11de93
|
Merge 1.16 into 1.18
|
2023-08-16 08:54:14 -04:00 |
|
embeddedt
|
2629cd484a
|
Add runes/ to legacy texture folder list
|
2023-08-16 08:48:30 -04:00 |
|
embeddedt
|
74c9f684e6
|
Merge 1.19.4 into 1.20
|
2023-08-15 22:03:47 -04:00 |
|
embeddedt
|
18722beebd
|
Merge 1.19.2 into 1.19.4
|
2023-08-15 22:03:46 -04:00 |
|
embeddedt
|
6b7a300a2e
|
Merge 1.18 into 1.19.2
|
2023-08-15 22:03:46 -04:00 |
|
embeddedt
|
1ce0a833e9
|
Merge 1.16 into 1.18
|
2023-08-15 22:03:45 -04:00 |
|
embeddedt
|
b54c6751a4
|
Suppress dots and header in stacktraces where possible
Requested by TelepathicGrunt (and frankly, why didn't I think of this earlier...)
|
2023-08-15 22:03:07 -04:00 |
|
embeddedt
|
ef341932a3
|
Merge 1.19.4 into 1.20
|
2023-08-15 13:08:56 -04:00 |
|
embeddedt
|
2e272f9b18
|
Merge 1.19.2 into 1.19.4
|
2023-08-15 13:08:55 -04:00 |
|
embeddedt
|
1580e757ed
|
Merge 1.18 into 1.19.2
|
2023-08-15 13:08:54 -04:00 |
|
embeddedt
|
ed0460747c
|
Update world leak patch to 1.18
|
2023-08-15 13:08:42 -04:00 |
|
embeddedt
|
fa8d83a21a
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-08-15 13:04:49 -04:00 |
|
embeddedt
|
6908f14905
|
Mitigation for memory usage from leaked client worlds
|
2023-08-15 13:04:04 -04:00 |
|
embeddedt
|
6fa24ec171
|
Change CanonizingStringMap to use weak interner
|
2023-08-15 12:23:43 -04:00 |
|
embeddedt
|
5203985a25
|
Merge 1.19.4 into 1.20
|
2023-08-13 16:38:04 -04:00 |
|
embeddedt
|
351e4d3fc6
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-13 16:37:56 -04:00 |
|
embeddedt
|
53cc4584f4
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-13 16:15:02 -04:00 |
|
embeddedt
|
0aef731a79
|
Update SafeBlockGetter for 1.18 world height
|
2023-08-13 13:41:36 -04:00 |
|
embeddedt
|
ca51ceba6a
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-08-13 13:40:52 -04:00 |
|
embeddedt
|
d7b2f5b75b
|
Prevent mods from causing deadlocks in BlockState.getOffset
If this method is called with a ServerLevel, we switch the BlockGetter
for a safe wrapper that will only work on loaded chunks
Related: https://github.com/N1nn1/twigs/issues/6
Related: https://github.com/N1nn1/etcetera/issues/28
|
2023-08-13 13:39:24 -04:00 |
|
embeddedt
|
f9ebcb6b98
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-08-12 21:23:46 -04:00 |
|
embeddedt
|
fa47e923f0
|
Better compatibility with mods that inject into initCache
|
2023-08-12 21:19:43 -04:00 |
|
embeddedt
|
97b6672610
|
Fix MC-251068
|
2023-08-12 16:48:24 -04:00 |
|
embeddedt
|
fab831f143
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-08-12 12:09:38 -04:00 |
|
embeddedt
|
073b8cb9de
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-12 12:09:21 -04:00 |
|
embeddedt
|
b776587f2d
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-12 12:02:43 -04:00 |
|
embeddedt
|
70a2a2194f
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-08-12 11:54:31 -04:00 |
|
embeddedt
|
d1c9be8900
|
Clean up warnings
|
2023-08-12 11:41:04 -04:00 |
|
embeddedt
|
507cc7eb14
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-08-11 19:55:28 -04:00 |
|
embeddedt
|
74d28ed997
|
Update mixin
|
2023-08-11 19:50:33 -04:00 |
|
embeddedt
|
dcad671568
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-11 19:48:12 -04:00 |
|
embeddedt
|
0a18e9c1dc
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-11 19:45:31 -04:00 |
|
embeddedt
|
e949ed67ef
|
Merge 1.16 into 1.18
|
2023-08-11 19:44:22 -04:00 |
|
embeddedt
|
a51b1563b1
|
Try to make config reload message appear less often
Related: #210
|
2023-08-11 19:31:36 -04:00 |
|
embeddedt
|
1e77cccf5a
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-11 17:00:38 -04:00 |
|
embeddedt
|
1a8681e15d
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-08-11 16:53:41 -04:00 |
|
embeddedt
|
721645f88f
|
Add IgnoreOutsideDev marker to forgotten mixin
|
2023-08-11 16:53:21 -04:00 |
|
embeddedt
|
d92e48e1aa
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-08-11 16:53:00 -04:00 |
|
embeddedt
|
0c82223248
|
Fix Custom Machinery models
|
2023-08-11 16:44:51 -04:00 |
|
embeddedt
|
4d3aaceb9c
|
Fix crash if FerriteCore detection fails in neighbour table mixin
|
2023-08-11 16:18:07 -04:00 |
|
embeddedt
|
8b698452fd
|
Compact Mojang registries (not available yet)
|
2023-08-10 22:42:30 -04:00 |
|
embeddedt
|
e9ff7d7ba1
|
Allow setting config options via JVM properties
|
2023-08-10 20:31:39 -04:00 |
|
embeddedt
|
712409b4e1
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-08-09 17:20:45 -04:00 |
|
embeddedt
|
571d3bd5e2
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-09 17:14:22 -04:00 |
|
embeddedt
|
26bbe781a0
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-09 17:11:01 -04:00 |
|
embeddedt
|
2844c97170
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-08-09 17:07:47 -04:00 |
|
embeddedt
|
5e7d6642a7
|
Implement minor memory usage optimization for environments without FerriteCore
This is "FerriteCore at home", used to assist with the large registry
tests
|
2023-08-09 15:46:40 -04:00 |
|
embeddedt
|
27c2a674cf
|
Allow only applying mixins when mods aren't present
|
2023-08-09 13:16:51 -04:00 |
|
embeddedt
|
84c72f8da8
|
Merge branch '1.20' into dev/1.20.2
|
2023-08-09 11:35:59 -04:00 |
|
embeddedt
|
32e246885b
|
Merge 1.19.4 into 1.20
|
2023-08-08 18:17:36 -04:00 |
|
embeddedt
|
824deddb46
|
Merge 1.19.2 into 1.19.4
|
2023-08-08 18:17:35 -04:00 |
|
embeddedt
|
866fcebf2e
|
Merge 1.18 into 1.19.2
|
2023-08-08 18:17:33 -04:00 |
|
embeddedt
|
27c7400f34
|
Merge 1.16 into 1.18
|
2023-08-08 18:17:32 -04:00 |
|
embeddedt
|
c1182944f3
|
Redirect fetchChoiceType directly in vanilla code instead of fully disabling it
Should address #204
|
2023-08-08 18:17:01 -04:00 |
|
embeddedt
|
823fa259e9
|
Merge 1.19.4 into 1.20
|
2023-08-05 19:43:20 -04:00 |
|
embeddedt
|
795aca19e0
|
Don't enable blast_search_trees with REI present on 1.16
|
2023-08-05 19:42:34 -04:00 |
|
embeddedt
|
ec5b92dd7a
|
Don't trigger full blockstate cache rebuilds when requesting fluid
This causes mods to prematurely rebuild the whole cache, which
is not what we want
|
2023-08-05 19:38:45 -04:00 |
|
embeddedt
|
8a0ff999bd
|
Merge 1.19.4 into 1.20
|
2023-08-05 12:52:06 -04:00 |
|
embeddedt
|
7b18bcafd6
|
Merge 1.19.2 into 1.19.4
|
2023-08-05 12:52:05 -04:00 |
|
embeddedt
|
1931101545
|
Merge 1.18 into 1.19.2
|
2023-08-05 12:52:04 -04:00 |
|
embeddedt
|
ae3eab8320
|
Merge 1.16 into 1.18
|
2023-08-05 12:52:03 -04:00 |
|
embeddedt
|
abb8cbd23f
|
Make sure missing model never becomes null
|
2023-08-05 12:26:18 -04:00 |
|
embeddedt
|
5165cf20c8
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-08-05 12:18:45 -04:00 |
|
embeddedt
|
2cb5acb9f9
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-05 12:17:50 -04:00 |
|
embeddedt
|
605058522e
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-05 12:11:30 -04:00 |
|
embeddedt
|
431231c4ee
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-08-05 12:10:53 -04:00 |
|
embeddedt
|
371e5119f1
|
Never return a non-null model if it was top level in vanilla
|
2023-08-05 12:07:21 -04:00 |
|
embeddedt
|
c2695b1180
|
Merge 1.19.4 into 1.20
|
2023-08-03 20:04:49 -04:00 |
|
embeddedt
|
d3884d764d
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-03 20:02:55 -04:00 |
|
embeddedt
|
f05d33969f
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-03 20:02:15 -04:00 |
|
embeddedt
|
4972081d8a
|
Forcefully inject access transformers from mods even if a load error occurs
Related: https://github.com/neoforged/NeoForge/issues/43
|
2023-08-03 17:04:41 -04:00 |
|
embeddedt
|
331ad00758
|
Merge 1.19.4 into 1.20
|
2023-08-03 17:01:14 -04:00 |
|
embeddedt
|
b64fefa73c
|
Merge 1.19.2 into 1.19.4
|
2023-08-03 17:01:13 -04:00 |
|
embeddedt
|
c5f73c5e26
|
Merge 1.18 into 1.19.2
|
2023-08-03 17:01:12 -04:00 |
|
embeddedt
|
022367c8d6
|
Merge 1.16 into 1.18
|
2023-08-03 17:01:11 -04:00 |
|
embeddedt
|
5853f9b034
|
Fix NPE on Forge error screen
|
2023-08-03 17:00:30 -04:00 |
|
embeddedt
|
d5a9f68575
|
Merge 1.19.4 into 1.20
|
2023-08-03 13:14:38 -04:00 |
|
embeddedt
|
3caba87924
|
Merge 1.19.2 into 1.19.4
|
2023-08-03 13:14:37 -04:00 |
|
embeddedt
|
f469d591b8
|
Remove item quirk entirely on 1.19+
|
2023-08-03 13:13:09 -04:00 |
|
embeddedt
|
72e3a115d6
|
Move item filling quirk to correct vanilla location on 1.19+
|
2023-08-03 13:08:18 -04:00 |
|
embeddedt
|
42688757a7
|
Merge remote-tracking branch 'origin/1.20' into dev/1.20.2
|
2023-08-03 12:07:48 -04:00 |
|
embeddedt
|
bf5ca2f3cd
|
Merge 1.19.4 into 1.20
|
2023-08-02 22:18:19 -04:00 |
|
embeddedt
|
23ffdabcc4
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-02 22:18:13 -04:00 |
|
embeddedt
|
200cf00fe4
|
Merge 1.18 into 1.19.2
|
2023-08-02 22:08:41 -04:00 |
|
embeddedt
|
12c2214432
|
Merge 1.16 into 1.18
|
2023-08-02 22:08:15 -04:00 |
|
embeddedt
|
df9d2fbe2f
|
Remove default impl from ModernFixPlatformHooks
|
2023-08-02 22:08:01 -04:00 |
|
embeddedt
|
7fcaf716d8
|
23w31a
|
2023-08-02 20:01:34 -04:00 |
|
embeddedt
|
fa6b93fad2
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-08-02 19:51:25 -04:00 |
|
embeddedt
|
942b7cbb43
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-02 19:41:34 -04:00 |
|
embeddedt
|
88e0016e31
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-02 19:35:34 -04:00 |
|
embeddedt
|
54dda96849
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-08-02 19:21:23 -04:00 |
|
embeddedt
|
82218ce18f
|
Fix world load time being printed if it wasn't actually set
|
2023-08-02 17:16:42 -04:00 |
|
embeddedt
|
5bd5c8289c
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-08-02 16:41:39 -04:00 |
|
embeddedt
|
26998e912b
|
Mark fluidState redirect as optional for old Lithium/VMP versions
|
2023-08-02 16:41:23 -04:00 |
|
embeddedt
|
02fd57f9a4
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-08-02 16:31:51 -04:00 |
|
embeddedt
|
f76ca049cc
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-02 16:31:07 -04:00 |
|
embeddedt
|
f4ab932924
|
Fix incorrect return value from deduplicated postprocessing map
|
2023-08-02 16:30:18 -04:00 |
|
embeddedt
|
d77946a5ab
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-02 16:23:22 -04:00 |
|
embeddedt
|
0d190a4c80
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-08-02 16:17:45 -04:00 |
|
embeddedt
|
201db412a4
|
Rewrite tracking code for game load/world join timing
|
2023-08-02 16:08:36 -04:00 |
|