Commit Graph

1043 Commits

Author SHA1 Message Date
embeddedt
70a2a2194f
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-12 11:54:31 -04:00
embeddedt
d1c9be8900
Clean up warnings 2023-08-12 11:41:04 -04:00
embeddedt
b5b46888af
Change resource key name
Easier to add typo here than fix typo in the other file and deal
with merge conflicts
2023-08-12 11:32:00 -04:00
embeddedt
df8da0823a
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-12 11:31:45 -04:00
embeddedt
21ee0dc1cf
Add warning for Connectedness and dynamic resources 2023-08-12 11:28:07 -04:00
embeddedt
05e74f4141
Add warning when launched with Continuity and dynamic resources is on 2023-08-12 11:18:41 -04:00
embeddedt
ca8d290870
Message wording change 2023-08-11 19:45:19 -04:00
embeddedt
e949ed67ef
Merge 1.16 into 1.18 2023-08-11 19:44:22 -04:00
embeddedt
a51b1563b1
Try to make config reload message appear less often
Related: #210
2023-08-11 19:31:36 -04:00
embeddedt
f656aea029
Remove outdated mixin 2023-08-11 17:05:17 -04:00
embeddedt
1a8681e15d
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-11 16:53:41 -04:00
embeddedt
721645f88f
Add IgnoreOutsideDev marker to forgotten mixin 2023-08-11 16:53:21 -04:00
embeddedt
d92e48e1aa
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-11 16:53:00 -04:00
embeddedt
7645a43538
Add hacky solution for "runtime" remapping in dev 2023-08-11 16:47:38 -04:00
embeddedt
0c82223248
Fix Custom Machinery models 2023-08-11 16:44:51 -04:00
embeddedt
4d3aaceb9c
Fix crash if FerriteCore detection fails in neighbour table mixin 2023-08-11 16:18:07 -04:00
embeddedt
8b4c5d4c7a
C U B E 2023-08-10 22:44:06 -04:00
embeddedt
cb6ff1d68b
Add API to skip blockstate/model scanning for specific models 2023-08-10 22:43:45 -04:00
embeddedt
8b698452fd
Compact Mojang registries (not available yet) 2023-08-10 22:42:30 -04:00
embeddedt
e9ff7d7ba1
Allow setting config options via JVM properties 2023-08-10 20:31:39 -04:00
embeddedt
34179fb313
Implement blast_search_trees on Fabric (dummy mode only) 2023-08-10 20:30:55 -04:00
embeddedt
d52e6467ac
Update testmod to 1.18 2023-08-10 10:37:59 -04:00
embeddedt
0779058ca5
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-10 09:48:27 -04:00
embeddedt
6c85449b63
Rewrite testmod debug renderer to be cooler 2023-08-09 22:48:30 -04:00
embeddedt
365eb80a28
Testmod for many blocks/items test 2023-08-09 21:45:21 -04:00
embeddedt
fed0392ddc
Introduce test mod 2023-08-09 20:07:59 -04:00
embeddedt
cac291df47
Add minor Brigadier patch to limit suggestion count to 10000
Fixes lag when there are many items registered
2023-08-09 19:51:59 -04:00
embeddedt
2844c97170
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-09 17:07:47 -04:00
embeddedt
5e7d6642a7
Implement minor memory usage optimization for environments without FerriteCore
This is "FerriteCore at home", used to assist with the large registry
tests
2023-08-09 15:46:40 -04:00
embeddedt
fbfaa178e3
Allow disabling Fabric API for runtime in dev 2023-08-09 15:45:14 -04:00
embeddedt
27c2a674cf
Allow only applying mixins when mods aren't present 2023-08-09 13:16:51 -04:00
embeddedt
f488df2d45
Minor buildscript improvements 2023-08-09 12:42:32 -04:00
embeddedt
7b23053da0
Skip generating remapJar for common project 2023-08-09 12:42:32 -04:00
embeddedt
590c939778
Increase default heap from 512MB to 1GB to avoid issues with Fabric remapper
This is still substantially less than the original 4GB
2023-08-09 12:42:32 -04:00
其智乃反不能及
eec5ec7efb
Update zh_cn.json (#207) 2023-08-09 10:05:58 -04:00
羊羽ちゃん
22f22b9317
Add Japanese translation (#206) 2023-08-08 18:18:48 -04:00
embeddedt
27c7400f34 Merge 1.16 into 1.18 2023-08-08 18:17:32 -04:00
embeddedt
c1182944f3 Redirect fetchChoiceType directly in vanilla code instead of fully disabling it
Should address #204
2023-08-08 18:17:01 -04:00
embeddedt
b8d0e5fee2
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-08 10:26:09 -04:00
embeddedt
e2aa482187
Try to provide more guidance to users when reloading configs 2023-08-08 10:24:48 -04:00
embeddedt
8875710f3d
Use client commands on 1.18+ for /mfrc 2023-08-07 21:51:54 -04:00
embeddedt
a82b728d98
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-05 19:43:11 -04:00
embeddedt
795aca19e0
Don't enable blast_search_trees with REI present on 1.16 2023-08-05 19:42:34 -04:00
embeddedt
ae3eab8320
Merge 1.16 into 1.18 2023-08-05 12:52:03 -04:00
embeddedt
abb8cbd23f
Make sure missing model never becomes null 2023-08-05 12:26:18 -04:00
embeddedt
431231c4ee
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-05 12:10:53 -04:00
embeddedt
371e5119f1
Never return a non-null model if it was top level in vanilla 2023-08-05 12:07:21 -04:00
embeddedt
1a25984e88
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-05 11:46:24 -04:00
embeddedt
c1277a2bf5
Make a copy of the top-level model list when collecting materials
This should prevent CMEs if material collection triggers a model
load
2023-08-05 11:42:44 -04:00
embeddedt
9c380e52d1
Merge 1.16 into 1.18 2023-08-04 09:44:03 -04:00