Commit Graph

472 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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