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
|
b87c615e5d
|
Adjust mixin config
|
2023-08-12 11:51:28 -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
|
507cc7eb14
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-08-11 19:55:28 -04:00 |
|
embeddedt
|
74d28ed997
|
Update mixin
|
2023-08-11 19:50:33 -04:00 |
|
embeddedt
|
dcad671568
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-11 19:48:12 -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
|
770969ec5c
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-08-10 10:54:46 -04:00 |
|
embeddedt
|
a506f8785e
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-10 10:47:59 -04:00 |
|
embeddedt
|
b8a4e13284
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-10 10:38:32 -04:00 |
|
embeddedt
|
0779058ca5
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-08-10 09:48:27 -04:00 |
|
embeddedt
|
fed0392ddc
|
Introduce test mod
|
2023-08-09 20:07:59 -04:00 |
|
embeddedt
|
712409b4e1
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-08-09 17:20:45 -04:00 |
|
embeddedt
|
571d3bd5e2
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-09 17:14:22 -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 |
|
embeddedt
|
7b23053da0
|
Skip generating remapJar for common project
|
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
|
32e246885b
|
Merge 1.19.4 into 1.20
|
2023-08-08 18:17:36 -04:00 |
|
embeddedt
|
824deddb46
|
Merge 1.19.2 into 1.19.4
|
2023-08-08 18:17:35 -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
|
180ac925f7
|
Merge 1.19.4 into 1.20
|
2023-08-08 10:27:08 -04:00 |
|
embeddedt
|
bb115f1d2f
|
Merge 1.19.2 into 1.19.4
|
2023-08-08 10:27:08 -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
|
823fa259e9
|
Merge 1.19.4 into 1.20
|
2023-08-05 19:43:20 -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
|
ec5b92dd7a
|
Don't trigger full blockstate cache rebuilds when requesting fluid
This causes mods to prematurely rebuild the whole cache, which
is not what we want
|
2023-08-05 19:38:45 -04:00 |
|
embeddedt
|
8a0ff999bd
|
Merge 1.19.4 into 1.20
|
2023-08-05 12:52:06 -04:00 |
|
embeddedt
|
7b18bcafd6
|
Merge 1.19.2 into 1.19.4
|
2023-08-05 12:52:05 -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
|
5165cf20c8
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-08-05 12:18:45 -04:00 |
|
embeddedt
|
2cb5acb9f9
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-05 12:17:50 -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
|
c2695b1180
|
Merge 1.19.4 into 1.20
|
2023-08-03 20:04:49 -04:00 |
|
embeddedt
|
d3884d764d
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-03 20:02:55 -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
|
331ad00758
|
Merge 1.19.4 into 1.20
|
2023-08-03 17:01:14 -04:00 |
|
embeddedt
|
b64fefa73c
|
Merge 1.19.2 into 1.19.4
|
2023-08-03 17:01:13 -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
|
d5a9f68575
|
Merge 1.19.4 into 1.20
|
2023-08-03 13:14:38 -04:00 |
|
embeddedt
|
3caba87924
|
Merge 1.19.2 into 1.19.4
|
2023-08-03 13:14:37 -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
|
bf5ca2f3cd
|
Merge 1.19.4 into 1.20
|
2023-08-02 22:18:19 -04:00 |
|
embeddedt
|
23ffdabcc4
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-02 22:18:13 -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
|
fa6b93fad2
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-08-02 19:51:25 -04:00 |
|
embeddedt
|
942b7cbb43
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-02 19:41:34 -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 |
|
embeddedt
|
5bd5c8289c
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-08-02 16:41:39 -04:00 |
|
embeddedt
|
26998e912b
|
Mark fluidState redirect as optional for old Lithium/VMP versions
|
2023-08-02 16:41:23 -04:00 |
|
embeddedt
|
02fd57f9a4
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-08-02 16:31:51 -04:00 |
|
embeddedt
|
f76ca049cc
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-02 16:31:07 -04:00 |
|
embeddedt
|
f4ab932924
|
Fix incorrect return value from deduplicated postprocessing map
|
2023-08-02 16:30:18 -04:00 |
|
embeddedt
|
d77946a5ab
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-02 16:23:22 -04:00 |
|
embeddedt
|
0d190a4c80
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-08-02 16:17:45 -04:00 |
|
embeddedt
|
201db412a4
|
Rewrite tracking code for game load/world join timing
|
2023-08-02 16:08:36 -04:00 |
|
embeddedt
|
a1a441d397
|
Merge 1.19.4 into 1.20
|
2023-08-02 15:45:57 -04:00 |
|
embeddedt
|
ba9ba01dfe
|
Merge 1.19.2 into 1.19.4
|
2023-08-02 15:45:56 -04:00 |
|
embeddedt
|
ad19e11213
|
Merge 1.18 into 1.19.2
|
2023-08-02 15:45:55 -04:00 |
|
embeddedt
|
2ff09ef382
|
Merge 1.16 into 1.18
|
2023-08-02 15:45:54 -04:00 |
|
embeddedt
|
2c1e036857
|
Bail out early if empty map is passed to CanonizingStringMap.putAll
|
2023-08-02 14:59:52 -04:00 |
|
embeddedt
|
11fd512c5e
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-08-02 11:56:36 -04:00 |
|
embeddedt
|
7d6fa48a74
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-02 11:55:34 -04:00 |
|
embeddedt
|
31b5114a8d
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-02 11:50:45 -04:00 |
|
embeddedt
|
1cd7b7e0c7
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-08-02 11:48:27 -04:00 |
|
embeddedt
|
db5f99f3f6
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-07-31 22:25:50 -04:00 |
|