Commit Graph

1114 Commits

Author SHA1 Message Date
embeddedt
3d1ead98c3
Merge 1.16 into 1.18 2023-09-24 11:55:25 -04:00
embeddedt
5de1518f76
Disable stronghold caching when C2ME is installed
Related: #245
2023-09-24 11:53:39 -04:00
embeddedt
d32ba39c1d
Merge commit '7b1d9ff8bba98ed75aa250a19f54727f4279dede' into 1.18 2023-09-22 22:05:42 -04:00
embeddedt
0c65c2cf17
Merge commit '5c21a98c7f44b34f76eb824ff7e866943d8e1265' into 1.18 2023-09-22 22:05:37 -04:00
embeddedt
7b1d9ff8bb
Improve Async Locator backport for 1.16 2023-09-22 22:05:10 -04:00
embeddedt
5c21a98c7f
New stylized logo by CelestialAbyss 2023-09-22 22:05:10 -04:00
embeddedt
0aabad688b Merge 1.16 into 1.18 2023-09-20 17:58:50 -04:00
embeddedt
7ff300d8df Add Vampirism to mods requiring fallback model iterator
Related: #242
2023-09-20 17:58:25 -04:00
其智乃反不能及
bdd12f1802
Update zh_cn.json (#240) 2023-09-18 10:05:22 -04:00
embeddedt
bd1ca9ce94
Disable reduce_blockstate_cache_rebuilds if dev env is not Mojmap
This is simpler than implementing remapping

Closes #229
2023-09-17 13:00:54 -04:00
embeddedt
8b0158b044
Merge 1.16 into 1.18 2023-09-17 12:33:54 -04:00
embeddedt
fe942c90df
More documentation
Related: #232
2023-09-17 12:30:41 -04:00
embeddedt
7d9f110f27
Fix use of relative paths for changelog 2023-09-17 12:30:41 -04:00
embeddedt
412a8c4aec Merge 1.16 into 1.18 2023-09-15 09:40:52 -04:00
embeddedt
e94f1481ae
Don't use Parchment in testmod 2023-09-15 09:23:48 -04:00
embeddedt
60491a9c69
Update gradle.yml 2023-09-13 21:50:46 -04:00
embeddedt
3beef4df08
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-31 11:24:08 -04:00
embeddedt
dc42bda09d
Move shared build code out of rootProject build.gradle 2023-08-31 11:09:56 -04:00
embeddedt
06f5441399
Merge 1.16 into 1.18 2023-08-31 07:57:23 -04:00
embeddedt
fcde6104eb
Possible NPE fixes for KubeJS 2023-08-30 19:39:41 -04:00
embeddedt
20a15a587c
Create CONTRIBUTING.md [skip ci] 2023-08-30 19:22:15 -04:00
embeddedt
987c5dc321
Change mixin priority 2023-08-29 15:16:54 -04:00
embeddedt
ec99687702
Fix Canary compat 2023-08-29 15:08:50 -04:00
embeddedt
3bf2c86b07
Merge 1.16 into 1.18 2023-08-29 14:39:54 -04:00
embeddedt
4418dd2eab Fix misapplied Forge patch that no longer checks currently loading chunk 2023-08-24 21:46:23 -04:00
embeddedt
8081e0db02
BLS compat improvement 2023-08-22 21:01:09 -04:00
embeddedt
5ad333703f
Merge 1.16 into 1.18 2023-08-20 16:50:43 -04:00
其智乃反不能及
54625c1a40
Update zh_cn.json (#223) 2023-08-20 14:24:58 -04:00
embeddedt
e1ea900ffb
Disable compress_biome_container when Modern Beta is installed
Related: #224
2023-08-20 14:21:11 -04:00
embeddedt
ab4ded89e3
Merge 1.16 into 1.18 2023-08-20 13:15:50 -04:00
embeddedt
1f7da1d650
Fix mixin scanning fix not actually working due to typo when backporting 2023-08-20 13:15:22 -04:00
embeddedt
e8926c334c
Merge 1.16 into 1.18 2023-08-19 19:30:54 -04:00
embeddedt
dcbc3e033a
Tweak injection point of faster_item_rendering 2023-08-19 19:30:30 -04:00
embeddedt
89700c1e2e
Merge 1.16 into 1.18 2023-08-19 19:19:24 -04:00
embeddedt
58b7b0da0f
Fix MI pipes being invisible when faster_item_rendering is enabled 2023-08-19 19:18:52 -04:00
embeddedt
8290964c31
Merge 1.16 into 1.18 2023-08-19 14:59:17 -04:00
embeddedt
383d40e420
Detect mixins with calls to other merged methods
Related: #222
2023-08-19 14:59:11 -04:00
羊羽ちゃん
37724d7696
Update Japanese (#221) 2023-08-18 22:08:17 -04:00
embeddedt
2a1685a2cb
Fix merge error 2023-08-18 15:36:50 -04:00
embeddedt
4dcb94e6a5
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-18 15:33:18 -04:00
embeddedt
ec66fbc05c
Add wiki button
Related: #202
2023-08-18 15:31:31 -04:00
embeddedt
7490809a42
Merge 1.16 into 1.18 2023-08-18 15:16:52 -04:00
embeddedt
45f92f7fce
Disable config reload message for now
There isn't a good way to print this in a way that will catch the
modification in all scenarios, and that doesn't annoy the user
2023-08-18 15:16:20 -04:00
embeddedt
73c80d0603
Merge 1.16 into 1.18 2023-08-18 14:39:24 -04:00
embeddedt
fa9103fb06
Convert milliseconds to nanoseconds correctly 2023-08-18 14:39:07 -04:00
embeddedt
6b1f5232fa
Merge 1.16 into 1.18 2023-08-18 14:35:23 -04:00
embeddedt
672ca92aab
Show time to bootstrap stage on Forge 2023-08-18 14:35:15 -04:00
embeddedt
1f5763bdf0
Merge 1.16 into 1.18 2023-08-18 14:14:32 -04:00
embeddedt
744622b81d
Create FUNDING.yml [skip ci] 2023-08-16 21:58:26 -04:00
TheBossMagnus
12aa14cc54
Italian Localization (#217) 2023-08-16 16:04:09 -04:00