Commit Graph

1222 Commits

Author SHA1 Message Date
embeddedt
b3f00a0681
Merge 1.19.4 into 1.20 2023-07-09 20:41:08 -04:00
embeddedt
8cc5785e86
Port dynres change to 1.19.4+ 2023-07-09 20:38:35 -04:00
embeddedt
827d09289d
Merge 1.19.4 into 1.20 2023-07-09 20:37:25 -04:00
embeddedt
0ce00531a6
Merge 1.19.2 into 1.19.4 2023-07-09 20:37:24 -04:00
embeddedt
4962d855af
Merge 1.18 into 1.19.2 2023-07-09 20:37:23 -04:00
embeddedt
ef47883262
Merge 1.16 into 1.18 2023-07-09 20:37:22 -04:00
embeddedt
dfdbf8544a
Guard against early parent resolution failing 2023-07-09 20:36:57 -04:00
embeddedt
7e25e31d33
Merge 1.19.4 into 1.20 2023-07-09 20:35:41 -04:00
embeddedt
a1d56e2921
Merge 1.19.2 into 1.19.4 2023-07-09 20:35:41 -04:00
embeddedt
a34ac84e00
Merge 1.18 into 1.19.2 2023-07-09 20:35:40 -04:00
embeddedt
e248e2966a
Merge 1.16 into 1.18 2023-07-09 20:35:39 -04:00
embeddedt
49b31c347b
Resolve parents in getModel rather than at bake time
Fixes EBE chests
2023-07-09 20:35:31 -04:00
embeddedt
f040f66bf9
Make backing maps in ItemProperties thread-safe
Helps prevent CMEs on Forge 1.16
2023-07-09 19:02:59 -04:00
embeddedt
6bc2b5b36e
Fix version autodetection when autoreleasing [skip ci] 2023-07-09 14:21:18 -04:00
embeddedt
540b19c141
Merge 1.19.4 into 1.20 2023-07-09 14:15:14 -04:00
embeddedt
aa493c41d5
Merge 1.19.2 into 1.19.4 2023-07-09 14:15:13 -04:00
embeddedt
637f844601
Merge 1.18 into 1.19.2 2023-07-09 14:15:12 -04:00
embeddedt
1815554070
Merge 1.16 into 1.18 2023-07-09 14:15:11 -04:00
embeddedt
5f255a83dc
Implement Map.replace on DynamicBakedModelProvider
Related: #154
2023-07-09 14:14:34 -04:00
embeddedt
05e66b2492
Merge 1.19.4 into 1.20 2023-07-09 13:32:49 -04:00
embeddedt
ae115c4908
Merge 1.19.2 into 1.19.4 2023-07-09 13:32:49 -04:00
embeddedt
28c456e4c5
Merge 1.18 into 1.19.2 2023-07-09 13:32:34 -04:00
embeddedt
2d12c6e282
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-07-09 13:31:01 -04:00
embeddedt
d987c1227b
Scan fallback resource managers as well as main resource manager
For buggy mods such as https://github.com/FoundationGames/EnhancedBlockEntities/issues/162
2023-07-09 13:27:18 -04:00
embeddedt
7d8dd5ab09
Merge 1.19.4 into 1.20 2023-07-08 14:52:16 -04:00
embeddedt
adfbc7508e
Merge 1.19.2 into 1.19.4 2023-07-08 14:52:16 -04:00
embeddedt
417eaa544f
Merge 1.18 into 1.19.2 2023-07-08 14:52:15 -04:00
embeddedt
a502a509ed
Merge 1.16 into 1.18 2023-07-08 14:51:43 -04:00
embeddedt
bb0c4fdf54
Ignore RuntimeException when gathering blockstate paths 2023-07-08 14:51:07 -04:00
embeddedt
1a7909aaa4
Merge 1.19.4 into 1.20 2023-07-07 21:06:48 -04:00
embeddedt
0fea79a647
Merge 1.19.2 into 1.19.4 2023-07-07 21:06:47 -04:00
embeddedt
ed2d01df4d
Merge 1.18 into 1.19.2 2023-07-07 21:06:46 -04:00
embeddedt
2e31a4e2c1
Merge 1.16 into 1.18 2023-07-07 21:06:45 -04:00
embeddedt
352f8bb6d1
Upload changelog to GitHub on release 2023-07-07 21:06:11 -04:00
embeddedt
e56898fff4
Merge 1.19.4 into 1.20 2023-07-07 20:23:42 -04:00
embeddedt
7671066548
Merge 1.19.2 into 1.19.4 2023-07-07 20:23:41 -04:00
embeddedt
87cd49a291
Merge 1.18 into 1.19.2 2023-07-07 20:23:40 -04:00
embeddedt
8fd31f3190
Merge 1.16 into 1.18 2023-07-07 20:23:39 -04:00
embeddedt
f3a2ca73e8
Log all option overrides once at startup rather than per mixin 2023-07-07 20:23:10 -04:00
embeddedt
f27d6e154c
Make disabling feature.measure_time also disable game/world load messages 2023-07-07 20:19:08 -04:00
embeddedt
60d06c92f6
Merge 1.19.4 into 1.20 2023-07-07 19:22:08 -04:00
embeddedt
f1cd8bac20
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-07-07 19:21:25 -04:00
embeddedt
6020ff7ee1
Merge 1.18 into 1.19.2 2023-07-07 19:19:44 -04:00
embeddedt
b99e253715
Merge 1.16 into 1.18 2023-07-07 19:19:43 -04:00
embeddedt
1c0fca8f06 Spotless 2023-07-07 12:40:46 -04:00
embeddedt
003cad94a0 Merge remote-tracking branch 'origin/1.16' into 1.18 2023-07-07 12:39:47 -04:00
embeddedt
98663fa416 Never replace search tree on 1.16 with REI present 2023-07-07 12:39:26 -04:00
embeddedt
cb55bd3612 Merge 1.18 into 1.19.2 2023-07-07 12:35:55 -04:00
embeddedt
2ec8a2719e Merge 1.16 into 1.18 2023-07-07 12:35:53 -04:00
embeddedt
79219d286f Fix issue with anonymous classes in mixin
Related: #151
2023-07-07 12:34:36 -04:00