Commit Graph

120 Commits

Author SHA1 Message Date
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
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
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
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
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
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
931bf29c47
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-06-06 11:52:49 -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
3996804e71
Merge remote-tracking branch 'origin/main' into 1.18 2023-06-05 19:46:52 -04:00
embeddedt
54759008e5
Allow Fabric version to run on >=1.16.2 2023-06-03 20:01:34 -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
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
8ee985928e
Add JEI plugin to fabric.mod.json 2023-05-15 21:27:05 -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