Commit Graph

943 Commits

Author SHA1 Message Date
embeddedt
877eeeab5d
Merge 1.16 into 1.18 2023-07-28 22:11:26 -04:00
embeddedt
ce7e796d93
Only collect options from ModernFixEarlyConfig added to the immutable map 2023-07-28 22:11:10 -04:00
embeddedt
4d0ac56bd8
Merge 1.16 into 1.18 2023-07-28 22:00:20 -04:00
embeddedt
01bbff42db
Add descriptions of options from newer versions 2023-07-28 22:00:09 -04:00
embeddedt
ea593d5002
Remove debug message 2023-07-28 21:21:45 -04:00
embeddedt
88a2b25281
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-07-28 21:19:40 -04:00
embeddedt
5da78f7565
Render sub-options more nicely 2023-07-28 21:19:15 -04:00
embeddedt
f036350b0a
Add option parenting, gate changes to sub-options when parent option is off 2023-07-28 21:04:53 -04:00
embeddedt
c7b6a9ed9e
Document 1.16 options 2023-07-28 20:38:45 -04:00
embeddedt
5225d89210
Allow choosing custom path to language JSON
Intended for use in dev, to allow pointing at the local 1.16 file
as changes are made
2023-07-28 20:10:10 -04:00
embeddedt
eee22d7e70
Upgrade markdown generation script, can now detect missing descriptions outside game 2023-07-28 19:56:01 -04:00
embeddedt
7b02351f11
Update for 1.18 2023-07-27 16:39:15 -04:00
embeddedt
f3f66e1873
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-07-27 16:35:06 -04:00
embeddedt
13cc103be2
Switch to compile-only Arch Transformer 2023-07-27 16:26:16 -04:00
embeddedt
efd9feca0e
Merge 1.16 into 1.18 2023-07-27 16:04:06 -04:00
embeddedt
2663f5e3f4
Use Forge resource finder for directories instead of MF finder 2023-07-27 13:59:13 -04:00
embeddedt
cb6926e821
Merge 1.16 into 1.18 2023-07-26 22:03:09 -04:00
embeddedt
213bcd1b2a
Fix getResource("") failing to return valid resource
Fixes #187
2023-07-26 22:02:21 -04:00
embeddedt
accd6cb143
Merge 1.16 into 1.18 2023-07-26 09:37:03 -04:00
embeddedt
0a9644a8a0
More documentation inside config file 2023-07-26 09:18:05 -04:00
embeddedt
7ad09acec6
Add code to show default values of options (currently unused)
Related: #186
2023-07-26 09:00:45 -04:00
embeddedt
70fc67199f
Merge 1.16 into 1.18 2023-07-24 17:18:32 -04:00
embeddedt
84e27a7c4d
Fix ender dragon model leaking client world 2023-07-24 17:15:10 -04:00
embeddedt
6ae1992329
Merge 1.16 into 1.18 2023-07-24 16:04:31 -04:00
embeddedt
7f44701670
Display ModernFix version in early part of log 2023-07-24 16:03:29 -04:00
embeddedt
5338cca79b
Adjust patch for 1.18 FlagManager 2023-07-24 14:23:28 -04:00
embeddedt
bb5e71c651
Remove second config warning, now redundant 2023-07-23 20:37:57 -04:00
embeddedt
aa50c4466e
Fix memory leak in Blueprint
Implements https://github.com/team-abnormals/blueprint/pull/195, which
is still not released on 1.19.2, and may never be released on 1.18.2
2023-07-23 19:28:16 -04:00
embeddedt
000e9746ba
Merge 1.16 into 1.18 2023-07-23 19:23:25 -04:00
embeddedt
7fa6c45f07
Fix dragging in ModLoader too early 2023-07-23 19:21:00 -04:00
embeddedt
0c3cade976
Merge 1.16 into 1.18 2023-07-23 18:33:25 -04:00
embeddedt
2246b79a85
Fix mod mixins not being disabled if there is an early load error 2023-07-23 18:32:50 -04:00
embeddedt
e56155f9a0
Merge 1.16 into 1.18 2023-07-22 17:07:32 -04:00
embeddedt
4cdf5e6b3d
Fix missing ClientOnly annotations 2023-07-22 15:35:36 -04:00
embeddedt
6efa7f3c5b
Merge 1.16 into 1.18 2023-07-22 11:22:02 -04:00
embeddedt
48409fc572
Fix concurrency issue in CoFH FlagManager
Related: #173
2023-07-22 11:19:20 -04:00
embeddedt
373a10f12c
Fix crash with dynamic resources if mods depend on themselves 2023-07-22 11:06:11 -04:00
embeddedt
18cec4f88d
Fix NPE from config fixers
Related: #174
2023-07-22 09:56:25 -04:00
embeddedt
b5870b3ae4
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-07-21 11:15:11 -04:00
embeddedt
edb3da4f74
Fix deadlock with the config fixers by moving all locking to one object 2023-07-21 11:13:56 -04:00
embeddedt
b98377d5cb
Merge 1.16 into 1.18 2023-07-20 21:35:13 -04:00
embeddedt
7dbb926787
Forceload RenderType/RenderStateShard on the main thread during startup
Fixes launch deadlock with Registrate/Quark
2023-07-20 21:34:04 -04:00
embeddedt
50ab84af42
Merge 1.16 into 1.18 2023-07-20 20:18:43 -04:00
embeddedt
4397f274a5
Prevent CME from thread dumper 2023-07-20 20:18:34 -04:00
embeddedt
4f428b0e5d
Merge 1.16 into 1.18 2023-07-19 17:32:18 -04:00
embeddedt
ad60b1dec6
Fix timing of dynamic baked model registry handoff 2023-07-19 17:31:24 -04:00
embeddedt
d1a1fce7e1
Improve reliability of ItemOverrideBakedModel if not replaced 2023-07-19 17:08:23 -04:00
embeddedt
91980319d2
Merge 1.16 into 1.18 2023-07-19 16:46:13 -04:00
embeddedt
8383053b5c
Fix wall block deduplication crashing when invasive mods replace vanilla walls
Related: #168
2023-07-19 16:45:32 -04:00
embeddedt
4c737e315e
Merge 1.16 into 1.18 2023-07-19 12:32:37 -04:00