Commit Graph

2430 Commits

Author SHA1 Message Date
embeddedt
ad07fb3f0c
Merge 1.20 into 1.20.4 2024-03-30 17:42:55 -04:00
embeddedt
4ddac48f1e
Merge remote-tracking branch 'origin/1.19.2' into 1.20 2024-03-30 17:42:09 -04:00
embeddedt
e9c266cd16
Properly port recipe book tree to 1.19.2 2024-03-30 17:39:36 -04:00
embeddedt
b0ed60c2f0
Merge remote-tracking branch 'origin/1.19.2' into 1.20 2024-03-30 17:37:23 -04:00
embeddedt
099c62672b
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2024-03-30 17:36:18 -04:00
embeddedt
6c82d448f7
Merge remote-tracking branch 'origin/1.16' into 1.18 2024-03-30 17:35:57 -04:00
embeddedt
469b4b7093
Use separate backing search tree for recipe book 2024-03-30 17:35:06 -04:00
embeddedt
033cfd34e5
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2024-03-30 17:34:32 -04:00
embeddedt
c3eeb1e90f
Merge remote-tracking branch 'origin/1.16' into 1.18 2024-03-30 17:31:55 -04:00
embeddedt
db105905f7
Implement a fallback search tree for the recipe book 2024-03-30 17:27:37 -04:00
embeddedt
4b741da54d
Merge 1.20 into 1.20.4 2024-03-30 15:22:46 -04:00
embeddedt
85aa352215
Merge 1.19.2 into 1.20 2024-03-30 15:22:45 -04:00
embeddedt
aa6b7fad1f
Merge 1.18 into 1.19.2 2024-03-30 15:22:44 -04:00
embeddedt
43dbba1152
Merge 1.16 into 1.18 2024-03-30 15:22:43 -04:00
embeddedt
9e3e732b43
Fix MC-183518 2024-03-30 15:14:44 -04:00
embeddedt
042a7caa9e
Merge 1.20 into 1.20.4 2024-03-29 10:49:43 -04:00
embeddedt
8dac16bfc4
Merge 1.19.2 into 1.20 2024-03-29 10:49:42 -04:00
embeddedt
72ba7d37e0
Merge 1.18 into 1.19.2 2024-03-29 10:49:42 -04:00
embeddedt
183429867a
Merge 1.16 into 1.18 2024-03-29 10:49:41 -04:00
embeddedt
226e4a373b
Reduce chances of CME when iterating class info cache 2024-03-29 10:49:36 -04:00
embeddedt
ddffe93f1a
Stop clearing fields/methods on mixin classes
This seems to break generating the needed bridge access$xxx methods
for inner classes in mixins.

Example mixin that breaks: d5b3c910ac/common/src/main/java/com/railwayteam/railways/mixin/client/MixinStationScreen.java
2024-03-29 10:49:36 -04:00
embeddedt
95cd576c68
Merge 1.20 into 1.20.4 2024-03-27 12:15:14 -04:00
embeddedt
8a247bd8aa
Merge 1.19.2 into 1.20 2024-03-27 12:15:12 -04:00
embeddedt
a198bfaecd
Merge 1.18 into 1.19.2 2024-03-27 12:15:11 -04:00
embeddedt
c413a70c56
Merge 1.16 into 1.18 2024-03-27 12:15:09 -04:00
embeddedt
66abdcd9a7
Null-check config keybind 2024-03-27 12:14:58 -04:00
Marlester
1b52387cfa
Create de_de.json (#385) 2024-03-27 10:20:35 -04:00
embeddedt
e5e8e6d9b5
Merge remote-tracking branch 'origin/1.19.2' into 1.20 2024-03-26 10:04:59 -04:00
embeddedt
f7b4c786d7
Merge 1.18 into 1.19.2 2024-03-26 10:02:09 -04:00
embeddedt
3bf8255581
Merge 1.16 into 1.18 2024-03-26 10:02:08 -04:00
embeddedt
7e9ace3fc6
Fix optimized stitcher ignoring maximum atlas size 2024-03-26 10:02:04 -04:00
embeddedt
8fc9c0b3c1
Merge 1.20 into 1.20.4 2024-03-22 14:11:05 -04:00
embeddedt
fe3de55409
Merge 1.19.2 into 1.20 2024-03-22 14:11:03 -04:00
embeddedt
deb81ec6cd
Merge 1.18 into 1.19.2 2024-03-22 14:10:50 -04:00
embeddedt
b85f1341c1
Merge 1.16 into 1.18 2024-03-22 14:10:49 -04:00
embeddedt
d2680cf29d
Mark mixin as client-only 2024-03-22 14:10:42 -04:00
embeddedt
95a8e4fe21
Merge 1.20 into 1.20.4 2024-03-22 14:07:59 -04:00
embeddedt
ab077bc48f
Merge remote-tracking branch 'origin/1.19.2' into 1.20 2024-03-22 14:06:24 -04:00
embeddedt
884bdb0fe2
Merge 1.18 into 1.19.2 2024-03-22 14:05:15 -04:00
embeddedt
f63d82ce9b
Merge 1.16 into 1.18 2024-03-22 14:05:13 -04:00
embeddedt
4af1e27a89
Work around NPEs from early queries to ModelManager 2024-03-22 14:05:10 -04:00
embeddedt
add7dd4609
Deholderize item mesher mixin 2024-03-21 14:14:35 -04:00
embeddedt
827550e8af
Update CTM integration for 1.20.4
Requires https://github.com/Chisel-Team/ConnectedTexturesMod/pull/229 to be built from source
2024-03-21 14:10:56 -04:00
embeddedt
9d7ef772a0
Merge remote-tracking branch 'origin/1.20' into 1.20.4 2024-03-21 13:53:42 -04:00
embeddedt
3ad7a8ce9d
Merge 1.19.2 into 1.20 2024-03-20 21:38:15 -04:00
embeddedt
b916ef5ae9
Update mixin for 1.19 renames 2024-03-20 16:52:34 -04:00
embeddedt
9c2fbfcae6
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2024-03-20 16:45:55 -04:00
embeddedt
1814bd3e1f
Reduce overhead of the PotentialSpawns event 2024-03-20 16:39:24 -04:00
embeddedt
070b7b6d12
Add some simple patches to cut down allocation rate when ticking chunks 2024-03-20 15:44:28 -04:00
embeddedt
a0fdb3e6d7
Update for FML changes 2024-03-20 15:18:22 -04:00