embeddedt
|
0d190a4c80
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-08-02 16:17:45 -04:00 |
|
embeddedt
|
201db412a4
|
Rewrite tracking code for game load/world join timing
|
2023-08-02 16:08:36 -04:00 |
|
embeddedt
|
84bd756cdf
|
Merge 1.19.4 into 1.20
|
2023-07-30 13:11:12 -04:00 |
|
embeddedt
|
94f7b9295d
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-07-30 12:59:23 -04:00 |
|
embeddedt
|
78ff767b9e
|
Merge 1.18 into 1.19.2
|
2023-07-30 12:57:40 -04:00 |
|
embeddedt
|
762728c0a6
|
Merge 1.16 into 1.18
|
2023-07-30 12:57:39 -04:00 |
|
embeddedt
|
377f59847e
|
Skip dynamic resources single blockstate optimization when outside world
This should improve performance of model baking events during launch
|
2023-07-30 12:57:11 -04:00 |
|
embeddedt
|
51bf5890d3
|
Merge 1.19.4 into 1.20
|
2023-07-28 16:09:27 -04:00 |
|
embeddedt
|
23e768d629
|
Spotless
|
2023-07-28 16:09:21 -04:00 |
|
embeddedt
|
e1fdca5f41
|
Merge 1.19.4 into 1.20
|
2023-07-28 16:07:14 -04:00 |
|
embeddedt
|
d3ff2823dc
|
Update blockstate caching logic for vanilla 1.19.4 changes
|
2023-07-28 16:05:21 -04:00 |
|
embeddedt
|
4e3dc99479
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-07-27 16:49:05 -04:00 |
|
embeddedt
|
e45acac6b6
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-07-27 16:48:48 -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
|
36ae73316a
|
Merge 1.19.4 into 1.20
|
2023-07-27 12:41:43 -04:00 |
|
embeddedt
|
a467d853b0
|
Rip out wasMissingModel flag, causes more issues than it solves
Logic will be reintroduced later to emulate nullness if Fabric mods
need it
|
2023-07-27 12:39:26 -04:00 |
|
embeddedt
|
1889ef2d8c
|
Merge 1.19.4 into 1.20
|
2023-07-23 19:23:27 -04:00 |
|
embeddedt
|
3a96f63798
|
Merge 1.19.2 into 1.19.4
|
2023-07-23 19:23:26 -04:00 |
|
embeddedt
|
18db311712
|
Merge 1.18 into 1.19.2
|
2023-07-23 19:23:26 -04:00 |
|
embeddedt
|
000e9746ba
|
Merge 1.16 into 1.18
|
2023-07-23 19:23:25 -04:00 |
|
embeddedt
|
7fa6c45f07
|
Fix dragging in ModLoader too early
|
2023-07-23 19:21:00 -04:00 |
|
embeddedt
|
5ed2faebc4
|
Merge 1.19.4 into 1.20
|
2023-07-20 10:43:40 -04:00 |
|
embeddedt
|
0767b6e9cf
|
Fix incorrect field being used for pre-bake event
|
2023-07-20 10:43:23 -04:00 |
|
embeddedt
|
63111ed938
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-07-19 22:15:40 -04:00 |
|
embeddedt
|
42298947cc
|
Backport model loading API change to 1.19.4
|
2023-07-19 22:15:16 -04:00 |
|
embeddedt
|
427a92f0f3
|
Stop JiJing fabric-models-v0
|
2023-07-19 22:10:38 -04:00 |
|
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
|
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
|
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
|
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
|
ed7bd69116
|
Merge branch 'dev/fabric-model-v1' into 1.20
|
2023-07-18 11:28:24 -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
|
c4abe1cf05
|
Merge 1.18 into 1.19.2
|
2023-07-15 21:32:20 -04:00 |
|
embeddedt
|
6f710f1f6b
|
Merge 1.16 into 1.18
|
2023-07-15 21:32:20 -04:00 |
|
embeddedt
|
33d27ff04b
|
Fix memory leak on Fabric from models being saved to the vanilla map
|
2023-07-15 21:32:02 -04:00 |
|
embeddedt
|
40ec3f14bf
|
Do not run Decorative Blocks fix without Decorative Blocks installed
🤦♂️
|
2023-07-13 14:58:19 -04:00 |
|
embeddedt
|
ad1df59c18
|
Update
|
2023-07-13 11:52:23 -04:00 |
|
embeddedt
|
804cd04778
|
Explicitly depend on fabric-model-loading-api-v1 so it gets JiJed
|
2023-07-12 20:37:53 -04:00 |
|
embeddedt
|
083664d858
|
Support the new Fabric Model Loading API v1
|
2023-07-12 20:13:50 -04:00 |
|
embeddedt
|
a189927b22
|
Fix Decorative Blocks keybind being unconfigurable
|
2023-07-09 21:17:37 -04:00 |
|
embeddedt
|
8cc5785e86
|
Port dynres change to 1.19.4+
|
2023-07-09 20:38:35 -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
|
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
|
29f7badbfb
|
Update test to reflect Mojang changes [skip ci]
|
2023-07-06 22:10:16 -04:00 |
|
embeddedt
|
92264ed37e
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-07-06 21:27:43 -04:00 |
|
embeddedt
|
9ce029b35d
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-07-06 21:24:11 -04:00 |
|
embeddedt
|
127f091728
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-07-06 21:14:44 -04:00 |
|
embeddedt
|
db4f6738ee
|
Credit AE2 for JUnit bootstrap extension design
|
2023-07-06 19:35:36 -04:00 |
|
embeddedt
|
ff39e9022b
|
Get testing working, add tests for blockstate cache rebuilds
|
2023-07-06 19:26:44 -04:00 |
|
embeddedt
|
582f17c0e7
|
Update Loom to prepare for unit tests
|
2023-07-06 14:42:51 -04:00 |
|
embeddedt
|
41a56fba20
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-07-05 12:35:41 -04:00 |
|
embeddedt
|
1600dc4f84
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-07-05 12:26:14 -04:00 |
|
embeddedt
|
46cff62796
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-07-05 12:18:00 -04:00 |
|
embeddedt
|
0a2601257c
|
Fix dynamic resources losing nested model loads sometimes
|
2023-07-05 12:04:10 -04:00 |
|
embeddedt
|
cc89986a94
|
Merge 1.18 into 1.19.2
|
2023-07-03 15:10:38 -04:00 |
|
embeddedt
|
5a0c286ff4
|
Merge 1.16 into 1.18
|
2023-07-03 15:10:38 -04:00 |
|
embeddedt
|
dd4a72a6f9
|
Tweak dynamic resources model baking override point on Fabric
Related: #120
|
2023-07-03 15:10:05 -04:00 |
|
embeddedt
|
922d0f26e1
|
Use same merge mode as default Spark
|
2023-06-27 11:01:17 -04:00 |
|
embeddedt
|
84b08ef64a
|
Merge 1.19.2 into 1.19.4
|
2023-06-26 21:26:27 -04:00 |
|
embeddedt
|
bd3a9eb345
|
Merge 1.18 into 1.19.2
|
2023-06-26 21:26:26 -04:00 |
|
embeddedt
|
a937ccb07c
|
Merge 1.16 into 1.18
|
2023-06-26 21:26:01 -04:00 |
|
embeddedt
|
58eaf44d89
|
Make mixin info clearing work on Fabric
|
2023-06-26 21:15:19 -04:00 |
|
embeddedt
|
370a0fad11
|
Merge 1.19.2 into 1.19.4
|
2023-06-26 19:46:09 -04:00 |
|
embeddedt
|
ec49868d27
|
Merge 1.18 into 1.19.2
|
2023-06-26 19:46:08 -04:00 |
|
embeddedt
|
25d1956da0
|
Merge 1.16 into 1.18
|
2023-06-26 19:46:07 -04:00 |
|
embeddedt
|
e3944d7879
|
Add option to aggressively clear Fabric mapping tables
|
2023-06-26 19:43:53 -04:00 |
|
embeddedt
|
04c6ea2e66
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-06-26 14:33:12 -04:00 |
|
embeddedt
|
b6182b4913
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-06-26 14:30:23 -04:00 |
|
embeddedt
|
a01cc836c1
|
Use correct platform name
|
2023-06-26 14:22:34 -04:00 |
|
embeddedt
|
012ed17208
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-06-26 14:21:19 -04:00 |
|
embeddedt
|
4943702061
|
Add platform name to hooks
|
2023-06-26 14:21:07 -04:00 |
|
embeddedt
|
33c0cf33d9
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-06-26 14:14:35 -04:00 |
|
embeddedt
|
60525ad594
|
Add option to profile launch using Spark
|
2023-06-26 13:58:12 -04:00 |
|
embeddedt
|
c23a4be440
|
Merge 1.19.2 into 1.19.4
|
2023-06-26 12:59:34 -04:00 |
|
embeddedt
|
f89b5d0a34
|
Merge 1.18 into 1.19.2
|
2023-06-26 12:59:33 -04:00 |
|
embeddedt
|
2ffb31f00d
|
Merge 1.16 into 1.18
|
2023-06-26 12:59:32 -04:00 |
|
embeddedt
|
bac13236e7
|
Use WeakReference for server variable but never clear it for better mod compat
|
2023-06-26 12:58:03 -04:00 |
|
embeddedt
|
0765b6770f
|
Fix creative search tab not having a populator registered on Fabric
|
2023-06-13 17:40:40 -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 |
|