Commit Graph

1642 Commits

Author SHA1 Message Date
embeddedt
5f45f612a3
Merge 1.19.2 into 1.19.4 2023-08-31 07:57:25 -04:00
embeddedt
adac1125e8
Merge 1.18 into 1.19.2 2023-08-31 07:57:24 -04:00
embeddedt
06f5441399
Merge 1.16 into 1.18 2023-08-31 07:57:23 -04:00
Phoenix-Starlight
5fef7dc66b
Fix dynamic resources ModelManager leak (#231)
The opened BufferedReader was not being closed, and apparently the cleaner/finalize mechanism doesn't exist for it
2023-08-31 07:56:38 -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
ecb3863410
Merge 1.19.2 into 1.19.4 2023-08-29 15:17:05 -04:00
embeddedt
eac4ddac4c
Merge 1.18 into 1.19.2 2023-08-29 15:17:04 -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
2aab73220c
Merge 1.19.2 into 1.19.4 2023-08-29 14:39:56 -04:00
embeddedt
4f7a4cbf95
Merge 1.18 into 1.19.2 2023-08-29 14:39:55 -04:00
embeddedt
3bf2c86b07
Merge 1.16 into 1.18 2023-08-29 14:39:54 -04:00
embeddedt
fa5b947442 Merge 1.19.2 into 1.19.4 2023-08-24 21:47:03 -04:00
embeddedt
11f1be0d2c Merge 1.18 into 1.19.2 2023-08-24 21:47:02 -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
48c9d401db
Merge 1.19.2 into 1.19.4 2023-08-20 16:50:44 -04:00
embeddedt
37078ef962
Merge 1.18 into 1.19.2 2023-08-20 16:50:44 -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
c34974a555
Merge 1.19.2 into 1.19.4 2023-08-20 13:15:52 -04:00
embeddedt
ffa76b238e
Merge 1.18 into 1.19.2 2023-08-20 13:15:51 -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
0df87a9f83
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-08-19 19:32:16 -04:00
embeddedt
26758e18b2
Merge 1.18 into 1.19.2 2023-08-19 19:30:55 -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
f8a35c5884
Merge 1.19.2 into 1.19.4 2023-08-19 19:19:58 -04:00
embeddedt
0b685d843e
Merge 1.18 into 1.19.2 2023-08-19 19:19:25 -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
e827fba754
Merge 1.19.2 into 1.19.4 2023-08-19 14:59:19 -04:00
embeddedt
fac858e3cb
Merge 1.18 into 1.19.2 2023-08-19 14:59:18 -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
6536c49c3c
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-08-18 15:39:03 -04:00
embeddedt
59abaf6a7f
Merge 1.18 into 1.19.2 2023-08-18 15:37:02 -04:00
embeddedt
2a1685a2cb
Fix merge error 2023-08-18 15:36:50 -04:00
embeddedt
a35c605e73
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-18 15:34:55 -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
a1e8838aee
Merge 1.19.2 into 1.19.4 2023-08-18 15:16:54 -04:00
embeddedt
9390f7fca9
Merge 1.18 into 1.19.2 2023-08-18 15:16:53 -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
2ee1ef13ec
Merge 1.19.2 into 1.19.4 2023-08-18 14:39:25 -04:00