Commit Graph

1389 Commits

Author SHA1 Message Date
embeddedt
4a0219e9da
Revert JiJ of fabric-model-loading-api-v1 2023-07-19 22:07:50 -04:00
embeddedt
b7a1f16a9d
Merge 1.19.4 into 1.20 2023-07-19 17:34:39 -04:00
embeddedt
5994edcf17
Merge 1.19.2 into 1.19.4 2023-07-19 17:34:38 -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
d69f5ac18d
Merge 1.19.4 into 1.20 2023-07-19 17:01:44 -04:00
embeddedt
72a45ef014
Synchronize outside of ModelBaker for FAPI compat 2023-07-19 17:01:10 -04:00
embeddedt
3162a531b7
Merge 1.19.4 into 1.20 2023-07-19 16:46:15 -04:00
embeddedt
02f6431109
Merge 1.19.2 into 1.19.4 2023-07-19 16:46:14 -04:00
embeddedt
af5ece3fe9
Merge 1.18 into 1.19.2 2023-07-19 16:46:13 -04:00
embeddedt
91980319d2
Merge 1.16 into 1.18 2023-07-19 16:46:13 -04:00
embeddedt
8383053b5c
Fix wall block deduplication crashing when invasive mods replace vanilla walls
Related: #168
2023-07-19 16:45:32 -04:00
embeddedt
7d7e2f029d
Merge 1.19.4 into 1.20 2023-07-19 12:39:52 -04:00
embeddedt
3827d8a5ce
Merge 1.19.2 into 1.19.4 2023-07-19 12:39:09 -04:00
embeddedt
2941f11c54
Revert resource loader JiJ on 1.19+ 2023-07-19 12:38:59 -04:00
embeddedt
9eed139cc9
Merge 1.19.4 into 1.20 2023-07-19 12:32:40 -04:00
embeddedt
ab55dde534
Merge 1.19.2 into 1.19.4 2023-07-19 12:32:39 -04:00
embeddedt
0bc372bf86
Merge 1.18 into 1.19.2 2023-07-19 12:32:38 -04:00
embeddedt
4c737e315e
Merge 1.16 into 1.18 2023-07-19 12:32:37 -04:00
embeddedt
d8e515272a
Even more resilient Night Config fix 2023-07-19 12:32:26 -04:00
embeddedt
30f483245c
Merge 1.19.4 into 1.20 2023-07-19 12:20:52 -04:00
embeddedt
8527594b3b
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-07-19 12:17:13 -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
d9b9586af3
Update item override patch to 1.18 2023-07-19 12:08:15 -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
e65f8fbb32
Add option to override overrides
Absolutely no support is guaranteed when this is used
2023-07-19 10:05:09 -04:00
embeddedt
5b716dcdf2
Merge 1.19.4 into 1.20 2023-07-18 13:57:31 -04:00
embeddedt
e88d8bb7b7
Merge 1.19.2 into 1.19.4 2023-07-18 13:57:30 -04:00
embeddedt
94433b0107
Merge 1.18 into 1.19.2 2023-07-18 13:57:29 -04:00
embeddedt
8ac43d5617
Fix incorrect import 2023-07-18 13:51:21 -04:00
embeddedt
90e63341bd
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-07-18 13:48:50 -04:00
embeddedt
36eb73b28e
Generify config patch to also work with Night Config Fixes mod 2023-07-18 13:48:20 -04:00
embeddedt
b499a054b9
Possible fix for the elusive Forge config corruption bug
Block file watcher from proceeding until config is done saving

Related: https://github.com/MinecraftForge/MinecraftForge/issues/9122
2023-07-18 12:44:11 -04:00
embeddedt
ed7bd69116
Merge branch 'dev/fabric-model-v1' into 1.20 2023-07-18 11:28:24 -04:00
embeddedt
e34beb5775
Merge 1.19.4 into 1.20 2023-07-17 16:09:27 -04:00
embeddedt
95c3044a40
Merge 1.19.2 into 1.19.4 2023-07-17 16:09:26 -04:00
embeddedt
ab7c982589
Merge 1.18 into 1.19.2 2023-07-17 16:08:28 -04:00
embeddedt
92643a244e
Merge 1.16 into 1.18 2023-07-17 16:08:27 -04:00
embeddedt
c3e3dff805
Return all possible states for model if given location is not an MRL 2023-07-17 16:07:51 -04:00
embeddedt
5ec070843d
Use CachedResourcePath in resource finder
Reduces memory usage by ~50%
2023-07-17 13:42:50 -04:00
embeddedt
9fbb97d0fa
Use Guava multimap for resource finder instead of custom "multi"map 2023-07-17 13:20:46 -04:00
embeddedt
c51b0585a2
Merge 1.19.4 into 1.20 2023-07-16 20:00:08 -04:00
embeddedt
2f7bd0e083
Merge 1.19.2 into 1.19.4 2023-07-16 20:00:07 -04:00
embeddedt
594c47f08b
Merge 1.18 into 1.19.2 2023-07-16 20:00:06 -04:00
embeddedt
94d5121a26
Merge 1.16 into 1.18 2023-07-16 20:00:06 -04:00
embeddedt
4f186c03f5
Filter valid paths using explicit joiner instead of Path.toString
to avoid issues on Windows
2023-07-16 19:59:22 -04:00