Commit Graph

56 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
0f90f53f53
Merge 1.18 into 1.19.2 2023-07-03 14:58:44 -04:00
embeddedt
9d5953c9f5
Merge 1.16 into 1.18 2023-07-03 14:58:06 -04:00
notlin4
6f07cbdc70
Add Traditional Chinese translation (#148) 2023-07-02 13:34:23 -04:00
embeddedt
baca029fd0
Add support for Diagonal Fences 2023-05-23 14:59:46 -04:00
embeddedt
aae4db7ebf
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-22 13:27:20 -04:00
embeddedt
80617c24f1
Work around KeyMapping names being retrieved off-thread 2023-05-22 13:25:14 -04:00
embeddedt
ee3f29c569
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-15 11:09:39 -04:00
embeddedt
f599acda6b
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-15 11:07:31 -04:00
embeddedt
c1c9c02ff4
Remove blockstate compression 2023-05-14 20:27:37 -04:00
embeddedt
acdd18f8df
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-10 15:39:22 -04:00
embeddedt
14b4ea7eb1
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-10 15:39:11 -04:00
embeddedt
b5c08b996f
Add button to title screen for datagenning inside runClient 2023-05-10 15:29:46 -04:00
embeddedt
33f689ba9a
Make RenderType EqualsStrategy more predictable 2023-05-08 16:15:15 -04:00
embeddedt
b3da731e1f
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-04 10:18:45 -04:00
embeddedt
26bc9514d7
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-04 10:15:26 -04:00
embeddedt
8b9d3cab18
Add Mod Menu compatibility 2023-05-04 10:08:58 -04:00
embeddedt
e1b29f2985
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-02 20:20:12 -04:00
embeddedt
2772351a3d
Merge remote-tracking branch 'origin/main' into 1.18 2023-05-02 20:10:40 -04:00
embeddedt
6a85047132
Add structure upgrading command 2023-05-02 20:04:54 -04:00
embeddedt
8d1a73c339
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-02 19:22:09 -04:00
embeddedt
71d7004d0c
Shrink oversized PalettedContainers 2023-05-02 19:19:57 -04:00
embeddedt
45b4b3a6f8
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-05-01 20:44:25 -04:00