Commit Graph

34 Commits

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