Commit Graph

56 Commits

Author SHA1 Message Date
embeddedt
1e77cccf5a
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-11 17:00:38 -04:00
embeddedt
d92e48e1aa
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-11 16:53:00 -04:00
embeddedt
0c82223248
Fix Custom Machinery models 2023-08-11 16:44:51 -04:00
embeddedt
1931101545
Merge 1.18 into 1.19.2 2023-08-05 12:52:04 -04:00
embeddedt
ae3eab8320
Merge 1.16 into 1.18 2023-08-05 12:52:03 -04:00
embeddedt
abb8cbd23f
Make sure missing model never becomes null 2023-08-05 12:26:18 -04:00
embeddedt
605058522e
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-05 12:11:30 -04:00
embeddedt
431231c4ee
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-05 12:10:53 -04:00
embeddedt
371e5119f1
Never return a non-null model if it was top level in vanilla 2023-08-05 12:07:21 -04:00
embeddedt
3456b8cf23
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-07-27 16:41:07 -04:00
embeddedt
f3f66e1873
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-07-27 16:35:06 -04:00
embeddedt
13cc103be2
Switch to compile-only Arch Transformer 2023-07-27 16:26:16 -04:00
embeddedt
bbcc58f103
Merge 1.18 into 1.19.2 2023-07-23 18:33:26 -04:00
embeddedt
0c3cade976
Merge 1.16 into 1.18 2023-07-23 18:33:25 -04:00
embeddedt
2246b79a85
Fix mod mixins not being disabled if there is an early load error 2023-07-23 18:32:50 -04:00
embeddedt
754e7741c7
Merge 1.18 into 1.19.2 2023-07-19 17:32:36 -04:00
embeddedt
4f428b0e5d
Merge 1.16 into 1.18 2023-07-19 17:32:18 -04:00
embeddedt
ad60b1dec6
Fix timing of dynamic baked model registry handoff 2023-07-19 17:31:24 -04:00
embeddedt
d1a1fce7e1
Improve reliability of ItemOverrideBakedModel if not replaced 2023-07-19 17:08:23 -04:00
embeddedt
12ec9b08bf
Update ItemOverrideBakedModel for 1.19 2023-07-19 12:15:29 -04:00
embeddedt
3fed2ef08d
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-07-19 12:09:39 -04:00
embeddedt
6fda7393b3
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-07-19 11:51:00 -04:00
embeddedt
ac436db456
Add support to dynamic resources for item overrides 2023-07-19 11:50:16 -04:00
embeddedt
09d24c542e
Merge 1.18 into 1.19.2 2023-07-15 15:07:17 -04:00
embeddedt
9fcc1f5dc2
Merge 1.16 into 1.18 2023-07-15 15:05:56 -04:00
embeddedt
dff181accb
Allow corrupt JSONs when scanning models for textures
Fixes Hexerei textures being missing on 1.18
2023-07-15 15:05:25 -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
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
bb0c4fdf54
Ignore RuntimeException when gathering blockstate paths 2023-07-08 14:51:07 -04:00
embeddedt
6020ff7ee1
Merge 1.18 into 1.19.2 2023-07-07 19:19:44 -04:00
embeddedt
1c0fca8f06 Spotless 2023-07-07 12:40:46 -04:00
embeddedt
cb55bd3612 Merge 1.18 into 1.19.2 2023-07-07 12:35:55 -04:00
embeddedt
79219d286f Fix issue with anonymous classes in mixin
Related: #151
2023-07-07 12:34:36 -04:00
embeddedt
5bd745a188
Merge 1.18 into 1.19.2 2023-06-21 21:43:29 -04:00
embeddedt
19c6687745
More aggressively load model files 2023-06-21 21:17:11 -04:00
embeddedt
931bf29c47
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-06-06 11:52:49 -04:00
embeddedt
b430b67052
Return missing model for null BlockState 2023-06-05 19:43:25 -04:00
embeddedt
d428f9c4c0
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-21 20:57:15 -04:00
embeddedt
962b843199
Avoid exposing mods to exceptions when baking models 2023-05-20 12:35:33 -04:00
embeddedt
985b5a68fe
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-08 14:24:27 -04:00
embeddedt
833fdc9ae5
Minor optimization when turning MRL into blockstate list 2023-05-08 14:22:50 -04:00
embeddedt
992269034d
Rewrite Fabric dynamic model loader to not load all models at startup 2023-05-08 14:10:54 -04:00
embeddedt
10c95c68d8
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-05 12:04:43 -04:00
embeddedt
367cc372c2
Workaround for runtime resource packs that aren't thread safe
Related: https://github.com/Fuzss/diagonalfences/issues/38
2023-05-05 11:27:07 -04:00
embeddedt
85442810f3
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-04 19:56:21 -04:00
embeddedt
8d7b351d53
Increase eviction time 2023-05-04 19:55:57 -04:00