Commit Graph

404 Commits

Author SHA1 Message Date
embeddedt
5a09f27c6a
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-27 10:28:00 -04:00
embeddedt
c4a50bb6e2
Replace default backing map of NBT tags in more compatible way
Related: #111
2023-05-27 10:12:05 -04:00
embeddedt
b5d62b4bbb
Add off-by-default feature to automatically thread dump every 60 seconds 2023-05-26 11:55:57 -04:00
embeddedt
a327b460bb
Tweak dynamic texture mixin 2023-05-23 20:30:22 -04:00
embeddedt
ddf2fc5a74
Provide more useful information if the image used in DynamicTexture is null 2023-05-23 19:29:24 -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
2bd2fd7ef7
Only inject integration first time 2023-05-23 16:38:34 -04:00
embeddedt
baca029fd0
Add support for Diagonal Fences 2023-05-23 14:59:46 -04:00
embeddedt
0f180ff979
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-23 14:50:41 -04:00
embeddedt
86e748dd93
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-23 14:47:48 -04:00
embeddedt
be4c8607d4
Disable faster texture loader if Changed:MC is installed
Related: #108
2023-05-23 11:53:28 -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
49a8f72151
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-22 13:50:27 -04:00
embeddedt
675e3bb08b
Fix startup crash introduced in last commit 2023-05-22 13:49:08 -04:00
embeddedt
aae4db7ebf
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-22 13:27:20 -04:00
embeddedt
80617c24f1
Work around KeyMapping names being retrieved off-thread 2023-05-22 13:25:14 -04:00
embeddedt
d428f9c4c0
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-21 20:57:15 -04:00
embeddedt
f48ed1212b
Move AE2 dynamic resources compat to common module 2023-05-21 20:17:38 -04:00
embeddedt
117febba6d
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-21 20:08:28 -04:00
embeddedt
7517c36b36
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-21 19:17:39 -04:00
embeddedt
0a035b6e0d
Back client integration list with COW arraylist 2023-05-21 17:11:51 -04:00
embeddedt
c2f09fb998
Merge branch 'mod-api' 2023-05-21 15:24:46 -04:00
embeddedt
bb6d498d58
Disable faster_texture_loading and faster_texture_stitching when Opticrash is present
Fixes #91
2023-05-21 14:11:05 -04:00
embeddedt
d5bd392cff
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-20 12:37:04 -04:00
embeddedt
962b843199
Avoid exposing mods to exceptions when baking models 2023-05-20 12:35:33 -04:00
embeddedt
4cccd8f6d9
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-17 17:46:31 -04:00
embeddedt
bd1182ab39
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-17 17:45:49 -04:00
embeddedt
a25252714d
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-17 17:12:19 -04:00
embeddedt
c51d7ae641
Use half fix for packet leak 2023-05-17 16:51:56 -04:00
embeddedt
0d4a12eafe
Revert "Hopefully more stable version of the original packet fix"
This reverts commit b21ee9a7e7.
2023-05-17 16:51:25 -04:00
embeddedt
f67fa07546
Synchronize LivingEntityRenderer layer list
Related: #102
2023-05-17 16:50:08 -04:00
embeddedt
adbf61a06b
1.20-pre2 2023-05-16 11:27:08 -04:00
embeddedt
b44739e33c
Merge remote-tracking branch 'origin/1.19.4' into 1.20 2023-05-16 11:21:43 -04:00
embeddedt
340b026951
Remove unneeded imports 2023-05-16 11:21:34 -04:00
embeddedt
30bf3afc1d
Merge remote-tracking branch 'origin/1.19.4' into 1.20 2023-05-16 11:18:10 -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
3a24d094c9
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-16 11:01:46 -04:00
embeddedt
b25234e431
Fix search tree provider crash 2023-05-16 10:16:32 -04:00
embeddedt
f633d9b3bf
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-15 22:21:02 -04:00
embeddedt
4fa0602af9
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-15 22:20:25 -04:00
embeddedt
f22dbf5df1
Use less invasive mixin on Blocks.rebuildCache()
Related: #99
2023-05-15 22:19:54 -04:00
embeddedt
98def7b879
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-15 21:23:01 -04:00
embeddedt
6f8815200e
Move search tree replacement to common module 2023-05-15 21:05:01 -04:00
embeddedt
32c1baf887
Move search tree replacement to common, support both modloaders 2023-05-15 20:23:37 -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
ee3f29c569
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-15 11:09:39 -04:00
embeddedt
f599acda6b
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-15 11:07:31 -04:00
embeddedt
c1c9c02ff4
Remove blockstate compression 2023-05-14 20:27:37 -04:00
embeddedt
b21ee9a7e7
Hopefully more stable version of the original packet fix 2023-05-14 19:59:39 -04:00
embeddedt
0f2764b79d
Revert "Fix incorrect logic in packet leak patch"
This reverts commit 45d308c6a4.
2023-05-14 19:48:57 -04:00
embeddedt
8510d648aa
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-14 19:34:32 -04:00
embeddedt
9ca4961841
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-14 19:25:48 -04:00
embeddedt
eb925bc3ba
Fix performance issue when loading large NBT maps
Array map was not being changed to hash map until AFTER the insertions,
which is bad
2023-05-14 19:24:56 -04:00
embeddedt
a7e64f2947
Fix performance issue when loading large NBT maps
Array map was not being changed to hash map until AFTER the insertions,
which is bad
2023-05-14 19:23:36 -04:00
embeddedt
b4ffe68adb
Replace Forge dynamic model bake event with modloader-independent custom solution 2023-05-13 16:37:20 -04:00
embeddedt
45d308c6a4
Fix incorrect logic in packet leak patch
Related: #97
2023-05-13 09:36:34 -04:00
embeddedt
57947441ce
Spotless 2023-05-11 11:33:32 -04:00
embeddedt
f1515c5063
1.20-pre1 2023-05-11 11:27:22 -04:00
embeddedt
05b28b8269
Fix spotless error 2023-05-11 11:01:49 -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
6eddbd1ecf
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-10 11:45:41 -04:00
embeddedt
6bda05a5fc
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-10 11:44:10 -04:00
embeddedt
1f16fc0204
Move iteration later in texture atlas patch 2023-05-10 11:42:16 -04:00
embeddedt
8c278d6555
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-10 09:56:43 -04:00
embeddedt
bc493d624f
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-10 09:56:23 -04:00
embeddedt
bcb33a1018
Shorten structure hashes to fix issues on Windows 2023-05-10 09:54:14 -04:00
embeddedt
03abdfdc49
Optimize server thread aliveness check 2023-05-09 16:52:10 -04:00
embeddedt
ed65d5da44
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-08 19:20:43 -04:00
embeddedt
b13d0a222b
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-08 19:20:00 -04:00
embeddedt
d33ebd69e8
Fix texture reload failing on second try 2023-05-08 19:17:00 -04:00
embeddedt
9879420d31
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-08 16:39:53 -04:00
embeddedt
1639f4297e
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-08 16:39:38 -04:00
embeddedt
9e44e00e70
Fix Continuity emissives 2023-05-08 16:39:01 -04:00
embeddedt
33f689ba9a
Make RenderType EqualsStrategy more predictable 2023-05-08 16:15:15 -04:00
embeddedt
fe7357bca2
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-08 15:50:11 -04:00
embeddedt
3e17d24250
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-08 15:50:02 -04:00
embeddedt
cd2f289ea8
Disable faster texture loading when Stitch is present 2023-05-08 15:49:47 -04:00
embeddedt
28bbb79e60
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-08 15:38:49 -04:00
embeddedt
6c896c36bf
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-08 15:38:30 -04:00
embeddedt
5ee4c636e7
Adjust faster texture loading for FAPI compat 2023-05-08 15:38:16 -04:00
embeddedt
c4ee1dd522
Update incompatible mod disabling list 2023-05-08 15:06:15 -04:00
embeddedt
985b5a68fe
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-08 14:24:27 -04:00
embeddedt
f6bcb8d1ab
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-08 14:24:22 -04:00
embeddedt
833fdc9ae5
Minor optimization when turning MRL into blockstate list 2023-05-08 14:22:50 -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
b89e7639cd
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-08 10:42:36 -04:00
embeddedt
c8c7d3ef2e
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-08 10:42:28 -04:00
embeddedt
9e7c82a303
Disable datapack_reload_exceptions if Cyanide is installed as it overlaps 2023-05-08 10:41:53 -04:00
embeddedt
1760041e56
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-08 10:18:59 -04:00
embeddedt
4239bb325d
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-08 10:18:33 -04:00
embeddedt
b955f17fbd
Do resource cache generation on-thread, but lazily
Apparently ForkJoinPools can deadlock even though they are not
supposed to
2023-05-08 10:17:24 -04:00
embeddedt
8e4bbeff28
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-08 09:59:20 -04:00
embeddedt
cc9e7289c6
Fix compile error 2023-05-08 09:59:05 -04:00
embeddedt
6a8c7c10a6
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-08 09:58:29 -04:00
embeddedt
2f8f47ae3e
Ensure the context class loader is set for the resource reload executors 2023-05-08 09:57:53 -04:00
embeddedt
60140bdc1e
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-08 09:25:55 -04:00
embeddedt
558ced7497
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-08 09:25:51 -04:00
embeddedt
d8d76c00c7
Hotfix for another potential race condition 2023-05-08 09:25:40 -04:00
embeddedt
403e820f55
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-08 09:05:14 -04:00
embeddedt
d681fbd507
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-08 09:05:00 -04:00
embeddedt
530fb5f796
Hotfix for potential resource reload race condition 2023-05-08 09:04:43 -04:00
embeddedt
bcb1f5db6c
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-07 21:45:23 -04:00
embeddedt
20b85f7567
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-07 21:45:18 -04:00
embeddedt
387e48cca8
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-07 21:44:31 -04:00
embeddedt
43c1ed7029
Disable faster item rendering by default until its tested more 2023-05-07 21:39:25 -04:00
embeddedt
ad0c6b7a55
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-07 21:15:35 -04:00
embeddedt
604c3687ef
Optimize block item rendering as well 2023-05-07 21:07:56 -04:00
embeddedt
b55129a8ca
Generate resource cache using resource reload workers 2023-05-07 18:08:00 -04:00
embeddedt
92c136d4c3
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-07 14:40:28 -04:00
embeddedt
321c676fd0
Disable dynamic entity renderers by default due to incompatible mods 2023-05-07 14:39:55 -04:00
embeddedt
1aa582383c
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-07 14:39:44 -04:00
embeddedt
65e12016b6
Add config for integrated server watchdog 2023-05-07 14:07:17 -04:00
embeddedt
3ba38b602a
Remove nonexistent mixin configs 2023-05-07 13:57:52 -04:00
embeddedt
a1cdf756ab
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-06 17:06:04 -04:00
embeddedt
c30574c3d0
Only apply item rendering optimization outside of level rendering 2023-05-06 16:40:49 -04:00
embeddedt
c229b1c60c
Update item renderer mixin for 1.19.4 2023-05-06 16:18:47 -04:00
embeddedt
422b6d56f7
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-06 16:07:10 -04:00
embeddedt
e84360efe9
Update item rendering patch for 1.19.2 2023-05-06 15:33:25 -04:00
embeddedt
44882e5418
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-06 15:27:22 -04:00
embeddedt
a2568c486e
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-06 15:22:06 -04:00
embeddedt
53cf31fe15
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-06 15:21:58 -04:00
embeddedt
deac0b43d1
Optimize rendering of simple items in GUIs 2023-05-06 15:20:40 -04:00
embeddedt
2e669761bd
Remove unnecessary injected field on BlockState 2023-05-06 12:57:15 -04:00
embeddedt
7eb702545b
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-06 11:46:15 -04:00
embeddedt
a139b273c9
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-06 11:45:06 -04:00
embeddedt
d4fec79e55
Change texture loading mixin priority to prevent FAPI conflicts 2023-05-06 11:43:11 -04:00
embeddedt
74c2c28a66
Avoid hard crash if AT fails to apply 2023-05-06 11:17:46 -04:00
embeddedt
10c95c68d8
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-05 12:04:43 -04:00
embeddedt
3b4354fbe5
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-05 12:03:15 -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
95ee0c60ca
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-05 10:53:30 -04:00
embeddedt
1f4e45eca6
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-05 10:50:34 -04:00
embeddedt
b80afc2c79
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-05 10:47:15 -04:00
embeddedt
9455b5628e
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-05 10:46:47 -04:00
embeddedt
cc36e0c3f1
Ensure Lithium's cache fields get generated
Fixes #74
2023-05-05 10:45:59 -04:00
embeddedt
12623012ed
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-05 09:52:34 -04:00
embeddedt
3f82c7459a
Fix crash with Charm 2023-05-05 09:51:46 -04:00
embeddedt
385d12e159
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-05 09:44:15 -04:00
embeddedt
2cdc8b88a5
Make block model cache overridable for even more invasive mods 2023-05-05 09:38:36 -04:00
embeddedt
e6f30956db
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-04 22:01:11 -04:00
embeddedt
b744cc7452
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-04 21:55:48 -04:00
embeddedt
77e2175123
Fix material cache on Fabric
Fixes #72
2023-05-04 21:54:57 -04:00
embeddedt
85442810f3
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-04 19:56:21 -04:00
embeddedt
74007827f9
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-04 19:56:13 -04:00
embeddedt
8d7b351d53
Increase eviction time 2023-05-04 19:55:57 -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
1fa039d331
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-04 17:05:47 -04:00
embeddedt
6c56096556
Emulate the vanilla block/item -> model maps for Fabric mods 2023-05-04 17:05:02 -04:00
embeddedt
50d02a8058
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-04 16:10:35 -04:00
embeddedt
170da33755
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-04 11:47:58 -04:00
embeddedt
05901b4514
Clearer message 2023-05-04 11:43:06 -04:00
embeddedt
270fec309e
Complain once per mod ID if an outdated structure is found 2023-05-04 11:42:25 -04:00
embeddedt
912a8f9f2c
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-04 11:17:44 -04:00
embeddedt
7e7f336ccb
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-04 11:17:23 -04:00
embeddedt
4796af2094
Fix DFU blaster making DFU too slow 2023-05-04 11:16:16 -04:00
embeddedt
d4cf8503cd
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-04 10:27:13 -04:00
embeddedt
168983c972
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-04 10:26:07 -04:00
embeddedt
11a37d59ec
Ignore exceptions thrown by structure upgrade command 2023-05-04 10:25:47 -04:00
embeddedt
2a7733e61f
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-03 11:16:34 -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
74cf6ef598
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-02 22:02:41 -04:00
embeddedt
8f71606fad
Fix entity renderer crash in some modpacks 2023-05-02 22:00:49 -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
969c3fd18e
Update entity renderer mixin 2023-05-02 19:24:42 -04:00
embeddedt
f62aac1c77
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-02 19:23:34 -04:00
embeddedt
8d1a73c339
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-02 19:22:09 -04:00
embeddedt
71d7004d0c
Shrink oversized PalettedContainers 2023-05-02 19:19:57 -04:00
embeddedt
47e01693c5
Reimplement dynamic entity renderers 2023-05-02 16:14:23 -04:00
embeddedt
7ca647b763
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-02 11:20:58 -04:00
embeddedt
85d54292b2
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-02 11:20:21 -04:00
embeddedt
5a3d519bab
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-02 11:19:38 -04:00
embeddedt
a29ffb252c
Fix some configs not being available 2023-05-02 11:18:30 -04:00
embeddedt
0de67936c1
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-01 21:30:01 -04:00
embeddedt
3f2a8dbb61
Fixes 2023-05-01 21:28:59 -04:00
embeddedt
e830fd9bef
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-01 21:25:21 -04:00
embeddedt
fa9ac8c8ab
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-01 21:24:31 -04:00
embeddedt
81a2b9cb56
Fix issues 2023-05-01 21:12:02 -04:00
embeddedt
01c1d73355
Use custom BakedModel as sentinel 2023-05-01 21:00:50 -04:00
embeddedt
ada0bd4012
Fix mixin 2023-05-01 20:50:56 -04:00
embeddedt
a06a46b498
Spotless 2023-05-01 20:47:24 -04:00
embeddedt
b746be4c67
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-01 20:46:16 -04:00
embeddedt
fddac90db2
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-01 20:42:59 -04:00
embeddedt
de00e21835
Clean up imports 2023-05-01 20:40:06 -04:00
embeddedt
ea25f2e854
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-05-01 20:30:25 -04:00
embeddedt
d9c2e0f342
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-01 19:46:23 -04:00
embeddedt
5ffac3bc3e
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-01 19:11:16 -04:00
embeddedt
64eb01987f
Package restructuring for modern FML 2023-05-01 19:05:08 -04:00
embeddedt
9dd9ef923c
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-01 18:37:26 -04:00
embeddedt
b6ae90d384
Multiloader 2023-05-01 16:55:26 -04:00