Commit Graph

1518 Commits

Author SHA1 Message Date
embeddedt
84bd756cdf
Merge 1.19.4 into 1.20 2023-07-30 13:11:12 -04:00
embeddedt
1a2981e5f1
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-07-30 13:09:42 -04:00
embeddedt
cedd9ac79b
Fix merge error 2023-07-30 13:09:32 -04:00
embeddedt
94f7b9295d
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-07-30 12:59:23 -04:00
embeddedt
78ff767b9e
Merge 1.18 into 1.19.2 2023-07-30 12:57:40 -04:00
embeddedt
762728c0a6
Merge 1.16 into 1.18 2023-07-30 12:57:39 -04:00
embeddedt
377f59847e
Skip dynamic resources single blockstate optimization when outside world
This should improve performance of model baking events during launch
2023-07-30 12:57:11 -04:00
embeddedt
92a204c253
Make FlagManager patch handle both impls of CoFH Core 2023-07-30 12:57:11 -04:00
其智乃反不能及
2b4199c0a6
Update zh_cn.json (#192) 2023-07-30 12:25:08 -04:00
embeddedt
ee75ef19aa
Clean up dead code 2023-07-29 20:40:50 -04:00
embeddedt
106b3447eb
Switch to Gradle build action 2023-07-29 20:25:19 -04:00
embeddedt
3e3448adb1
Merge 1.19.4 into 1.20 2023-07-28 22:11:28 -04:00
embeddedt
3b3803f57e
Merge 1.19.2 into 1.19.4 2023-07-28 22:11:27 -04:00
embeddedt
26f7ee56ab
Merge 1.18 into 1.19.2 2023-07-28 22:11:27 -04:00
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
3a4b8738fc
Merge 1.19.4 into 1.20 2023-07-28 22:00:23 -04:00
embeddedt
eb1d16740e
Merge 1.19.2 into 1.19.4 2023-07-28 22:00:22 -04:00
embeddedt
f08ca83440
Merge 1.18 into 1.19.2 2023-07-28 22:00:21 -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
4697704763
Merge remote-tracking branch 'origin/1.19.4' into 1.20 2023-07-28 21:45:25 -04:00
embeddedt
4a66802b37
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-07-28 21:41:44 -04:00
embeddedt
edfa7f0c41
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-07-28 21:25:46 -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
1884996e53
Merge 1.19.4 into 1.20 2023-07-28 16:40:02 -04:00
embeddedt
451b26fa93
Use Redirect instead of Inject to avoid allocations 2023-07-28 16:38:44 -04:00
embeddedt
4fe3b93fb0
Fix crash on Forge 2023-07-28 16:17:49 -04:00
embeddedt
51bf5890d3
Merge 1.19.4 into 1.20 2023-07-28 16:09:27 -04:00
embeddedt
23e768d629
Spotless 2023-07-28 16:09:21 -04:00
embeddedt
e1fdca5f41
Merge 1.19.4 into 1.20 2023-07-28 16:07:14 -04:00
embeddedt
d3ff2823dc
Update blockstate caching logic for vanilla 1.19.4 changes 2023-07-28 16:05:21 -04:00
embeddedt
4e3dc99479
Merge remote-tracking branch 'origin/1.19.4' into 1.20 2023-07-27 16:49:05 -04:00
embeddedt
e45acac6b6
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-07-27 16:48:48 -04:00
embeddedt
3456b8cf23
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-07-27 16:41:07 -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
ae8c062631
Merge 1.19.4 into 1.20 2023-07-27 16:04:08 -04:00
embeddedt
49c847f38a
Merge 1.19.2 into 1.19.4 2023-07-27 16:04:07 -04:00
embeddedt
0070b8731d
Merge 1.18 into 1.19.2 2023-07-27 16:04:07 -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
36ae73316a
Merge 1.19.4 into 1.20 2023-07-27 12:41:43 -04:00