Skip to content

删除原版撞 key #3422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mamaruo wants to merge 2 commits into
base: main
Choose a base branch
from
Open

删除原版撞 key #3422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e4824a
initial
mamaruo Jun 28, 2023
8c89a39
补全标记
mamaruo Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion projects/1.16/assets/shadow-x-blocks-plus/blocksplus/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"block.blocksplus.bamboo_door": "Bamboo Door",
"block.blocksplus.bamboo_sign": "Bamboo Sign",

"block.minecraft.crafting_table": "Oak Crafting Table",
"cfpa.keyconflicted.block.minecraft.crafting_table": "Oak Crafting Table",
"block.blocksplus.spruce_crafting_table": "Spruce Crafting Table",
"block.blocksplus.birch_crafting_table": "Birch Crafting Table",
"block.blocksplus.jungle_crafting_table": "Jungle Crafting Table",
Expand Down
2 changes: 1 addition & 1 deletion projects/1.16/assets/shadow-x-blocks-plus/blocksplus/lang/zh_cn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"block.blocksplus.bamboo_door": "竹木门",
"block.blocksplus.bamboo_sign": "竹木告示牌",

"block.minecraft.crafting_table": "橡木工作台",
"cfpa.keyconflicted.block.minecraft.crafting_table": "橡木工作台",
"block.blocksplus.spruce_crafting_table": "云杉木工作台",
"block.blocksplus.birch_crafting_table": "白桦木工作台",
"block.blocksplus.jungle_crafting_table": "丛林木工作台",
Expand Down
2 changes: 1 addition & 1 deletion projects/1.18/assets/shadow-x-blocks-plus/blocksplus/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"block.blocksplus.mushroom_bookshelf": "Mushroom Bookshelf",
"block.blocksplus.mushroom_ladder": "Mushroom Ladder",

"block.minecraft.crafting_table": "Oak Crafting Table",
"cfpa.keyconflicted.block.minecraft.crafting_table": "Oak Crafting Table",
"block.minecraft.bookshelf": "Oak Bookshelf",
"block.minecraft.ladder": "Oak Ladder",

Expand Down
2 changes: 1 addition & 1 deletion projects/1.18/assets/shadow-x-blocks-plus/blocksplus/lang/zh_cn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"block.blocksplus.mushroom_bookshelf": "蘑菇书架",
"block.blocksplus.mushroom_ladder": "蘑菇梯子",

"block.minecraft.crafting_table": "橡木工作台",
"cfpa.keyconflicted.block.minecraft.crafting_table": "橡木工作台",
"block.minecraft.bookshelf": "橡木书架",
"block.minecraft.ladder": "橡木梯子",

Expand Down