embeddedt
|
b776587f2d
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-12 12:02:43 -04:00 |
|
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
|
0a18e9c1dc
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-11 19:45:31 -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
|
1e77cccf5a
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-11 17:00:38 -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
|
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
|
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
|
26bbe781a0
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-09 17:11:01 -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
|
27c2a674cf
|
Allow only applying mixins when mods aren't present
|
2023-08-09 13:16:51 -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
|
866fcebf2e
|
Merge 1.18 into 1.19.2
|
2023-08-08 18:17:33 -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
|
46be9a801c
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-08 10:26:30 -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
|
795aca19e0
|
Don't enable blast_search_trees with REI present on 1.16
|
2023-08-05 19:42:34 -04:00 |
|
embeddedt
|
1931101545
|
Merge 1.18 into 1.19.2
|
2023-08-05 12:52:04 -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
|
605058522e
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-05 12:11:30 -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
|
f05d33969f
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-03 20:02:15 -04:00 |
|
embeddedt
|
4972081d8a
|
Forcefully inject access transformers from mods even if a load error occurs
Related: https://github.com/neoforged/NeoForge/issues/43
|
2023-08-03 17:04:41 -04:00 |
|
embeddedt
|
c5f73c5e26
|
Merge 1.18 into 1.19.2
|
2023-08-03 17:01:12 -04:00 |
|
embeddedt
|
022367c8d6
|
Merge 1.16 into 1.18
|
2023-08-03 17:01:11 -04:00 |
|
embeddedt
|
5853f9b034
|
Fix NPE on Forge error screen
|
2023-08-03 17:00:30 -04:00 |
|
embeddedt
|
f469d591b8
|
Remove item quirk entirely on 1.19+
|
2023-08-03 13:13:09 -04:00 |
|
embeddedt
|
72e3a115d6
|
Move item filling quirk to correct vanilla location on 1.19+
|
2023-08-03 13:08:18 -04:00 |
|
embeddedt
|
200cf00fe4
|
Merge 1.18 into 1.19.2
|
2023-08-02 22:08:41 -04:00 |
|
embeddedt
|
12c2214432
|
Merge 1.16 into 1.18
|
2023-08-02 22:08:15 -04:00 |
|
embeddedt
|
df9d2fbe2f
|
Remove default impl from ModernFixPlatformHooks
|
2023-08-02 22:08:01 -04:00 |
|
embeddedt
|
88e0016e31
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-02 19:35:34 -04:00 |
|
embeddedt
|
54dda96849
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-08-02 19:21:23 -04:00 |
|
embeddedt
|
82218ce18f
|
Fix world load time being printed if it wasn't actually set
|
2023-08-02 17:16:42 -04:00 |
|