Commit Graph

324 Commits

Author SHA1 Message Date
embeddedt
dfdbf8544a
Guard against early parent resolution failing 2023-07-09 20:36:57 -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
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
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
c7787d1390
Merge 1.19.2 into 1.19.4 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
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
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
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
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
embeddedt
3541019ee0
Modify entity loading semantics on Forge to allow EntityJoinWorldEvent handlers to load chunks 2023-07-03 12:26:57 -04:00
embeddedt
ace3975156
Make datapack reload exception silencers not required 2023-07-02 22:14:32 -04:00
embeddedt
90adb1c627
Reduce Twilight Forest structure lag
Related: #147
2023-07-01 19:01:10 -04:00
embeddedt
c8192ef7e3
Merge 1.19.2 into 1.19.4 2023-06-27 11:27:37 -04:00
embeddedt
6ed3c5d365
Merge 1.18 into 1.19.2 2023-06-27 11:27:36 -04:00
embeddedt
c53ed4650d
Merge 1.16 into 1.18 2023-06-27 11:27:35 -04:00
embeddedt
9b31616585
Clean up build script some more 2023-06-27 11:27:26 -04:00
embeddedt
922d0f26e1
Use same merge mode as default Spark 2023-06-27 11:01:17 -04:00
embeddedt
84b08ef64a
Merge 1.19.2 into 1.19.4 2023-06-26 21:26:27 -04:00
embeddedt
bd3a9eb345
Merge 1.18 into 1.19.2 2023-06-26 21:26:26 -04:00
embeddedt
a937ccb07c
Merge 1.16 into 1.18 2023-06-26 21:26:01 -04:00
embeddedt
58eaf44d89
Make mixin info clearing work on Fabric 2023-06-26 21:15:19 -04:00
embeddedt
04c6ea2e66
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-06-26 14:33:12 -04:00
embeddedt
b6182b4913
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-06-26 14:30:23 -04:00
embeddedt
a01cc836c1
Use correct platform name 2023-06-26 14:22:34 -04:00
embeddedt
012ed17208
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-06-26 14:21:19 -04:00
embeddedt
4943702061
Add platform name to hooks 2023-06-26 14:21:07 -04:00
embeddedt
33c0cf33d9
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-06-26 14:14:35 -04:00
embeddedt
60525ad594
Add option to profile launch using Spark 2023-06-26 13:58:12 -04:00
embeddedt
24f31dd92a
Initial version of resource pack caching for 1.19.4+ 2023-06-22 13:45:13 -04:00
embeddedt
49bc941dd7
Merge 1.19.2 into 1.19.4 2023-06-20 14:43:12 -04:00
embeddedt
4037124c57
Merge 1.18 into 1.19.2 2023-06-20 14:43:11 -04:00
embeddedt
fc908bb92c
Update config fixer for 1.18 2023-06-20 14:40:49 -04:00
embeddedt
9cdeeb4c94
Merge 1.19.2 into 1.19.4 2023-06-20 14:34:53 -04:00
embeddedt
a84fa8ac0c
Merge 1.18 into 1.19.2 2023-06-20 14:34:37 -04:00
embeddedt
6a7d62b38d
Merge 1.16 into 1.18 2023-06-20 14:34:36 -04:00
embeddedt
40be7c9fc1
Add a few missing ClientOnlyMixin annotations
Related: #137
2023-06-20 10:43:17 -04:00
embeddedt
c1acdf1bb4
Make config wrapping possible to disable 2023-06-20 09:42:44 -04:00
embeddedt
41b71c5e59
Attempt fix for Engineer's Decor and related crashes 2023-06-19 21:49:45 -04:00
embeddedt
00b6261a1c
Merge 1.19.2 into 1.19.4 2023-06-19 20:58:13 -04:00
embeddedt
ce9d5f78e2
Merge 1.16 into 1.18 2023-06-19 20:58:11 -04:00
embeddedt
e75aca9236
Merge 1.18 into 1.19.2 2023-06-19 20:58:11 -04:00
embeddedt
aa3fa93a9f
Add framework to load specific mod classes sequentially, preventing deadlocks 2023-06-19 20:57:07 -04:00
embeddedt
5d2310bda4 Fix incorrect classname in Valhelsia Structures patch
Looks like this was broken during the multiloader refactor

