Commit Graph

431 Commits

Author SHA1 Message Date
embeddedt
6c7cd80bb3
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-04-27 13:37:50 -04:00
embeddedt
ba830aee5a
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-27 12:15:58 -04:00
embeddedt
86d15fe239
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-27 12:08:20 -04:00
embeddedt
c861c99c79
Speed up FontManager loading 2023-04-27 12:03:38 -04:00
embeddedt
57b7c4785a
Use correct access level for overwrites 2023-04-26 20:59:49 -04:00
embeddedt
4a7bcbfd38
Remove reference to IForgeRegistryEntry 2023-04-26 20:58:19 -04:00
embeddedt
4f30edd960
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-26 20:56:15 -04:00
embeddedt
d3bf2271fc
Avoid recreating tag ID strings 2023-04-26 20:56:03 -04:00
embeddedt
ba3d418260
Speed up processing of dummy registry entries 2023-04-26 20:37:37 -04:00
embeddedt
0ae2225d9e
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-26 19:48:31 -04:00
embeddedt
21826f2091
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-26 19:41:03 -04:00
embeddedt
91d1cb3962
Bypass slow PngInfo class during texture loading
Thanks to @Asek3 for pointing out this bottleneck
2023-04-26 19:11:39 -04:00
embeddedt
1fc1e132cb
Fix injector target 2023-04-26 14:22:06 -04:00
embeddedt
a4515e8eae
Fix injector target 2023-04-26 14:15:35 -04:00
embeddedt
821a15ecaa
Turn off Forge resource cache 2023-04-26 14:15:24 -04:00
embeddedt
9c172e2010
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-26 13:58:50 -04:00
embeddedt
1335a892b1
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-26 13:58:38 -04:00
embeddedt
a4a19be545
Avoid using replaceAll 2023-04-26 13:58:25 -04:00
embeddedt
be75468100
Fix compile error 2023-04-26 13:53:00 -04:00
embeddedt
f645d68ff2
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-26 13:47:08 -04:00
embeddedt
c061b51a52
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-26 13:46:55 -04:00
embeddedt
d356e1ece4
Optimize NBT memory usage 2023-04-26 13:42:53 -04:00
embeddedt
110362b85c
Fix log message always saying 0 items were cleared 2023-04-25 21:34:31 -04:00
embeddedt
14a8be793c
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-25 21:29:12 -04:00
embeddedt
aa4acfe3d7
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-25 21:29:03 -04:00
embeddedt
56aed7284c
More null checks 2023-04-25 21:28:31 -04:00
embeddedt
932b401aa9
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-25 21:21:58 -04:00
embeddedt
e86664ddd2
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-25 21:21:41 -04:00
embeddedt
c684cccf74
Simplify book deduplication 2023-04-25 21:20:30 -04:00
embeddedt
fb7664ea3c
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-25 21:19:12 -04:00
embeddedt
e7b57c161d
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-25 21:15:31 -04:00
embeddedt
d86344f309
Add logic to clear air items of NBT from Patchouli book registry 2023-04-25 21:05:02 -04:00
embeddedt
c0d27ee01d
Update KubeJS mixin for 1.19.2 2023-04-25 19:37:48 -04:00
embeddedt
61050ec861
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-25 19:32:48 -04:00
embeddedt
d344385aa3
Fix compile error 2023-04-25 19:32:27 -04:00
embeddedt
fc5b63282f
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-25 19:30:55 -04:00
embeddedt
e843f8ed6d
Clear KubeJS recipe event lists since mods can hold onto the event object 2023-04-25 19:29:26 -04:00
embeddedt
9c9e8269b6
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-25 12:11:37 -04:00
embeddedt
a60f9ffc61
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-25 12:07:59 -04:00
embeddedt
e46910f3c1
Add Opticrash detection 2023-04-25 12:03:19 -04:00
embeddedt
a7f0c08a94
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-25 11:51:40 -04:00
embeddedt
a30777086d
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-25 11:44:24 -04:00
embeddedt
e771af2330
AE2 model wrapping support 2023-04-25 11:33:26 -04:00
embeddedt
a3e7435c61
Correctly emulate nullishness of baked top level model map 2023-04-25 11:10:20 -04:00
embeddedt
16269ee144
Tweak dynamic resources injection point to prevent Connectedness crash 2023-04-25 09:51:04 -04:00
embeddedt
ec31b0361e
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-24 16:59:12 -04:00
embeddedt
48bec22982
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-24 16:58:13 -04:00
embeddedt
863fbaf3a4
Remove a lot of now dead code 2023-04-24 16:56:27 -04:00
embeddedt
42398fcd17
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-04-24 13:55:44 -04:00
embeddedt
877db870d2
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-24 13:49:09 -04:00