Commit Graph

924 Commits

Author SHA1 Message Date
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
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
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
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
a72ebc4c26
Avoid printing "automatic merge went well" message [skip ci] 2023-06-13 17:53:05 -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
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
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
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
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
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
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
embeddedt
755bc35d09
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-06-07 11:45:27 -04:00
embeddedt
a7e93ad8f9
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-06-06 19:18:14 -04:00
embeddedt
57e1e54441
Tweak faster_texture_loading injection point for compatibility 2023-06-06 19:12:03 -04:00
embeddedt
690e1b7f8a
Remove MC version from archive base name 2023-06-06 12:51:39 -04:00
embeddedt
531b5d58ba
Re-add new versioning logic (was somehow dropped during merge) 2023-06-06 12:50:36 -04:00
embeddedt
931bf29c47
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-06-06 11:52:49 -04:00