Related: #135
2023-06-19 18:54:26 -04:00
embeddedt
4d47ca26db
Fix miscopied patch from Fabric to Forge 2023-06-15 22:14:39 -04:00
embeddedt
f7037e3ecb
Change cancellation strategy for bakeModels, fixes Balm issues 2023-06-14 22:14:13 -04:00
embeddedt
af63a6ca09
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-06-12 10:46:33 -04:00
embeddedt
a13e8d98e1
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-06-12 10:45:39 -04:00
embeddedt
5136889c3e
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-06-12 10:43:52 -04:00
embeddedt
fcd6663835
Move curseforge/modrinth code into common file 2023-06-12 10:40:10 -04:00
embeddedt
702fe0ba24
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-06-07 11:47:12 -04:00
embeddedt
755bc35d09
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-06-07 11:45:27 -04:00
embeddedt
313981f30e
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-06-06 11:49:01 -04:00
embeddedt
5de87576ca
Ensure CTM's metadataCache is thread-safe 2023-06-06 11:35:02 -04:00
embeddedt
444f5ad446
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-06-02 20:10:53 -04:00
embeddedt
32aa4794d0
Merge remote-tracking branch 'origin/main' into 1.18 2023-06-02 20:09:12 -04:00
embeddedt
db223b62a0
Advancement recursion speedup on Forge, based off Advancements Debug 2023-06-02 12:06:34 -04:00
embeddedt
4a9cd78d1d
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-29 20:39:14 -04:00
embeddedt
d51de3fa55
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-29 10:19:21 -04:00
embeddedt
f1811bbbc6
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-29 10:17:59 -04:00
embeddedt
a7d894cbc2
Disable cache invalidation outside dev
Not needed as mod contents shouldn't change (right...)
2023-05-29 10:16:54 -04:00
embeddedt
04f34a00fa
Fix resource pack cache not working as well as it could 2023-05-29 10:15:18 -04:00
embeddedt
f4b2db89ec
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-27 10:28:35 -04:00
embeddedt
5a09f27c6a
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-27 10:28:00 -04:00
embeddedt
74eb8a0619
Split unbaked model load event into load and pre-bake stages
Allows mods like Continuity to wrap the model being baked
separately from the model in the cache
2023-05-23 18:50:49 -04:00
embeddedt
bd94b5dd2e
Spotless 2023-05-22 14:40:26 -04:00
embeddedt
31feef398f
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-22 14:24:27 -04:00
embeddedt
d428f9c4c0
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-21 20:57:15 -04:00
embeddedt
f48ed1212b
Move AE2 dynamic resources compat to common module 2023-05-21 20:17:38 -04:00
embeddedt
fc65975252
Fix AE2 mod id 2023-05-21 20:08:17 -04:00
embeddedt
7517c36b36
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-21 19:17:39 -04:00
embeddedt
c2f09fb998
Merge branch 'mod-api' 2023-05-21 15:24:46 -04:00
embeddedt
0d901c6281
Only preserve window position if a non-default width/height was given
Fixes #103 (in next release)
2023-05-20 16:35:56 -04:00
embeddedt
119f9ec6dd
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-16 11:11:00 -04:00
embeddedt
3a24d094c9
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-16 11:01:46 -04:00
embeddedt
dba6e1210e
Fix classloading hack not working anymore 2023-05-16 10:17:12 -04:00
embeddedt
98def7b879
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-15 21:23:01 -04:00
embeddedt
6f8815200e
Move search tree replacement to common module 2023-05-15 21:05:01 -04:00
embeddedt
4a0b633970
Fix workaround message printing twice 2023-05-15 21:04:01 -04:00
embeddedt
32c1baf887
Move search tree replacement to common, support both modloaders 2023-05-15 20:23:37 -04:00
embeddedt
d2d5f81782
Bump required Forge version, drop datapack reload patch
https://github.com/MinecraftForge/MinecraftForge/pull/9454 has been
merged upstream
2023-05-15 19:43:31 -04:00
embeddedt
04c89a26ed
Workaround for Forge issue #9505 2023-05-15 13:28:40 -04:00
embeddedt
b1fb365f22
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-15 11:14:20 -04:00
embeddedt
ee3f29c569
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-15 11:09:39 -04:00
embeddedt
f599acda6b
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-15 11:07:31 -04:00
embeddedt
c1c9c02ff4
Remove blockstate compression 2023-05-14 20:27:37 -04:00
embeddedt
b4ffe68adb
Replace Forge dynamic model bake event with modloader-independent custom solution 2023-05-13 16:37:20 -04:00
embeddedt
ec10f36839
Fix compile errors 2023-05-11 11:27:10 -04:00
embeddedt
9c421218b8
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-11 10:51:34 -04:00
embeddedt
2de8f02814
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-11 10:39:33 -04:00
embeddedt
9efbc47f78
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-11 10:37:59 -04:00
embeddedt
d427c5e050
Invalidate pack caches directly instead of iterating resource manager pack list 2023-05-10 18:12:32 -04:00
embeddedt
dffb89390e
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-10 18:07:50 -04:00
embeddedt
d97da8fe4c
Fix resource pack cache not invalidating on F3+T 2023-05-10 17:02:15 -04:00
embeddedt
74dae9316e
Update patch for 1.19 2023-05-10 15:41:38 -04:00
embeddedt
acdd18f8df
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-10 15:39:22 -04:00
embeddedt
14b4ea7eb1
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-10 15:39:11 -04:00
embeddedt
b5c08b996f
Add button to title screen for datagenning inside runClient 2023-05-10 15:29:46 -04:00
embeddedt
c63252946a
Fix JEI creative search tree replacement not working
Fixes #86
2023-05-08 09:44:44 -04:00
embeddedt
7eb702545b
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-06 11:46:15 -04:00
embeddedt
a139b273c9
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-06 11:45:06 -04:00
embeddedt
48f9ad86f0
Prevent immediate crash when TextureAtlasSprite constructor throws
Fixes #79
2023-05-06 11:21:08 -04:00
embeddedt
650bd0bfb9
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-05 13:30:31 -04:00
embeddedt
9e021ce7e3
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-05 13:28:42 -04:00
embeddedt
4125f2a0e0
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-05 13:26:38 -04:00
embeddedt
f69c25a7b2
Preparing for release 2023-05-05 13:20:23 -04:00
embeddedt
8996d4e09b
Remove entity renderer mixin as it's not needed on 1.18 2023-05-05 12:03:22 -04:00
embeddedt
3b4354fbe5
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-05 12:03:15 -04:00
embeddedt
9677eb6c02
Provide more debug information if entity renderer is missing 2023-05-05 12:02:52 -04:00
embeddedt
95ee0c60ca
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-05 10:53:30 -04:00
embeddedt
85442810f3
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-04 19:56:21 -04:00
embeddedt
da100bea60
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-04 19:54:35 -04:00
embeddedt
b077b53132
Bump maximum models in memory from 1k to 10k 2023-05-04 19:53:39 -04:00
embeddedt
170da33755
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-04 11:47:58 -04:00
embeddedt
912a8f9f2c
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-04 11:17:44 -04:00
embeddedt
7e7f336ccb
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-04 11:17:23 -04:00
embeddedt
4796af2094
Fix DFU blaster making DFU too slow 2023-05-04 11:16:16 -04:00
embeddedt
1fbf83c562
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-04 10:22:23 -04:00
embeddedt
b3da731e1f
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-04 10:18:45 -04:00
embeddedt
26bc9514d7
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-04 10:15:26 -04:00
embeddedt
8b9d3cab18
Add Mod Menu compatibility 2023-05-04 10:08:58 -04:00
embeddedt
74cf6ef598
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-02 22:02:41 -04:00
embeddedt
3ad3da3680
Fix resource cache not being generated on Forge 2023-05-02 21:03:40 -04:00
embeddedt
2aacadaa82
Fix incorrectly mapped mixin 2023-05-02 20:58:52 -04:00
embeddedt
ae33070507
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-02 20:24:48 -04:00
embeddedt
e1b29f2985
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-02 20:20:12 -04:00
embeddedt
215e8da87d
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-02 20:10:46 -04:00
embeddedt
2772351a3d
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-02 20:10:40 -04:00
embeddedt
243bf03440
Fix spotless 2023-05-02 20:09:07 -04:00
embeddedt
6a85047132
Add structure upgrading command 2023-05-02 20:04:54 -04:00
embeddedt
7ca647b763
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-02 11:20:58 -04:00
embeddedt
85d54292b2
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-02 11:20:21 -04:00
embeddedt
5a3d519bab
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-02 11:19:38 -04:00
embeddedt
28f73454c3
Universal output directory 2023-05-02 11:18:39 -04:00
embeddedt
87958ff213
Make sure JEI doesn't reload without a client world 2023-05-02 10:47:07 -04:00
embeddedt
81a2b9cb56
Fix issues 2023-05-01 21:12:02 -04:00
embeddedt
ada0bd4012
Fix mixin 2023-05-01 20:50:56 -04:00
embeddedt
a06a46b498
Spotless 2023-05-01 20:47:24 -04:00
embeddedt
b746be4c67
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-01 20:46:16 -04:00
embeddedt
fddac90db2
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-01 20:42:59 -04:00
embeddedt
de00e21835
Clean up imports 2023-05-01 20:40:06 -04:00
embeddedt
ea25f2e854
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-01 20:30:25 -04:00
embeddedt
d9c2e0f342
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-01 19:46:23 -04:00
embeddedt
5ffac3bc3e
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-01 19:11:16 -04:00
embeddedt
64eb01987f
Package restructuring for modern FML 2023-05-01 19:05:08 -04:00
embeddedt
9dd9ef923c
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-01 18:37:26 -04:00
embeddedt
b6ae90d384
Multiloader 2023-05-01 16:55:26 -04:00