Commit Graph

121 Commits

Author SHA1 Message Date
embeddedt
7faa29e84b
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-08-18 14:17:00 -04:00
embeddedt
349f58b807
Merge 1.18 into 1.19.2 2023-08-18 14:14:33 -04:00
embeddedt
1f5763bdf0
Merge 1.16 into 1.18 2023-08-18 14:14:32 -04:00
TheBossMagnus
12aa14cc54
Italian Localization (#217) 2023-08-16 16:04:09 -04:00
embeddedt
2e272f9b18
Merge 1.19.2 into 1.19.4 2023-08-15 13:08:55 -04:00
embeddedt
1580e757ed
Merge 1.18 into 1.19.2 2023-08-15 13:08:54 -04:00
embeddedt
ed0460747c
Update world leak patch to 1.18 2023-08-15 13:08:42 -04:00
embeddedt
fa8d83a21a
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-15 13:04:49 -04:00
embeddedt
6908f14905
Mitigation for memory usage from leaked client worlds 2023-08-15 13:04:04 -04:00
embeddedt
351e4d3fc6
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-08-13 16:37:56 -04:00
embeddedt
53cc4584f4
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-13 16:15:02 -04:00
embeddedt
ca51ceba6a
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-13 13:40:52 -04:00
其智乃反不能及
33e43f5b8f
Update zh_cn.json (#211) 2023-08-13 12:24:33 -04:00
embeddedt
d13cfd5ca8
Merge 1.19.2 into 1.19.4 2023-08-12 12:13:45 -04:00
embeddedt
4399eeb67f
Merge 1.16 into 1.18 2023-08-12 12:13:44 -04:00
embeddedt
dd4d316a66
Merge 1.18 into 1.19.2 2023-08-12 12:13:44 -04:00
embeddedt
073b8cb9de
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-08-12 12:09:21 -04:00
embeddedt
b776587f2d
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-12 12:02:43 -04:00
embeddedt
70a2a2194f
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-12 11:54:31 -04:00
embeddedt
b87c615e5d
Adjust mixin config 2023-08-12 11:51:28 -04:00
embeddedt
b5b46888af
Change resource key name
Easier to add typo here than fix typo in the other file and deal
with merge conflicts
2023-08-12 11:32:00 -04:00
embeddedt
df8da0823a
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-12 11:31:45 -04:00
embeddedt
21ee0dc1cf
Add warning for Connectedness and dynamic resources 2023-08-12 11:28:07 -04:00
embeddedt
ca8d290870
Message wording change 2023-08-11 19:45:19 -04:00
embeddedt
571d3bd5e2
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-08-09 17:14:22 -04:00
embeddedt
26bbe781a0
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-09 17:11:01 -04:00
embeddedt
2844c97170
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-09 17:07:47 -04:00
其智乃反不能及
eec5ec7efb
Update zh_cn.json (#207) 2023-08-09 10:05:58 -04:00
羊羽ちゃん
22f22b9317
Add Japanese translation (#206) 2023-08-08 18:18:48 -04:00
embeddedt
bb115f1d2f
Merge 1.19.2 into 1.19.4 2023-08-08 10:27:08 -04:00
embeddedt
46be9a801c
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-08 10:26:30 -04:00
embeddedt
b8d0e5fee2
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-08 10:26:09 -04:00
embeddedt
e2aa482187
Try to provide more guidance to users when reloading configs 2023-08-08 10:24:48 -04:00
embeddedt
7d6fa48a74
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-08-02 11:55:34 -04:00
embeddedt
31b5114a8d
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-02 11:50:45 -04:00
embeddedt
db5f99f3f6
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-07-31 22:25:50 -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
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
其智乃反不能及
2b4199c0a6
Update zh_cn.json (#192) 2023-07-30 12:25:08 -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
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
88a2b25281
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-07-28 21:19:40 -04:00
embeddedt
c7b6a9ed9e
Document 1.16 options 2023-07-28 20:38:45 -04:00
embeddedt
5d33805a6f
Merge 1.19.2 into 1.19.4 2023-07-24 17:19:01 -04:00