embeddedt
6a8d63a2cd
Merge 1.18 into 1.19.2
2023-10-29 21:15:43 -04:00
embeddedt
ced7f866d8
Revert "Use copy-on-write map for permanent overrides"
...
This solution is also not good enough. It causes catastrophic
time complexity with mods that call get and put in rapid
succession (i.e. every Forge mod using ModelBakeEvent)
2023-10-29 21:14:51 -04:00
embeddedt
375276ea1f
Disable mixin.feature.registry_event_progress by default
2023-10-29 21:05:17 -04:00
embeddedt
59235e6a21
Fix spotless
2023-10-29 11:44:25 -04:00
embeddedt
09490df85d
Fix compile errors
2023-10-29 11:41:35 -04:00
embeddedt
a677f6d571
Merge 1.19.2 into 1.20
2023-10-29 11:37:49 -04:00
embeddedt
d4f09f6ff9
Merge 1.18 into 1.19.2
2023-10-29 11:36:16 -04:00
embeddedt
fccbae33db
Merge 1.16 into 1.18
2023-10-29 11:36:15 -04:00
embeddedt
621ecf6b3e
Use copy-on-write map for permanent overrides
2023-10-29 11:35:46 -04:00
embeddedt
3eff8c787d
Merge 1.19.2 into 1.20
2023-10-28 09:54:25 -04:00
embeddedt
b9d81f44e6
Merge 1.18 into 1.19.2
2023-10-28 09:54:24 -04:00
embeddedt
93fbbfe2d1
Force UnsafeBufferHelper to be classloaded at startup
2023-10-28 09:50:25 -04:00
Moulberry
e36ba04921
Avoid mods causing double free when BufferBuilder leak fix is enabled
2023-10-28 09:44:12 -04:00
embeddedt
7054c16f6c
Merge 1.19.2 into 1.20
2023-10-25 17:18:45 -04:00
embeddedt
b7b510f807
Merge 1.18 into 1.19.2
2023-10-25 17:18:43 -04:00
embeddedt
4054bd8a23
Merge 1.16 into 1.18
2023-10-25 17:18:42 -04:00
embeddedt
89dab59980
Revert "Change permanentOverrides to ConcurrentHashMap"
...
This reverts commit a5b5733965
2023-10-25 17:17:52 -04:00
embeddedt
f4ce7072a6
Enable dynamic sounds now that Guava issue is worked around
2023-10-25 15:03:16 -04:00
embeddedt
daea9dd83a
Merge 1.19.2 into 1.20
2023-10-25 15:00:19 -04:00
embeddedt
b10e9de54c
Merge 1.18 into 1.19.2
2023-10-25 14:58:33 -04:00
embeddedt
14abfef522
Merge 1.16 into 1.18
2023-10-25 14:58:01 -04:00
embeddedt
77760d7dd2
Remember previous scroll position on config screen
2023-10-25 14:56:37 -04:00
embeddedt
f391e97a62
Handle Knot behaving differently from FML with getResource
2023-10-25 14:34:45 -04:00
embeddedt
fd68efec0c
Remove async_jei option from 1.18 listing
2023-10-25 14:30:10 -04:00
Fury_Phoenix
c0cdbd122e
Unify ModelMangerMixin ( #265 )
2023-10-25 14:26:01 -04:00
embeddedt
e397f0ca78
Merge 1.19.2 into 1.20
2023-10-25 14:24:17 -04:00
embeddedt
04a72f4d90
Merge 1.18 into 1.19.2
2023-10-25 14:24:16 -04:00
embeddedt
8b37a1dbfc
Disable buffer builder fix when isometric-renders is installed
...
Related: #273
2023-10-25 14:23:27 -04:00
embeddedt
b943dc1449
Fix deobfuscation check not working on Forge 1.18+
2023-10-25 14:22:20 -04:00
embeddedt
735a626cf3
Merge 1.19.2 into 1.20
2023-10-24 12:45:39 -04:00
embeddedt
54c7dbd16e
Merge 1.18 into 1.19.2
2023-10-24 12:45:37 -04:00
embeddedt
c5a5b01bfb
Merge 1.16 into 1.18
2023-10-24 12:45:35 -04:00
Phoenix-Starlight
9f040b2c43
Dynamic sounds code cleanup ( #264 )
2023-10-14 22:17:00 -04:00
embeddedt
a5b5733965
Change permanentOverrides to ConcurrentHashMap
...
Should help address thread contention noted while profiling
2023-10-14 13:24:26 -04:00
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
7cbea84706
Merge 1.19.2 into 1.20
2023-10-13 10:47:52 -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
cbfe1636ff
Merge 1.19.2 into 1.20
2023-10-10 17:40:30 -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
ed1f2c5837
Merge 1.19.2 into 1.20
2023-10-09 08:37:42 -04:00
embeddedt
40b04cbded
Fix cache_upgraded_structures leaking open input streams
2023-10-09 08:36:35 -04:00
embeddedt
e537cbe29a
Merge 1.19.2 into 1.20
2023-10-07 18:47:10 -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
c45f83e896
Suppress latest.log warning about structures on 1.20+
2023-10-06 09:49:12 -04:00
embeddedt
225366ee02
Merge 1.19.2 into 1.20
2023-10-03 13:45:37 -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
c0815b787e
Fix legacy solid property not being set correctly when blockstate cache is invalid
...
Related: #244
2023-09-27 17:49:36 -04:00
embeddedt
f1ef1a6c41
Merge 1.19.4 into 1.20
2023-09-24 11:55:27 -04:00
embeddedt
d76e841761
Merge 1.19.2 into 1.19.4
2023-09-24 11:55:27 -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
88d56c451e
Merge 1.19.4 into 1.20
2023-09-20 17:58:55 -04:00
embeddedt
ec6de638a2
Merge 1.19.2 into 1.19.4
2023-09-20 17:58:53 -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
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
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
