embeddedt
9fb1464176
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-11-23 09:56:22 -05:00
embeddedt
488be0c748
Update RegistryObject package name
2023-11-23 09:56:11 -05:00
embeddedt
0b9b49c360
Merge 1.18 into 1.19.2
2023-11-23 09:51:05 -05:00
embeddedt
0aea884052
Merge 1.16 into 1.18
2023-11-23 09:51:03 -05:00
embeddedt
a1f3300a8a
More ClientOnlyMixin
...
Related: #297
2023-11-23 09:50:47 -05:00
Bogdan
ef6c14a61e
Create ru_ru.json ( #303 )
2023-11-22 09:47:11 -05:00
notlin4
27167ea42c
Update zh_tw.json ( #302 )
2023-11-21 12:05:45 -05:00
embeddedt
a531df53cb
Fix RegistryObject#get allocating on every call
...
Credit to jaskarth for discovering this problem
2023-11-19 19:49:08 -05:00
embeddedt
8bc92e051e
Merge 1.18 into 1.19.2
2023-11-11 17:26:26 -05:00
embeddedt
adc3dbaf57
Merge 1.16 into 1.18
2023-11-11 17:26:25 -05:00
embeddedt
7c0f8b8bef
Stop logging for suspicious async chunkloads if they complete quickly enough
2023-11-11 17:26:21 -05:00
embeddedt
3e52c75d0f
Merge 1.18 into 1.19.2
2023-11-07 17:27:24 -05:00
embeddedt
552eea488d
Merge 1.16 into 1.18
2023-11-07 17:27:22 -05:00
embeddedt
215b797e7b
Fix replaceAll being broken on the model registry
...
Thanks Guava.
2023-11-07 17:26:01 -05:00
embeddedt
8bb70222ce
Merge 1.18 into 1.19.2
2023-11-05 21:59:08 -05:00
embeddedt
2f3df11220
Merge 1.16 into 1.18
2023-11-05 21:59:07 -05:00
embeddedt
134dc0ef20
Fix path replacements being too aggressive
2023-11-05 21:58:42 -05:00
embeddedt
53b7d34649
Merge 1.18 into 1.19.2
2023-11-04 09:02:15 -04:00
embeddedt
2ecd0c654b
Merge 1.16 into 1.18
2023-11-04 09:02:14 -04:00
embeddedt
4de9022e3c
Warn if keySet is used by a mod when dynamic resources is on
2023-11-04 09:00:57 -04:00
embeddedt
819cb13d43
Merge 1.18 into 1.19.2
2023-10-30 14:53:53 -04:00
embeddedt
32ad8f6df1
Update RS integration for 1.18+
2023-10-30 14:53:34 -04:00
embeddedt
58f79e25e9
Update Diagonal Fences mixin on 1.19
2023-10-30 09:41:48 -04:00
embeddedt
6b01f0450b
Merge 1.16 into 1.18
2023-10-29 21:15:43 -04:00
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
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
0b5145f290
Merge 1.18 into 1.19.2
2023-10-28 20:06:01 -04:00
embeddedt
0a72abb519
Merge 1.16 into 1.18
2023-10-28 20:06:00 -04:00
embeddedt
5d984f653e
Don't log error if NO_GROUP field is missing
...
Fixes error message in log with Connector
2023-10-28 20:05:55 -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
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
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
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
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
embeddedt
6740857274
Fix unsanitized input being passed to TinyFD
2023-10-24 12:45:13 -04:00
