Commit Graph

1005 Commits

Author SHA1 Message Date
embeddedt
42d41eb0f7
Merge 1.19.4 into 1.20 2023-06-14 22:14:23 -04:00
embeddedt
fea1d35d08
Merge 1.19.2 into 1.19.4 2023-06-14 22:14:22 -04:00
embeddedt
15ed114e87
Merge 1.18 into 1.19.2 2023-06-14 22:14:21 -04:00
embeddedt
2414f87a86
Merge 1.16 into 1.18 2023-06-14 22:14:21 -04:00
embeddedt
f7037e3ecb
Change cancellation strategy for bakeModels, fixes Balm issues 2023-06-14 22:14:13 -04:00
embeddedt
a72ebc4c26
Avoid printing "automatic merge went well" message [skip ci] 2023-06-13 17:53:05 -04:00
embeddedt
75bd0a5ff7
Merge 1.19.4 into 1.20 2023-06-13 17:52:45 -04:00
embeddedt
c3a5964f17
Merge 1.19.2 into 1.19.4 2023-06-13 17:52:45 -04:00
embeddedt
cb6f595cc3
Merge 1.18 into 1.19.2 2023-06-13 17:52:43 -04:00
embeddedt
9bd8870ef9
Merge 1.16 into 1.18 2023-06-13 17:52:43 -04:00
embeddedt
f7d66257fb
Allow resolving merge conflicts inside propagator [skip ci] 2023-06-13 17:52:31 -04:00
embeddedt
9aa96b4d03
Merge 1.19.4 into 1.20 2023-06-13 17:41:04 -04:00
embeddedt
0765b6770f
Fix creative search tab not having a populator registered on Fabric 2023-06-13 17:40:40 -04:00
embeddedt
761417833e
Merge 1.19.4 into 1.20 2023-06-12 21:58:58 -04:00
embeddedt
e5ab4df3dc
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-06-12 21:58:51 -04:00
embeddedt
12345a67e8
Merge 1.18 into 1.19.2 2023-06-12 21:57:43 -04:00
embeddedt
440cc21d8c
Merge 1.16 into 1.18 2023-06-12 21:57:42 -04:00
embeddedt
d242431e9a
Change dynamic_dfu to return real schemas as well 2023-06-12 21:57:22 -04:00
embeddedt
173d71b04f
Merge 1.19.4 into 1.20 2023-06-12 10:56:16 -04:00
embeddedt
6df837f9ba
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-06-12 10:56:06 -04:00
embeddedt
eea53ee9ef
Merge 1.18 into 1.19.2 2023-06-12 10:55:52 -04:00
embeddedt
7fb65f5144
Merge 1.16 into 1.18 2023-06-12 10:55:51 -04:00
embeddedt
916710eb77
Add yet another texture folder 2023-06-12 10:55:31 -04:00
embeddedt
d352c9e8ca
Mark 1.20.1 as supported 2023-06-12 10:46:56 -04:00
embeddedt
e5cc8ef97c
Merge remote-tracking branch 'origin/1.19.4' into 1.20 2023-06-12 10:46:44 -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
9c76052be0
Fix CF publishing 2023-06-12 10:42:33 -04:00
embeddedt
fcd6663835
Move curseforge/modrinth code into common file 2023-06-12 10:40:10 -04:00
embeddedt
cfd3920c8c
Add tickable object framework 2023-06-12 10:24:49 -04:00
embeddedt
a7e5147104
Merge 1.19.4 into 1.20 2023-06-11 21:32:24 -04:00
embeddedt
017d81a8c6
Merge 1.19.2 into 1.19.4 2023-06-11 21:32:23 -04:00
embeddedt
77436644aa
Merge 1.18 into 1.19.2 2023-06-11 21:32:22 -04:00
embeddedt
31ba30d101
Merge 1.16 into 1.18 2023-06-11 21:32:21 -04:00
embeddedt
b0ab187da8
Add autorelease script [skip ci] 2023-06-11 21:21:27 -04:00
embeddedt
cc6191cef2
Merge 1.19.4 into 1.20 2023-06-11 21:03:06 -04:00
embeddedt
9aa28c3e3f
Merge 1.19.2 into 1.19.4 2023-06-11 21:03:05 -04:00
embeddedt
055d27a9f6
Merge 1.18 into 1.19.2 2023-06-11 21:03:04 -04:00
embeddedt
140e19dffe
Merge 1.16 into 1.18 2023-06-11 21:03:03 -04:00
embeddedt
74a3e4ed2b
Ensure bin is populated by release runner [skip ci] 2023-06-11 21:02:48 -04:00
embeddedt
002ff639a0
Merge 1.19.4 into 1.20 2023-06-11 20:48:20 -04:00
embeddedt
826694793c
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-06-11 20:46:55 -04:00
embeddedt
4699b9be7a
Merge 1.18 into 1.19.2 2023-06-11 20:44:58 -04:00
embeddedt
ec9ce77ace
Merge 1.16 into 1.18 2023-06-11 20:44:57 -04:00
embeddedt
99e030ce27
Add script for auto-propagating changes to modern branches where possible [skip ci] 2023-06-11 20:44:39 -04:00
embeddedt
22c52171d9
Merge 1.18 into 1.19.2 2023-06-11 20:43:21 -04:00
embeddedt
cff1363050
Merge 1.16 into 1.18 2023-06-11 20:43:20 -04:00
embeddedt
02a68f7689
Fix Wizards spell textures being missing 2023-06-11 20:06:42 -04:00
embeddedt
a2d82472a4
Add automated, ephemeral release workflow [skip ci] 2023-06-09 13:05:40 -04:00