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 |
|
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
|
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
|
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
|
795aca19e0
|
Don't enable blast_search_trees with REI present on 1.16
|
2023-08-05 19:42:34 -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
|
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
|
f05d33969f
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-03 20:02:15 -04:00 |
|