embeddedt
1339fc7af6
Merge 1.20 into 1.20.2
2023-10-29 21:17:26 -04:00
embeddedt
d557725c82
Merge 1.19.2 into 1.20
2023-10-29 21:17:24 -04:00
embeddedt
6a8d63a2cd
Merge 1.18 into 1.19.2
2023-10-29 21:15:43 -04:00
embeddedt
6b01f0450b
Merge 1.16 into 1.18
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
3b7d2f1e2e
Merge 1.20 into 1.20.2
2023-10-29 11:44:31 -04:00
embeddedt
59235e6a21
Fix spotless
2023-10-29 11:44:25 -04:00
embeddedt
546a362d9c
Merge 1.20 into 1.20.2
2023-10-29 11:41:44 -04:00
embeddedt
09490df85d
Fix compile errors
2023-10-29 11:41:35 -04:00
embeddedt
7a2b71381c
Merge 1.20 into 1.20.2
2023-10-29 11:37:50 -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
6d096e8ae0
Merge 1.20 into 1.20.2
2023-10-28 09:54:26 -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
fbacc85f86
Merge 1.20 into 1.20.2
2023-10-25 17:18:46 -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 .
We require the ability to store null values in the map for now
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
f6f7badde8
Merge 1.20 into 1.20.2
2023-10-25 15:00:20 -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
2a099d8537
Merge 1.20 into 1.20.2
2023-10-25 14:24:18 -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
7f80f38862
Merge 1.20 into 1.20.2
2023-10-24 12:45:41 -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
cc54b6d67d
Merge 1.20 into 1.20.2
2023-10-13 10:47:53 -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