embeddedt
1f589901d6
Merge 1.19.4 into 1.20
2023-06-21 21:44:00 -04:00
embeddedt
1afdfccf3b
Merge 1.19.2 into 1.19.4
2023-06-21 21:43:59 -04:00
embeddedt
5bd745a188
Merge 1.18 into 1.19.2
2023-06-21 21:43:29 -04:00
embeddedt
1ac69035ed
Merge 1.16 into 1.18
2023-06-21 21:41:12 -04:00
embeddedt
19c6687745
More aggressively load model files
2023-06-21 21:17:11 -04:00
embeddedt
2fe5c088e3
Explicitly run it on all branches
2023-06-20 14:58:12 -04:00
embeddedt
fa76a4e2be
Do not run Gradle workflow when pushing a tag
2023-06-20 14:53:20 -04:00
embeddedt
9bc6b7b0f7
Merge 1.19.4 into 1.20
2023-06-20 14:43: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
c1c0010126
Merge 1.19.4 into 1.20
2023-06-20 14:34:54 -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
5d6566512c
Rewrite CanonizingStringMap to simply use a normal HashMap and intern keys
...
There are no memory savings from using the fastutil maps, and they
may be harming performance based on the Project MMO issues
Probably also the solution to #134
2023-06-20 10:31:49 -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
1bf64f9aa1
Use annotated tags for releases [skip ci]
2023-06-19 21:07:13 -04:00
embeddedt
f77221d6d8
Fix missing newline [skip ci]
2023-06-19 20:58:51 -04:00
embeddedt
6006026deb
Merge 1.19.4 into 1.20
2023-06-19 20:58:13 -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
683f9fd13b
1.20.1
2023-06-19 20:38:33 -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
18e1cec611
Merge 1.19.4 into 1.20
2023-06-15 22:14:57 -04:00
embeddedt
4d47ca26db
Fix miscopied patch from Fabric to Forge
2023-06-15 22:14:39 -04:00
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
2414f87a86
Merge 1.16 into 1.18
2023-06-14 22:14:21 -04:00
embeddedt
15ed114e87
Merge 1.18 into 1.19.2
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
9bd8870ef9
Merge 1.16 into 1.18
2023-06-13 17:52:43 -04:00
embeddedt
cb6f595cc3
Merge 1.18 into 1.19.2
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
