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 |
|
embeddedt
|
82445d2ba2
|
Merge 1.18 into 1.19.2
|
2023-07-24 17:19:00 -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
|
8527594b3b
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-07-19 12:17:13 -04:00 |
|
embeddedt
|
3fed2ef08d
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-07-19 12:09:39 -04:00 |
|
embeddedt
|
d9b9586af3
|
Update item override patch to 1.18
|
2023-07-19 12:08:15 -04:00 |
|
embeddedt
|
b79a66ce83
|
Merge 1.19.2 into 1.19.4
|
2023-07-13 19:40:39 -04:00 |
|
embeddedt
|
17d479bc93
|
Merge 1.18 into 1.19.2
|
2023-07-13 19:40:38 -04:00 |
|
embeddedt
|
5f59fdf471
|
Merge 1.16 into 1.18
|
2023-07-13 19:40:37 -04:00 |
|
其智乃反不能及
|
a1ee34bb1c
|
Update zh_cn.json (#153)
|
2023-07-13 19:39:48 -04:00 |
|
embeddedt
|
6ae19f11ea
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-07-11 21:31:29 -04:00 |
|
embeddedt
|
406a4a3a91
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-07-11 21:17:59 -04:00 |
|
embeddedt
|
896c8d1f5f
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-07-11 21:14:47 -04:00 |
|
embeddedt
|
816346e919
|
Make mod overrides higher priority than user configuration
Prevents players inadvertently enabling incompatible options
|
2023-07-11 21:13:02 -04:00 |
|
embeddedt
|
bd351197b2
|
Backport https://github.com/MinecraftForge/MinecraftForge/pull/8959 to 1.18
|
2023-07-10 20:23:54 -04:00 |
|
embeddedt
|
28c456e4c5
|
Merge 1.18 into 1.19.2
|
2023-07-09 13:32:34 -04:00 |
|
embeddedt
|
2d12c6e282
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-07-09 13:31:01 -04:00 |
|
embeddedt
|
d987c1227b
|
Scan fallback resource managers as well as main resource manager
For buggy mods such as https://github.com/FoundationGames/EnhancedBlockEntities/issues/162
|
2023-07-09 13:27:18 -04:00 |
|
embeddedt
|
a1f3cb9270
|
Merge 1.19.2 into 1.19.4
|
2023-07-06 22:10:25 -04:00 |
|
embeddedt
|
3b85b20020
|
Merge 1.18 into 1.19.2
|
2023-07-06 22:10:24 -04:00 |
|
embeddedt
|
36a1b6bb93
|
Merge 1.16 into 1.18
|
2023-07-06 22:10:24 -04:00 |
|
ZZZank
|
45ada33d7d
|
Update zh_cn Translation (#150)
from: ce6ce1d341
|
2023-07-06 21:34:25 -04:00 |
|
embeddedt
|
7652a1dbc5
|
Merge 1.19.2 into 1.19.4
|
2023-07-05 14:50:07 -04:00 |
|
embeddedt
|
6d4071f42c
|
Merge 1.18 into 1.19.2
|
2023-07-05 14:50:05 -04:00 |
|
embeddedt
|
6cd49334d7
|
Merge 1.16 into 1.18
|
2023-07-05 14:47:30 -04:00 |
|
embeddedt
|
095b9c3277
|
Revamp mod warning system, also warn about FerriteCore missing
|
2023-07-05 14:47:17 -04:00 |
|
embeddedt
|
41a56fba20
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-07-05 12:35:41 -04:00 |
|
embeddedt
|
1600dc4f84
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-07-05 12:26:14 -04:00 |
|
embeddedt
|
46cff62796
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-07-05 12:18:00 -04:00 |
|
embeddedt
|
ce6ce1d341
|
Add option categories
|
2023-07-04 11:14:23 -04:00 |
|
embeddedt
|
18f78b9624
|
Add in-game patch descriptions
|
2023-07-03 17:04:20 -04:00 |
|
embeddedt
|
37d6f477c4
|
Merge 1.19.2 into 1.19.4
|
2023-07-03 14:58:45 -04:00 |
|
embeddedt
|
0f90f53f53
|
Merge 1.18 into 1.19.2
|
2023-07-03 14:58:44 -04:00 |
|