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
|
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
|
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
|
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
|
4c80deae25
|
Backport Diagonal Fences fix to 1.19.2
Related: #171
|
2023-07-21 10:47:50 -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
|
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
|
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
|
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
|
2941f11c54
|
Revert resource loader JiJ on 1.19+
|
2023-07-19 12:38:59 -04:00 |
|
embeddedt
|
0bc372bf86
|
Merge 1.18 into 1.19.2
|
2023-07-19 12:32:38 -04:00 |
|
embeddedt
|
4c737e315e
|
Merge 1.16 into 1.18
|
2023-07-19 12:32:37 -04:00 |
|
embeddedt
|
d8e515272a
|
Even more resilient Night Config fix
|
2023-07-19 12:32:26 -04:00 |
|
embeddedt
|
12ec9b08bf
|
Update ItemOverrideBakedModel for 1.19
|
2023-07-19 12:15:29 -04:00 |
|
embeddedt
|
3fed2ef08d
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-07-19 12:09:39 -04:00 |
|
embeddedt
|
d9b9586af3
|
Update item override patch to 1.18
|
2023-07-19 12:08:15 -04:00 |
|
embeddedt
|
6fda7393b3
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-07-19 11:51:00 -04:00 |
|
embeddedt
|
ac436db456
|
Add support to dynamic resources for item overrides
|
2023-07-19 11:50:16 -04:00 |
|
embeddedt
|
e65f8fbb32
|
Add option to override overrides
Absolutely no support is guaranteed when this is used
|
2023-07-19 10:05:09 -04:00 |
|
embeddedt
|
94433b0107
|
Merge 1.18 into 1.19.2
|
2023-07-18 13:57:29 -04:00 |
|
embeddedt
|
8ac43d5617
|
Fix incorrect import
|
2023-07-18 13:51:21 -04:00 |
|
embeddedt
|
90e63341bd
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-07-18 13:48:50 -04:00 |
|
embeddedt
|
36eb73b28e
|
Generify config patch to also work with Night Config Fixes mod
|
2023-07-18 13:48:20 -04:00 |
|
embeddedt
|
b499a054b9
|
Possible fix for the elusive Forge config corruption bug
Block file watcher from proceeding until config is done saving
Related: https://github.com/MinecraftForge/MinecraftForge/issues/9122
|
2023-07-18 12:44:11 -04:00 |
|
embeddedt
|
ab7c982589
|
Merge 1.18 into 1.19.2
|
2023-07-17 16:08:28 -04:00 |
|
embeddedt
|
92643a244e
|
Merge 1.16 into 1.18
|
2023-07-17 16:08:27 -04:00 |
|
embeddedt
|
c3e3dff805
|
Return all possible states for model if given location is not an MRL
|
2023-07-17 16:07:51 -04:00 |
|
embeddedt
|
5ec070843d
|
Use CachedResourcePath in resource finder
Reduces memory usage by ~50%
|
2023-07-17 13:42:50 -04:00 |
|
embeddedt
|
9fbb97d0fa
|
Use Guava multimap for resource finder instead of custom "multi"map
|
2023-07-17 13:20:46 -04:00 |
|
embeddedt
|
594c47f08b
|
Merge 1.18 into 1.19.2
|
2023-07-16 20:00:06 -04:00 |
|
embeddedt
|
94d5121a26
|
Merge 1.16 into 1.18
|
2023-07-16 20:00:06 -04:00 |
|