Commit Graph

199 Commits

Author SHA1 Message Date
embeddedt
827d09289d
Merge 1.19.4 into 1.20 2023-07-09 20:37:25 -04:00
embeddedt
0ce00531a6
Merge 1.19.2 into 1.19.4 2023-07-09 20:37:24 -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
7e25e31d33
Merge 1.19.4 into 1.20 2023-07-09 20:35:41 -04:00
embeddedt
a1d56e2921
Merge 1.19.2 into 1.19.4 2023-07-09 20:35:41 -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
e65727937c
Merge 1.19.4 into 1.20 2023-07-06 22:10:26 -04:00
embeddedt
a1f3cb9270
Merge 1.19.2 into 1.19.4 2023-07-06 22:10:25 -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
5e7421ab24
Merge 1.19.4 into 1.20 2023-07-06 21:29:26 -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
92264ed37e
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-07-06 21:27:43 -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
ba7bda0b04
Remove LazyDFU change for 1.20 2023-07-05 15:08:31 -04:00
embeddedt
c7787d1390
Merge 1.19.2 into 1.19.4 2023-07-05 15:04:49 -04:00
embeddedt
a7d0d4892f
Merge 1.19.4 into 1.20 2023-07-05 15:04:49 -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
079c348948
Merge 1.19.4 into 1.20 2023-07-05 14:52:56 -04:00
embeddedt
c50388a358
Merge 1.19.2 into 1.19.4 2023-07-05 14:52:55 -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
2a16229056
Merge 1.19.4 into 1.20 2023-07-05 14:50:28 -04:00
embeddedt
7652a1dbc5
Merge 1.19.2 into 1.19.4 2023-07-05 14:50:07 -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
embeddedt
7632647e1d
Merge remote-tracking branch 'origin/1.19.4' into 1.20 2023-07-05 12:45:02 -04:00
embeddedt
41a56fba20
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-07-05 12:35:41 -04:00
embeddedt
1600dc4f84
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-07-05 12:26:14 -04:00
embeddedt
46cff62796
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-07-05 12:18:00 -04:00
embeddedt
0a2601257c
Fix dynamic resources losing nested model loads sometimes 2023-07-05 12:04:10 -04:00
embeddedt
c73cb8115e
Fix mixin crash outside dev 2023-07-05 11:24:04 -04:00
embeddedt
3237de7e33
Merge 1.19.4 into 1.20 2023-07-03 14:59:21 -04:00
embeddedt
37d6f477c4
Merge 1.19.2 into 1.19.4 2023-07-03 14:58:45 -04:00
embeddedt
0f90f53f53
Merge 1.18 into 1.19.2 2023-07-03 14:58:44 -04:00
embeddedt
9d5953c9f5
Merge 1.16 into 1.18 2023-07-03 14:58:06 -04:00