Commit Graph

839 Commits

Author SHA1 Message Date
embeddedt
362bf03e5d
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-16 13:31:20 -04:00
embeddedt
c8523b3844
Incrementing the index is important 2023-04-16 13:31:01 -04:00
embeddedt
dcd37391fe
Fix incorrect merge 2023-04-16 13:24:34 -04:00
embeddedt
44d178bb89
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-16 13:21:40 -04:00
embeddedt
3497adfa6d
Bugfixes 2023-04-16 13:21:10 -04:00
embeddedt
4c8c6ead28
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-16 13:16:06 -04:00
embeddedt
f8c5c50ce4
Improve speed of cache building 2023-04-16 13:15:13 -04:00
embeddedt
0f3c701d2a
Prevent missing options from crashing the game 2023-04-16 12:55:52 -04:00
embeddedt
6f176ba86d
Remove reference to nonexistent config option 2023-04-16 12:55:01 -04:00
embeddedt
0e5b952ea6
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-16 12:53:13 -04:00
embeddedt
ea86bc6850
More aggressive interning of cached path components 2023-04-16 12:48:16 -04:00
embeddedt
4a626043b8
Fix import 2023-04-16 12:02:50 -04:00
embeddedt
6356cba581
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-16 12:02:20 -04:00
embeddedt
3922c3ec26
Reduce memory usage of dynamic CTMPackReloadListener 2023-04-16 11:55:00 -04:00
embeddedt
f36a8f4266
Clear ObjectHolder Throwable fields after registry events fire 2023-04-16 11:39:54 -04:00
embeddedt
26c690595e
Improve memory usage of 1.18 resource pack cache 2023-04-16 09:38:11 -04:00
embeddedt
4d9852234a
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-16 09:36:02 -04:00
embeddedt
61af88a2ab
Improve memory usage of resource pack cache 2023-04-16 09:35:31 -04:00
embeddedt
e9b52cdd55
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-15 21:27:09 -04:00
embeddedt
9225962983
Invalidate material cache if the texture map changes on a model 2023-04-15 21:26:49 -04:00
embeddedt
244873f2fd
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-15 12:14:15 -04:00
embeddedt
33687254cd
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-15 12:13:44 -04:00
embeddedt
58d066d0db
Use high-priority mixin with injects instead of overwrites for
dynamic resources
2023-04-15 12:00:03 -04:00
embeddedt
2db0b24002
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-13 13:28:05 -04:00
embeddedt
76c95abf09
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-13 13:27:57 -04:00
embeddedt
61710dbc85
Add missing import
Don't edit things from the command line ;)
2023-04-13 13:27:47 -04:00
embeddedt
05dde993fd
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-13 13:27:12 -04:00
embeddedt
f6cfde2b56
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-13 13:27:03 -04:00
embeddedt
c7fd6c1393
Fix AT map not actually initializing types set 2023-04-13 13:26:45 -04:00
embeddedt
af555a2089
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-13 13:21:40 -04:00
embeddedt
4c6e18f5b8
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-13 13:19:33 -04:00
embeddedt
c4fbde015e
Use reflection instead of mixins for SyncExecutor patch 2023-04-13 13:00:43 -04:00
embeddedt
9443c41273
Optimize access transformers 2023-04-13 12:01:41 -04:00
embeddedt
e977fcdfce
Improved chunk deadlock detection system + patch Valhelsia Structures
when installed
2023-04-12 19:06:40 -04:00
embeddedt
10149e9f87
Add integrated server watchdog 2023-04-12 16:05:08 -04:00
embeddedt
3b56f00b82
Fix world load freezing if mods access the previous server world 2023-04-12 14:42:11 -04:00
embeddedt
491c62e8a7
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-11 21:32:40 -04:00
embeddedt
d0d3ea080d
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-11 21:32:26 -04:00
embeddedt
d709335ac2
Fetch a model the vanilla way if it fails to be present in
the lookup cache when gathering textures
2023-04-11 21:31:55 -04:00
embeddedt
8142eb8235
Port PathPackResources patch from 1.18
Forge's resource caching is not reliable
2023-04-11 11:47:09 -04:00
embeddedt
47959cddef
Port patch to 1.19 2023-04-11 11:19:23 -04:00
embeddedt
357b9af52f
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-11 11:16:22 -04:00
embeddedt
4f17319836
Fix compile error 2023-04-11 11:16:07 -04:00
embeddedt
1889889f01
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-11 11:13:36 -04:00
embeddedt
87f74bc1b9
Skip calling stateToModelLocation 2023-04-11 11:12:13 -04:00
embeddedt
bfa9d5b12e
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-11 10:19:15 -04:00
embeddedt
e1a73fa4ab
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-11 10:17:18 -04:00
embeddedt
f1d23f9a92
Avoid loading every permutation of a multipart model at once
Fixes the 5 second lag spike for mods like Pedestals on 1.19+
2023-04-11 10:11:10 -04:00
embeddedt
5f8f03137c
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-10 21:59:42 -04:00
embeddedt
2a327ef4c9
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-10 21:50:58 -04:00