Commit Graph

120 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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