Commit Graph

1002 Commits

Author SHA1 Message Date
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
embeddedt
e04b05dcc8
Don't return null for models we claim are in the faked model registry 2023-08-04 09:42:07 -04:00
embeddedt
f225e6cf75
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-03 19:57:15 -04:00
embeddedt
14170ade1f
Implement /mfrc and /mfsrc commands to reload configs on client/server respectively 2023-08-03 19:45:37 -04:00
embeddedt
c8749940f7
Show log message after reloads are processed 2023-08-03 18:09:57 -04:00
embeddedt
dbff17a1ff
Better fix for config corruption
Defer posting of all config reload events to the main thread, and
don't process any until after the launch finishes. This should
hopefully fix some synchronization issues
2023-08-03 18:08:46 -04:00
embeddedt
1989f122c6
Remove locking system for Night Config files
This can cause deadlocks if mods themselves are also using their
own internal locks (Sophisticated Backpacks does this on 1.16 by
using a CHM)

This system will be replaced by a command/keybind to manually reload
configs
2023-08-03 17:54:30 -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
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
eac9edb13a
Fix Forge overriding ResourceKey.equals() with a slower implementation 2023-08-03 16:29:13 -04:00
embeddedt
f1e2b21d8f
Merge 1.16 into 1.18 2023-08-03 12:21:01 -04:00
embeddedt
fac9f6fac9
Move to 4-character git hash for dev builds
Needed in order to fit the whole version into 32 characters
2023-08-03 12:20:19 -04:00
embeddedt
d9e429bfb4
Merge 1.16 into 1.18 2023-08-03 11:53:58 -04:00
embeddedt
81ebcc8186
Link to wiki changelog 2023-08-03 11:53:49 -04:00
embeddedt
ac827a0f42
Fix branch list including dev branches 2023-08-03 11:29:04 -04:00
embeddedt
6d53262a9f
Merge 1.16 into 1.18 2023-08-03 11:27:51 -04:00
embeddedt
24792b96cc
Move ModernFix branding to right side of screen 2023-08-03 11:27:32 -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
54dda96849
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-02 19:21:23 -04:00
embeddedt
acec6112cb
Remove all remaining hard dependency on Fabric API modules 2023-08-02 19:15:34 -04:00
embeddedt
7e777625a5
Remove dependency on fabric-lifecycle-events 2023-08-02 19:05:39 -04:00
embeddedt
fe818eb7e6
Replace ServerLifecycleEvents usage with mixin 2023-08-02 19:00:28 -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
f4ab932924
Fix incorrect return value from deduplicated postprocessing map 2023-08-02 16:30:18 -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
2ff09ef382
Merge 1.16 into 1.18 2023-08-02 15:45:54 -04:00
embeddedt
62ea11ef7b
Avoid hardcoding projects to include 2023-08-02 15:32:59 -04:00
embeddedt
2c1e036857
Bail out early if empty map is passed to CanonizingStringMap.putAll 2023-08-02 14:59:52 -04:00
embeddedt
1cd7b7e0c7
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-02 11:48:27 -04:00
embeddedt
1d1e7b640a
Call Item.fillItemCategory() on all items when removing creative search trees
This fixes obscure issues caused by mods that accidentally rely on that
method to initialize other classes

Resolves https://github.com/Shadows-of-Fire/GatewaysToEternity/issues/29
2023-08-02 09:33:05 -04:00
embeddedt
db5f99f3f6
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-07-31 22:25:50 -04:00
embeddedt
25dc08eb79
Make dynamic codecs actually work 2023-07-31 22:18:26 -04:00
embeddedt
11fe75578c
Add option to generate block codecs on the fly instead of at startup 2023-07-31 21:51:45 -04:00
embeddedt
c8c316a06f
Enforce 512MB heap for dev runs 2023-07-31 15:45:33 -04:00
embeddedt
49fa5bf14a
Lock FerriteCore deduplication fix to dev only 2023-07-31 15:23:37 -04:00
embeddedt
e540c9d58d
Improve FerriteCore memory usage for blocks with one state 2023-07-31 14:23:14 -04:00
embeddedt
9d6f51695a
Update MappedRegistry mixin for 1.18 2023-07-31 13:14:48 -04:00
embeddedt
2bc5b39895
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-07-31 13:14:25 -04:00
embeddedt
3e4f1ab23a
Improve registry performance with large entry counts 2023-07-31 13:13:39 -04:00