Commit Graph

1324 Commits

Author SHA1 Message Date
embeddedt
3a96f63798
Merge 1.19.2 into 1.19.4 2023-07-23 19:23:26 -04:00
embeddedt
18db311712
Merge 1.18 into 1.19.2 2023-07-23 19:23:26 -04:00
embeddedt
000e9746ba
Merge 1.16 into 1.18 2023-07-23 19:23:25 -04:00
embeddedt
7fa6c45f07
Fix dragging in ModLoader too early 2023-07-23 19:21:00 -04:00
embeddedt
b24f82d257
Merge 1.19.2 into 1.19.4 2023-07-23 18:33:33 -04:00
embeddedt
bbcc58f103
Merge 1.18 into 1.19.2 2023-07-23 18:33:26 -04:00
embeddedt
0c3cade976
Merge 1.16 into 1.18 2023-07-23 18:33:25 -04:00
embeddedt
2246b79a85
Fix mod mixins not being disabled if there is an early load error 2023-07-23 18:32:50 -04:00
embeddedt
b43e7902df
Merge 1.19.2 into 1.19.4 2023-07-22 17:07:34 -04:00
embeddedt
7e2dc67c4e
Merge 1.18 into 1.19.2 2023-07-22 17:07:33 -04:00
embeddedt
e56155f9a0
Merge 1.16 into 1.18 2023-07-22 17:07:32 -04:00
embeddedt
4cdf5e6b3d
Fix missing ClientOnly annotations 2023-07-22 15:35:36 -04:00
embeddedt
ecbcc6dcaa
Merge 1.19.2 into 1.19.4 2023-07-22 11:22:04 -04:00
embeddedt
cd9adbdf7e
Merge 1.18 into 1.19.2 2023-07-22 11:22:03 -04:00
embeddedt
6efa7f3c5b
Merge 1.16 into 1.18 2023-07-22 11:22:02 -04:00
embeddedt
48409fc572
Fix concurrency issue in CoFH FlagManager
Related: #173
2023-07-22 11:19:20 -04:00
embeddedt
373a10f12c
Fix crash with dynamic resources if mods depend on themselves 2023-07-22 11:06:11 -04:00
embeddedt
18cec4f88d
Fix NPE from config fixers
Related: #174
2023-07-22 09:56:25 -04:00
embeddedt
bc09210ada
Merge 1.19.2 into 1.19.4 2023-07-21 11:15:22 -04:00
embeddedt
affb24fc11
Merge 1.18 into 1.19.2 2023-07-21 11:15:21 -04:00
embeddedt
b5870b3ae4
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-07-21 11:15:11 -04:00
embeddedt
edb3da4f74
Fix deadlock with the config fixers by moving all locking to one object 2023-07-21 11:13:56 -04:00
embeddedt
4131f3b2fe
Merge 1.19.2 into 1.19.4 2023-07-21 10:47:56 -04:00
embeddedt
4c80deae25
Backport Diagonal Fences fix to 1.19.2
Related: #171
2023-07-21 10:47:50 -04:00
embeddedt
24598ac463
Merge 1.19.2 into 1.19.4 2023-07-20 21:35:14 -04:00
embeddedt
b98377d5cb
Merge 1.16 into 1.18 2023-07-20 21:35:13 -04:00
embeddedt
08bf8ecc89
Merge 1.18 into 1.19.2 2023-07-20 21:35:13 -04:00
embeddedt
7dbb926787
Forceload RenderType/RenderStateShard on the main thread during startup
Fixes launch deadlock with Registrate/Quark
2023-07-20 21:34:04 -04:00
embeddedt
f9315a127f
Merge 1.19.2 into 1.19.4 2023-07-20 20:18:45 -04:00
embeddedt
22d0d55d79
Merge 1.18 into 1.19.2 2023-07-20 20:18:44 -04:00
embeddedt
50ab84af42
Merge 1.16 into 1.18 2023-07-20 20:18:43 -04:00
embeddedt
4397f274a5
Prevent CME from thread dumper 2023-07-20 20:18:34 -04:00
embeddedt
e8aa88b317
Fix Diagonal Fences breaking after resource reload 2023-07-20 10:57:29 -04:00
embeddedt
0767b6e9cf
Fix incorrect field being used for pre-bake event 2023-07-20 10:43:23 -04:00
embeddedt
42298947cc
Backport model loading API change to 1.19.4 2023-07-19 22:15:16 -04:00
embeddedt
427a92f0f3
Stop JiJing fabric-models-v0 2023-07-19 22:10:38 -04:00
embeddedt
5994edcf17
Merge 1.19.2 into 1.19.4 2023-07-19 17:34:38 -04:00
embeddedt
754e7741c7
Merge 1.18 into 1.19.2 2023-07-19 17:32:36 -04:00
embeddedt
4f428b0e5d
Merge 1.16 into 1.18 2023-07-19 17:32:18 -04:00
embeddedt
ad60b1dec6
Fix timing of dynamic baked model registry handoff 2023-07-19 17:31:24 -04:00
embeddedt
d1a1fce7e1
Improve reliability of ItemOverrideBakedModel if not replaced 2023-07-19 17:08:23 -04:00
embeddedt
72a45ef014
Synchronize outside of ModelBaker for FAPI compat 2023-07-19 17:01:10 -04:00
embeddedt
02f6431109
Merge 1.19.2 into 1.19.4 2023-07-19 16:46:14 -04:00
embeddedt
af5ece3fe9
Merge 1.18 into 1.19.2 2023-07-19 16:46:13 -04:00
embeddedt
91980319d2
Merge 1.16 into 1.18 2023-07-19 16:46:13 -04:00
embeddedt
8383053b5c
Fix wall block deduplication crashing when invasive mods replace vanilla walls
Related: #168
2023-07-19 16:45:32 -04:00
embeddedt
3827d8a5ce
Merge 1.19.2 into 1.19.4 2023-07-19 12:39:09 -04:00
embeddedt
2941f11c54
Revert resource loader JiJ on 1.19+ 2023-07-19 12:38:59 -04:00
embeddedt
ab55dde534
Merge 1.19.2 into 1.19.4 2023-07-19 12:32:39 -04:00
embeddedt
0bc372bf86
Merge 1.18 into 1.19.2 2023-07-19 12:32:38 -04:00