embeddedt
|
08bf8ecc89
|
Merge 1.18 into 1.19.2
|
2023-07-20 21:35:13 -04:00 |
|
embeddedt
|
b98377d5cb
|
Merge 1.16 into 1.18
|
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
|
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
|
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
|
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
|
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
|
1ba2a1fae0
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-07-10 20:28:20 -04:00 |
|
embeddedt
|
e87c85b75c
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-07-10 20:24:38 -04:00 |
|
embeddedt
|
bd351197b2
|
Backport https://github.com/MinecraftForge/MinecraftForge/pull/8959 to 1.18
|
2023-07-10 20:23:54 -04:00 |
|
embeddedt
|
4ea7b864a8
|
Add facility to hide mixin options outside dev
|
2023-07-10 19:00:37 -04:00 |
|
embeddedt
|
4962d855af
|
Merge 1.18 into 1.19.2
|
2023-07-09 20:37:23 -04:00 |
|
embeddedt
|
ef47883262
|
Merge 1.16 into 1.18
|
2023-07-09 20:37:22 -04:00 |
|
embeddedt
|
dfdbf8544a
|
Guard against early parent resolution failing
|
2023-07-09 20:36:57 -04:00 |
|
embeddedt
|
a34ac84e00
|
Merge 1.18 into 1.19.2
|
2023-07-09 20:35:40 -04:00 |
|
embeddedt
|
e248e2966a
|
Merge 1.16 into 1.18
|
2023-07-09 20:35:39 -04:00 |
|
embeddedt
|
49b31c347b
|
Resolve parents in getModel rather than at bake time
Fixes EBE chests
|
2023-07-09 20:35:31 -04:00 |
|
embeddedt
|
98663fa416
|
Never replace search tree on 1.16 with REI present
|
2023-07-07 12:39:26 -04:00 |
|
embeddedt
|
79219d286f
|
Fix issue with anonymous classes in mixin
Related: #151
|
2023-07-07 12:34:36 -04:00 |
|
embeddedt
|
3b85b20020
|
Merge 1.18 into 1.19.2
|
2023-07-06 22:10:24 -04:00 |
|
embeddedt
|
36a1b6bb93
|
Merge 1.16 into 1.18
|
2023-07-06 22:10:24 -04:00 |
|
embeddedt
|
8f896f065c
|
Limit registry wrapping to known bad mods to avoid performance issues
|
2023-07-06 22:05:27 -04:00 |
|
embeddedt
|
9b93a28ddb
|
Merge 1.18 into 1.19.2
|
2023-07-06 21:28:56 -04:00 |
|
embeddedt
|
ad798850c6
|
Merge 1.16 into 1.18
|
2023-07-06 21:28:55 -04:00 |
|
embeddedt
|
8bc0946977
|
Fix remapping issue on newer MC versions
|
2023-07-06 21:28:41 -04:00 |
|
embeddedt
|
9ce029b35d
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-07-06 21:24:11 -04:00 |
|
embeddedt
|
127f091728
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-07-06 21:14:44 -04:00 |
|
embeddedt
|
16d317af97
|
Only provide each mod its own model list in ModelBakeEvent
|
2023-07-06 21:12:59 -04:00 |
|
embeddedt
|
1b6880ed9f
|
Make modelRegistry.keySet() more accurate on Forge when dynamic resources is on
|
2023-07-06 20:43:35 -04:00 |
|
embeddedt
|
582f17c0e7
|
Update Loom to prepare for unit tests
|
2023-07-06 14:42:51 -04:00 |
|
embeddedt
|
463f1c540e
|
Make sure LazyDFU warning is not shown if FML disables DFU already
|
2023-07-05 15:04:29 -04:00 |
|
embeddedt
|
b637d79c50
|
Merge 1.18 into 1.19.2
|
2023-07-05 14:52:54 -04:00 |
|
embeddedt
|
5a6ab4f781
|
Fix missed import during merge
|
2023-07-05 14:51:16 -04:00 |
|
embeddedt
|
6d4071f42c
|
Merge 1.18 into 1.19.2
|
2023-07-05 14:50:05 -04:00 |
|
embeddedt
|
6cd49334d7
|
Merge 1.16 into 1.18
|
2023-07-05 14:47:30 -04:00 |
|
embeddedt
|
095b9c3277
|
Revamp mod warning system, also warn about FerriteCore missing
|
2023-07-05 14:47:17 -04:00 |
|