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
|
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
|
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
|
ff39e9022b
|
Get testing working, add tests for blockstate cache rebuilds
|
2023-07-06 19:26:44 -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 |
|
embeddedt
|
22c52171d9
|
Merge 1.18 into 1.19.2
|
2023-06-11 20:43:21 -04:00 |
|
embeddedt
|
cff1363050
|
Merge 1.16 into 1.18
|
2023-06-11 20:43:20 -04:00 |
|
embeddedt
|
02a68f7689
|
Fix Wizards spell textures being missing
|
2023-06-11 20:06:42 -04:00 |
|
embeddedt
|
755bc35d09
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-06-07 11:45:27 -04:00 |
|
embeddedt
|
313981f30e
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-06-06 11:49:01 -04:00 |
|
embeddedt
|
4d54c624e1
|
Avoid CME during Indigo model bake on Fabric
|
2023-06-05 21:55:16 -04:00 |
|
embeddedt
|
830eb19420
|
Hopefully final fix for the 1.19.4 "missing model" bug on Fabric
|
2023-05-30 11:18:27 -04:00 |
|
embeddedt
|
4a9cd78d1d
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-05-29 20:39:14 -04:00 |
|
embeddedt
|
f4b2db89ec
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-27 10:28:35 -04:00 |
|
embeddedt
|
5a09f27c6a
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-27 10:28:00 -04:00 |
|
embeddedt
|
214b39ce8f
|
Fixes for LBG+Diagonal Fences together
|
2023-05-23 21:02:27 -04:00 |
|
embeddedt
|
a327b460bb
|
Tweak dynamic texture mixin
|
2023-05-23 20:30:22 -04:00 |
|
embeddedt
|
74eb8a0619
|
Split unbaked model load event into load and pre-bake stages
Allows mods like Continuity to wrap the model being baked
separately from the model in the cache
|
2023-05-23 18:50:49 -04:00 |
|
embeddedt
|
31feef398f
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-05-22 14:24:27 -04:00 |
|
embeddedt
|
61eca643d4
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-21 22:14:48 -04:00 |
|
embeddedt
|
b6a0767d03
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-21 22:14:36 -04:00 |
|
embeddedt
|
91c2d50d97
|
Add more texture paths
|
2023-05-21 22:14:17 -04:00 |
|
embeddedt
|
d428f9c4c0
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-21 20:57:15 -04:00 |
|
embeddedt
|
09b4021e23
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-21 20:25:59 -04:00 |
|
embeddedt
|
cfd542623c
|
Fire model integrations on Fabric
|
2023-05-21 20:24:28 -04:00 |
|
embeddedt
|
7517c36b36
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-21 19:17:39 -04:00 |
|
embeddedt
|
98da673cbe
|
Tweak point at which dummy models are cleared on Fabric
|
2023-05-21 17:04:22 -04:00 |
|
embeddedt
|
119f9ec6dd
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-05-16 11:11:00 -04:00 |
|
embeddedt
|
b1fb365f22
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-05-15 11:14:20 -04:00 |
|
embeddedt
|
fc69d55314
|
Fix compile error
|
2023-05-15 11:11:09 -04:00 |
|
embeddedt
|
33d7b6f67b
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-14 19:26:03 -04:00 |
|
embeddedt
|
b4ffe68adb
|
Replace Forge dynamic model bake event with modloader-independent custom solution
|
2023-05-13 16:37:20 -04:00 |
|
embeddedt
|
a1f50a0c4f
|
Fix missing model flag not being cleared at times
|
2023-05-12 10:52:18 -04:00 |
|
embeddedt
|
5e4b08a8f5
|
Add support for Fabric datagen from runClient
|
2023-05-11 14:14:56 -04:00 |
|
embeddedt
|
9c421218b8
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-05-11 10:51:34 -04:00 |
|
embeddedt
|
2de8f02814
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-11 10:39:33 -04:00 |
|
embeddedt
|
9efbc47f78
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-11 10:37:59 -04:00 |
|
embeddedt
|
d427c5e050
|
Invalidate pack caches directly instead of iterating resource manager pack list
|
2023-05-10 18:12:32 -04:00 |
|
embeddedt
|
dffb89390e
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-10 18:07:50 -04:00 |
|
embeddedt
|
d97da8fe4c
|
Fix resource pack cache not invalidating on F3+T
|
2023-05-10 17:02:15 -04:00 |
|
embeddedt
|
127a85ea89
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-08 20:17:29 -04:00 |
|
embeddedt
|
dc8c9832d2
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-08 20:16:44 -04:00 |
|
embeddedt
|
d70480eb17
|
More Fabric dynamic model loading improvements
|
2023-05-08 20:16:24 -04:00 |
|
embeddedt
|
dcd30d34da
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-08 18:05:08 -04:00 |
|
embeddedt
|
0a5ca4fcf4
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-08 18:04:44 -04:00 |
|
embeddedt
|
9d4d1cc9b4
|
Add more paths to texture search
|
2023-05-08 18:04:23 -04:00 |
|
embeddedt
|
78da1157ab
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-08 14:55:42 -04:00 |
|
embeddedt
|
21a9266c8f
|
Update patch for 1.19
|
2023-05-08 14:54:31 -04:00 |
|
embeddedt
|
e724cbfa63
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-08 14:53:38 -04:00 |
|
embeddedt
|
656f3924da
|
Avoid running Fabric loading hook except for extra models
|
2023-05-08 14:53:23 -04:00 |
|
embeddedt
|
985b5a68fe
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-08 14:24:27 -04:00 |
|
embeddedt
|
41fa422160
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-08 14:15:33 -04:00 |
|
embeddedt
|
85025b77fb
|
Set the missing model early if needed
|
2023-05-08 14:15:22 -04:00 |
|
embeddedt
|
5b57b238c3
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-08 14:14:37 -04:00 |
|
embeddedt
|
c420c63ab1
|
Handle bakedTopLevelModels not being a dynamic provider yet
|
2023-05-08 14:14:20 -04:00 |
|
embeddedt
|
4a47ed7f43
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-08 14:11:15 -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
|
95ee0c60ca
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-05-05 10:53:30 -04:00 |
|
embeddedt
|
85442810f3
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-04 19:56:21 -04:00 |
|
embeddedt
|
da100bea60
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-04 19:54:35 -04:00 |
|
embeddedt
|
b077b53132
|
Bump maximum models in memory from 1k to 10k
|
2023-05-04 19:53:39 -04:00 |
|
embeddedt
|
0833d4dd56
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-04 17:06:34 -04:00 |
|
embeddedt
|
50d02a8058
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-04 16:10:35 -04:00 |
|
embeddedt
|
2b8fc0827c
|
Bake non-vanilla models on Fabric and then throw away the cache
|
2023-05-04 15:55:52 -04:00 |
|
embeddedt
|
1fbf83c562
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-05-04 10:22:23 -04:00 |
|
embeddedt
|
b3da731e1f
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-04 10:18:45 -04:00 |
|
embeddedt
|
26bc9514d7
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-04 10:15:26 -04:00 |
|
embeddedt
|
8b9d3cab18
|
Add Mod Menu compatibility
|
2023-05-04 10:08:58 -04:00 |
|
embeddedt
|
65f151bbef
|
Actually cache item models
|
2023-05-03 21:40:57 -04:00 |
|
embeddedt
|
545c68f122
|
Rewrite 1.19.4 Fabric model baker mixin for compatibility purposes
|
2023-05-03 19:59:48 -04:00 |
|
embeddedt
|
d4bfe17a72
|
Tweak Fabric model bakery to run more vanilla code
|
2023-05-03 19:23:43 -04:00 |
|
embeddedt
|
d658c18566
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-03 10:38:33 -04:00 |
|
embeddedt
|
ac97dfd8c4
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-03 10:37:11 -04:00 |
|
embeddedt
|
9d7f897dae
|
Get Continuity working on Fabric
|
2023-05-03 10:32:32 -04:00 |
|
embeddedt
|
f1cdbc339b
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-03 10:17:41 -04:00 |
|
embeddedt
|
1b10ed3f66
|
Keep custom models loaded permanently on Fabric
|
2023-05-03 10:14:43 -04:00 |
|
embeddedt
|
ae33070507
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-05-02 20:24:48 -04:00 |
|
embeddedt
|
e1b29f2985
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-02 20:20:12 -04:00 |
|
embeddedt
|
2772351a3d
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-02 20:10:40 -04:00 |
|
embeddedt
|
6a85047132
|
Add structure upgrading command
|
2023-05-02 20:04:54 -04:00 |
|
embeddedt
|
09c5cdb6a2
|
Drop resource pack mixin from 1.19.4 for now
|
2023-05-02 15:33:32 -04:00 |
|
embeddedt
|
cae1026fee
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-05-02 15:32:54 -04:00 |
|
embeddedt
|
393a834891
|
Update resource pack mixin
|
2023-05-02 15:02:42 -04:00 |
|
embeddedt
|
260d2a5f42
|
Merge remote-tracking branch 'origin/main' into 1.19.2
|
2023-05-02 14:58:14 -04:00 |
|
embeddedt
|
f9ff9eb6fb
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-02 14:57:48 -04:00 |
|
embeddedt
|
fb2929215f
|
Update
|
2023-05-02 14:57:35 -04:00 |
|
embeddedt
|
f7d247fb2c
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-02 14:53:09 -04:00 |
|
embeddedt
|
3db4e9071f
|
Update resource pack mixin
|
2023-05-02 14:52:21 -04:00 |
|
embeddedt
|
6ec46aec1f
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-02 14:45:19 -04:00 |
|
embeddedt
|
f274dc1f5f
|
Add resource caching to Fabric
|
2023-05-02 14:44:48 -04:00 |
|
embeddedt
|
4d91bde49c
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-02 14:16:56 -04:00 |
|
embeddedt
|
dbb28788d9
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-02 14:14:03 -04:00 |
|
embeddedt
|
a1246358ba
|
Load all models initially on Fabric for texture scanning
|
2023-05-02 14:13:35 -04:00 |
|
embeddedt
|
5edbe16e18
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-05-02 10:29:00 -04:00 |
|
embeddedt
|
8a06ef1322
|
Fix model bakery issues
|
2023-05-02 10:07:19 -04:00 |
|
embeddedt
|
0568c8f841
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-02 10:06:21 -04:00 |
|
embeddedt
|
0ad8c85cc4
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-02 10:05:34 -04:00 |
|
embeddedt
|
c415549f4e
|
Adjust Fabric model bakery mixin for compatibility
|
2023-05-02 08:26:45 -04:00 |
|
embeddedt
|
0de67936c1
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-05-01 21:30:01 -04:00 |
|