From 5e4824a24c58c3b9e1b636962f4adf23e30ec8cb Mon Sep 17 00:00:00 2001 From: mamaruo <37480168+mamaruo@users.noreply.github.com> Date: Thu, 29 Jun 2023 04:11:47 +0800 Subject: [PATCH 1/2] initial --- .../1.18/assets/shadow-x-blocks-plus/blocksplus/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18/assets/shadow-x-blocks-plus/blocksplus/lang/zh_cn.json b/projects/1.18/assets/shadow-x-blocks-plus/blocksplus/lang/zh_cn.json index f371620ae631..991ae3c75917 100644 --- a/projects/1.18/assets/shadow-x-blocks-plus/blocksplus/lang/zh_cn.json +++ b/projects/1.18/assets/shadow-x-blocks-plus/blocksplus/lang/zh_cn.json @@ -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": "橡木梯子", From 8c89a39f684245776619118fe36bcb661a90ca2a Mon Sep 17 00:00:00 2001 From: mamaruo <37480168+mamaruo@users.noreply.github.com> Date: Thu, 29 Jun 2023 04:19:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1.16/assets/shadow-x-blocks-plus/blocksplus/lang/en_us.json | 2 +- .../1.16/assets/shadow-x-blocks-plus/blocksplus/lang/zh_cn.json | 2 +- .../1.18/assets/shadow-x-blocks-plus/blocksplus/lang/en_us.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/1.16/assets/shadow-x-blocks-plus/blocksplus/lang/en_us.json b/projects/1.16/assets/shadow-x-blocks-plus/blocksplus/lang/en_us.json index 17af9b5bb465..705cf20235e5 100644 --- a/projects/1.16/assets/shadow-x-blocks-plus/blocksplus/lang/en_us.json +++ b/projects/1.16/assets/shadow-x-blocks-plus/blocksplus/lang/en_us.json @@ -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", diff --git a/projects/1.16/assets/shadow-x-blocks-plus/blocksplus/lang/zh_cn.json b/projects/1.16/assets/shadow-x-blocks-plus/blocksplus/lang/zh_cn.json index 958a896fdf1e..5b40fb16666e 100644 --- a/projects/1.16/assets/shadow-x-blocks-plus/blocksplus/lang/zh_cn.json +++ b/projects/1.16/assets/shadow-x-blocks-plus/blocksplus/lang/zh_cn.json @@ -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": "丛林木工作台", diff --git a/projects/1.18/assets/shadow-x-blocks-plus/blocksplus/lang/en_us.json b/projects/1.18/assets/shadow-x-blocks-plus/blocksplus/lang/en_us.json index 6acbe0886dbc..b33455931e0c 100644 --- a/projects/1.18/assets/shadow-x-blocks-plus/blocksplus/lang/en_us.json +++ b/projects/1.18/assets/shadow-x-blocks-plus/blocksplus/lang/en_us.json @@ -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",