embeddedt
b567658318
Disable async_jei by default, to match newer versions
...
There have been a couple isolated reports of weird JEI behavior,
and this might be why
2023-10-14 13:20:26 -04:00
embeddedt
5fbbacbe11
Merge 1.18 into 1.19.2
2023-10-13 10:47:51 -04:00
embeddedt
4b8ec822fe
Merge 1.16 into 1.18
2023-10-13 10:47:50 -04:00
Phoenix-Starlight
e7277b89d5
Fix dynamic_sounds breaking on 1.16 ( #259 )
...
An issue in Guava (https://github.com/google/guava/issues/3081 ) causes the removal listener to fire even when entries haven't actually been removed. We filter them to get around this.
2023-10-12 22:19:46 -04:00
embeddedt
cebe1c308a
Merge 1.18 into 1.19.2
2023-10-10 17:40:29 -04:00
embeddedt
39fa555209
Merge 1.16 into 1.18
2023-10-10 17:40:29 -04:00
embeddedt
538d332310
Disable dynamic sounds by default until it can be tested more
2023-10-10 17:39:54 -04:00
embeddedt
40b04cbded
Fix cache_upgraded_structures leaking open input streams
2023-10-09 08:36:35 -04:00
embeddedt
b1e91686da
Merge 1.18 into 1.19.2
2023-10-07 18:47:09 -04:00
embeddedt
5007c5e286
Merge 1.16 into 1.18
2023-10-07 18:47:08 -04:00
embeddedt
bf6979e45b
Cleanup dynamic sounds patch, bump eviction time to 5 minutes
2023-10-07 18:44:33 -04:00
Phoenix-Starlight
803aaba204
Dynamic sound unloading ( #234 )
2023-10-07 18:41:52 -04:00
embeddedt
cedcd94417
Merge 1.18 into 1.19.2
2023-10-03 13:45:36 -04:00
embeddedt
43ca13cdf2
Attempt to free leaked BufferBuilders
2023-10-03 13:45:18 -04:00
embeddedt
c5fee81b8a
Merge 1.18 into 1.19.2
2023-09-24 11:55:26 -04:00
embeddedt
3d1ead98c3
Merge 1.16 into 1.18
2023-09-24 11:55:25 -04:00
embeddedt
5de1518f76
Disable stronghold caching when C2ME is installed
...
Related: #245
2023-09-24 11:53:39 -04:00
embeddedt
17e3b40bf9
Merge 1.18 into 1.19.2
2023-09-20 17:58:52 -04:00
embeddedt
0aabad688b
Merge 1.16 into 1.18
2023-09-20 17:58:50 -04:00
embeddedt
bd1ca9ce94
Disable reduce_blockstate_cache_rebuilds if dev env is not Mojmap
...
This is simpler than implementing remapping
Closes #229
2023-09-17 13:00:54 -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
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
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
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
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
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
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
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
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
embeddedt
ad19e11213
Merge 1.18 into 1.19.2
2023-08-02 15:45:55 -04:00
embeddedt
2ff09ef382
Merge 1.16 into 1.18
2023-08-02 15:45:54 -04:00
embeddedt
2c1e036857
Bail out early if empty map is passed to CanonizingStringMap.putAll
2023-08-02 14:59:52 -04:00
embeddedt
31b5114a8d
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-08-02 11:50:45 -04:00
embeddedt
1cd7b7e0c7
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-08-02 11:48:27 -04:00
embeddedt
db5f99f3f6
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-31 22:25:50 -04:00
embeddedt
25dc08eb79
Make dynamic codecs actually work
2023-07-31 22:18:26 -04:00
embeddedt
11fe75578c
Add option to generate block codecs on the fly instead of at startup
2023-07-31 21:51:45 -04:00
embeddedt
49f9644714
Merge 1.18 into 1.19.2
2023-07-31 15:34:02 -04:00
embeddedt
49fa5bf14a
Lock FerriteCore deduplication fix to dev only
2023-07-31 15:23:37 -04:00
embeddedt
e540c9d58d
Improve FerriteCore memory usage for blocks with one state
2023-07-31 14:23:14 -04:00
embeddedt
9d6f51695a
Update MappedRegistry mixin for 1.18
2023-07-31 13:14:48 -04:00
embeddedt
2bc5b39895
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-31 13:14:25 -04:00
embeddedt
3e4f1ab23a
Improve registry performance with large entry counts
2023-07-31 13:13:39 -04:00
embeddedt
467d4818d8
Default reuse_datapacks to false
...
This optimization is only meaningful when swapping worlds (probably
uncommon among players) and it's hard to predict what mods will have
issues. Can be enabled by modpack devs for their own packs/testing
if they wish
2023-07-30 20:19:59 -04:00
embeddedt
78ff767b9e
Merge 1.18 into 1.19.2
2023-07-30 12:57:40 -04:00
embeddedt
762728c0a6
Merge 1.16 into 1.18
2023-07-30 12:57:39 -04:00
embeddedt
ee75ef19aa
Clean up dead code
2023-07-29 20:40:50 -04:00
embeddedt
f08ca83440
Merge 1.18 into 1.19.2
2023-07-28 22:00:21 -04:00
embeddedt
4d0ac56bd8
Merge 1.16 into 1.18
2023-07-28 22:00:20 -04:00
embeddedt
edfa7f0c41
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-07-28 21:25:46 -04:00
embeddedt
ea593d5002
Remove debug message
2023-07-28 21:21:45 -04:00
embeddedt
88a2b25281
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-28 21:19:40 -04:00
embeddedt
5da78f7565
Render sub-options more nicely
2023-07-28 21:19:15 -04:00
embeddedt
f036350b0a
Add option parenting, gate changes to sub-options when parent option is off
2023-07-28 21:04:53 -04:00
embeddedt
3456b8cf23
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-07-27 16:41:07 -04:00
embeddedt
7b02351f11
Update for 1.18
2023-07-27 16:39:15 -04:00
embeddedt
f3f66e1873
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-27 16:35:06 -04:00
embeddedt
13cc103be2
Switch to compile-only Arch Transformer
2023-07-27 16:26:16 -04:00
embeddedt
accd6cb143
Merge 1.16 into 1.18
2023-07-26 09:37:03 -04:00
embeddedt
46fd26a879
Merge 1.18 into 1.19.2
2023-07-26 09:37:03 -04:00
embeddedt
0a9644a8a0
More documentation inside config file
2023-07-26 09:18:05 -04:00
embeddedt
7ad09acec6
Add code to show default values of options (currently unused)
...
Related: #186
2023-07-26 09:00:45 -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
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
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
