From 935135b01717d6459a8872b60f51f26d167977f4 Mon Sep 17 00:00:00 2001 From: mamaruo Date: Sun, 6 Feb 2022 16:10:55 +0800 Subject: [PATCH 01/29] Update zh_cn.lang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 器具：前后都是器具，原词是 item，玄钢升级不止能安装在工具上，还有盔甲。 自动跳跃：意义不明的加译，原文没有 --- projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang index eb3c6dea3caf..d959bb1c4734 100644 --- a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang +++ b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang @@ -940,7 +940,7 @@ enderio.darksteel.upgrades.tooltip.dependencies=前置升级： enderio.darksteel.upgrades.tooltip.itemclasses=可安装此升级的器具： enderio.darksteel.upgrades.tooltip.levels.line1=需要 %s 级经验来激活此升级 enderio.darksteel.upgrades.tooltip.levels.line2=（右击消耗对应等级经验以激活此升级） -enderio.darksteel.upgrades.tooltip.apply.line1=需要安装在一个对应工具上 +enderio.darksteel.upgrades.tooltip.apply.line1=需要安装在一个对应器具上 enderio.darksteel.upgrades.tooltip.apply.line2=（在玄钢砧或黑纸砧中安装，或装备含有玄钢砧升级的器具 Shift 右击打开 GUI 安装） enderio.darksteel.upgrades.check.prerequisite.missing=需要安装"%s" @@ -1028,7 +1028,7 @@ enderio.darksteel.upgrade.jump_one.tooltip.detailed.line1=加入步行辅助功 enderio.darksteel.upgrade.jump_one.enabled=启用跳跃 enderio.darksteel.upgrade.jump_one.disabled=禁用跳跃 -enderio.darksteel.upgrade.step_assist.name=步行辅助（自动跳跃） +enderio.darksteel.upgrade.step_assist.name=步行辅助 enderio.darksteel.upgrade.step_assist.tooltip.detailed.line1=允许你自动走上一格高的方块 enderio.darksteel.upgrade.step_assist.enabled=启用步行辅助 enderio.darksteel.upgrade.step_assist.disabled=禁用步行辅助 From 0c872608407e05d90a56beb311daf6465045a413 Mon Sep 17 00:00:00 2001 From: mamaruo Date: Sun, 6 Feb 2022 16:16:33 +0800 Subject: [PATCH 02/29] Update zh_cn.lang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 该文字是开关功能的弹出提示 --- projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang index d959bb1c4734..7ea50930e4e4 100644 --- a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang +++ b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang @@ -1025,8 +1025,8 @@ enderio.darksteel.upgrade.thaumaturge_robes.feet.tooltip.detailed.line1=要素 enderio.darksteel.upgrade.jump_one.name=跳跃 I enderio.darksteel.upgrade.jump_one.tooltip.detailed.line1=加入步行辅助功能并提高跳跃高度 -enderio.darksteel.upgrade.jump_one.enabled=启用跳跃 -enderio.darksteel.upgrade.jump_one.disabled=禁用跳跃 +enderio.darksteel.upgrade.jump_one.enabled=跳跃已启用 +enderio.darksteel.upgrade.jump_one.disabled=跳跃已禁用 enderio.darksteel.upgrade.step_assist.name=步行辅助 enderio.darksteel.upgrade.step_assist.tooltip.detailed.line1=允许你自动走上一格高的方块 From e2e972a1fcd6fa0054bcd83388cdb676dc7e4d1e Mon Sep 17 00:00:00 2001 From: mamaruo Date: Sun, 6 Feb 2022 17:09:32 +0800 Subject: [PATCH 03/29] Update zh_cn.lang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 皆为弹出提示 --- .../assets/1UNKNOWN/enderio/lang/zh_cn.lang | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang index 7ea50930e4e4..02ab1e513cc3 100644 --- a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang +++ b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang @@ -1030,8 +1030,8 @@ enderio.darksteel.upgrade.jump_one.disabled=跳跃已禁用 enderio.darksteel.upgrade.step_assist.name=步行辅助 enderio.darksteel.upgrade.step_assist.tooltip.detailed.line1=允许你自动走上一格高的方块 -enderio.darksteel.upgrade.step_assist.enabled=启用步行辅助 -enderio.darksteel.upgrade.step_assist.disabled=禁用步行辅助 +enderio.darksteel.upgrade.step_assist.enabled=步行辅助已启用 +enderio.darksteel.upgrade.step_assist.disabled=步行辅助已禁用 enderio.gui.step_assis_unavailable=步行辅助似乎被其他模组禁用了 @@ -1045,8 +1045,8 @@ enderio.darksteel.upgrade.jump_three.tooltip.detailed.line2=允许三段跳跃 enderio.darksteel.upgrade.speed_one.name=速度 I enderio.darksteel.upgrade.speed_one.tooltip.detailed.line1=增加移动速度 -enderio.darksteel.upgrade.speed_one.enabled=启用加速 -enderio.darksteel.upgrade.speed_one.disabled=禁用加速 +enderio.darksteel.upgrade.speed_one.enabled=加速已启用 +enderio.darksteel.upgrade.speed_one.disabled=加速已禁用 enderio.darksteel.upgrade.speed_two.name=速度 II enderio.darksteel.upgrade.speed_two.tooltip.detailed.line1=增加移动速度 @@ -1057,12 +1057,12 @@ enderio.darksteel.upgrade.speed_three.tooltip.detailed.line1=增加移动速度 enderio.darksteel.upgrade.swim.name=脚蹼 enderio.darksteel.upgrade.nightVision.name=夜视 -enderio.darksteel.upgrade.nightVision.enabled=启用夜视 -enderio.darksteel.upgrade.nightVision.disabled=禁用夜视 +enderio.darksteel.upgrade.nightVision.enabled=夜视已启用 +enderio.darksteel.upgrade.nightVision.disabled=夜视已禁用 enderio.darksteel.upgrade.top.name=TOP 功能 -enderio.darksteel.upgrade.top.enabled=开启 TOP -enderio.darksteel.upgrade.top.disabled=禁用 TOP +enderio.darksteel.upgrade.top.enabled=TOP 已启用 +enderio.darksteel.upgrade.top.disabled=TOP已禁用 # These are used for the "The One Probe" integration enderio.top.action.header.pre=§e From 3a71219d7b76e567cbc481e449d70a64e20cca12 Mon Sep 17 00:00:00 2001 From: mamaruo Date: Sun, 6 Feb 2022 17:42:01 +0800 Subject: [PATCH 04/29] Update zh_cn.lang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 句号，对应原文 --- .../1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang index 02ab1e513cc3..3f5c92d58d8c 100644 --- a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang +++ b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang @@ -919,16 +919,16 @@ attribute.name.enderio.aoe.y=挖掘深度 attribute.name.enderio.aoe.xyz=挖掘体积 enderio.darksteel.upgrade.anvil.0.name=微型玄钢砧 -enderio.darksteel.upgrade.anvil.0.tooltip.detailed.line1=允许本物品的铁砧升级进行安装和取出 -enderio.darksteel.upgrade.anvil.0.tooltip.detailed.line2=按下快捷键或者 Shift 右击打开本物品的升级安装页面 +enderio.darksteel.upgrade.anvil.0.tooltip.detailed.line1=允许本物品的铁砧升级进行安装和取出。 +enderio.darksteel.upgrade.anvil.0.tooltip.detailed.line2=按下快捷键或者 Shift 右击打开本物品的升级安装页面。 enderio.darksteel.upgrade.anvil.1.name=迷你玄钢砧 -enderio.darksteel.upgrade.anvil.1.tooltip.detailed.line1=允许所有穿戴和使用物品的铁砧升级进行安装和取出 -enderio.darksteel.upgrade.anvil.1.tooltip.detailed.line2=按下快捷键或者 Shift 右击打开所有穿戴和使用物品的升级安装页面 +enderio.darksteel.upgrade.anvil.1.tooltip.detailed.line1=允许所有穿戴和使用物品的铁砧升级进行安装和取出。 +enderio.darksteel.upgrade.anvil.1.tooltip.detailed.line2=按下快捷键或者 Shift 右击打开所有穿戴和使用物品的升级安装页面。 enderio.darksteel.upgrade.anvil.2.name=口袋玄钢砧 -enderio.darksteel.upgrade.anvil.2.tooltip.detailed.line1=可以使用本物品打开玄钢砧的页面，本物品具有和玄钢砧相同的功能 -enderio.darksteel.upgrade.anvil.2.tooltip.detailed.line2=按下快捷键或者 Shift 右击打开玄钢砧页面 +enderio.darksteel.upgrade.anvil.2.tooltip.detailed.line1=可以使用本物品打开玄钢砧的页面，本物品具有和玄钢砧相同的功能。 +enderio.darksteel.upgrade.anvil.2.tooltip.detailed.line2=按下快捷键或者 Shift 右击打开玄钢砧页面。 item.item_dark_steel_upgrade.name=空白玄钢升级 item.item_dark_steel_upgrade.with=玄钢升级（%s） From 53f18f1955bbd7dfbaaeb4d144f3e8c2568c5bfa Mon Sep 17 00:00:00 2001 From: mamaruo Date: Sun, 6 Feb 2022 17:47:02 +0800 Subject: [PATCH 05/29] =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=94=B9=E6=BC=8F=E4=BA=86=EF=BC=8C=E8=A1=A5=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang index 3f5c92d58d8c..2da0cb1c18cc 100644 --- a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang +++ b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang @@ -975,19 +975,19 @@ enderio.darksteel.upgrade.depth.tooltip.detailed.line1=指引爆炸之力远离 enderio.darksteel.upgrade.glider.name=滑翔 enderio.darksteel.upgrade.glider.tooltip.detailed.line1=滑翔：开启 -enderio.darksteel.upgrade.glider.enabled=启用滑翔 -enderio.darksteel.upgrade.glider.disabled=禁用滑翔 +enderio.darksteel.upgrade.glider.enabled=滑翔已启用 +enderio.darksteel.upgrade.glider.disabled=滑翔已禁用 enderio.darksteel.upgrade.elytra.name=鞘翅 enderio.darksteel.upgrade.elytra.tooltip.detailed.line1=使胸甲拥有鞘翅的功能 enderio.darksteel.upgrade.elytra.tooltip.detailed.line2=§4（需要装备鞘翅以飞行，非“创造模式”飞行） -enderio.darksteel.upgrade.elytra.enabled=启用鞘翅 -enderio.darksteel.upgrade.elytra.disabled=禁用鞘翅 +enderio.darksteel.upgrade.elytra.enabled=鞘翅已启用 +enderio.darksteel.upgrade.elytra.disabled=鞘翅已禁用 enderio.darksteel.upgrade.sound.name=声波定位 enderio.darksteel.upgrade.sound.tooltip.detailed.line1=显示附近声源的位置 -enderio.darksteel.upgrade.sound.enabled=启用声波定位 -enderio.darksteel.upgrade.sound.disabled=禁用声波定位 +enderio.darksteel.upgrade.sound.enabled=声波定位已启用 +enderio.darksteel.upgrade.sound.disabled=声波定位已禁用 enderio.darksteel.upgrade.padding.name=填充 enderio.darksteel.upgrade.padding.tooltip.detailed.line1=模糊不清的声音 From 4f5a3ef8f10efd0ad63d0b92e5704f67c7626f6b Mon Sep 17 00:00:00 2001 From: mamaruo Date: Sun, 6 Feb 2022 17:52:35 +0800 Subject: [PATCH 06/29] =?UTF-8?q?=E5=B0=91=E4=B8=AA=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang index 2da0cb1c18cc..e1a2039b069a 100644 --- a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang +++ b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang @@ -1062,7 +1062,7 @@ enderio.darksteel.upgrade.nightVision.disabled=夜视已禁用 enderio.darksteel.upgrade.top.name=TOP 功能 enderio.darksteel.upgrade.top.enabled=TOP 已启用 -enderio.darksteel.upgrade.top.disabled=TOP已禁用 +enderio.darksteel.upgrade.top.disabled=TOP 已禁用 # These are used for the "The One Probe" integration enderio.top.action.header.pre=§e From ad1926a4f16347b7b4b68913047f8d3a26f65ba9 Mon Sep 17 00:00:00 2001 From: mamaruo Date: Wed, 9 Feb 2022 14:43:04 +0800 Subject: [PATCH 07/29] =?UTF-8?q?=E9=81=B5=E5=BE=AA=E8=AF=91=E5=90=8D?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=9B=B4=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang index a198dd555dd0..69d66c20e678 100644 --- a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang +++ b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang @@ -618,10 +618,10 @@ tile.block_painted_pressure_plate.soularium.silent.name=魂金压力板（静音 tile.block_painted_pressure_plate.soularium.silent.tooltip.detailed.line1=只能被敌对生物激活。 tile.block_painted_pressure_plate.soularium.silent.tooltip.detailed.line2=可在喷涂机喷涂，用纯净玻璃喷涂后会隐形 tile.block_painted_pressure_plate.soularium.silent.tooltip.detailed.line3=可在灵魂绑定器中调整设定。 -tile.block_painted_pressure_plate.stone.name=石压力板 +tile.block_painted_pressure_plate.stone.name=石头压力板 tile.block_painted_pressure_plate.stone.tooltip.detailed.line1=只能被生物和玩家激活。 tile.block_painted_pressure_plate.stone.tooltip.detailed.line2=可在喷涂机喷涂，用纯净玻璃喷涂后会隐形 -tile.block_painted_pressure_plate.stone.silent.name=石压力板（静音） +tile.block_painted_pressure_plate.stone.silent.name=石头压力板（静音） tile.block_painted_pressure_plate.stone.silent.tooltip.detailed.line1=只能被生物和玩家激活。 tile.block_painted_pressure_plate.stone.silent.tooltip.detailed.line2=可在喷涂机喷涂，用纯净玻璃喷涂后会隐形 tile.block_painted_pressure_plate.tuned.name=魂金压力板（已配置） @@ -633,9 +633,9 @@ tile.block_painted_pressure_plate.tuned.silent.name=魂金压力板（已配置 tile.block_painted_pressure_plate.tuned.silent.tooltip.detailed.line1=只能被指定敌对生物激活。 tile.block_painted_pressure_plate.tuned.silent.tooltip.detailed.line2=可在喷涂机喷涂，用纯净玻璃喷涂后会隐形 tile.block_painted_pressure_plate.tuned.silent.tooltip.detailed.line3=可在灵魂绑定器中调整设定。 -tile.block_painted_pressure_plate.wood.name=木压力板 +tile.block_painted_pressure_plate.wood.name=木质压力板 tile.block_painted_pressure_plate.wood.tooltip.detailed.line1=可在喷涂机喷涂，用纯净玻璃喷涂后会隐形 -tile.block_painted_pressure_plate.wood.silent.name=木压力板（静音） +tile.block_painted_pressure_plate.wood.silent.name=木质压力板（静音） tile.block_painted_pressure_plate.wood.silent.tooltip.detailed.line1=可在喷涂机喷涂，用纯净玻璃喷涂后会隐形 tile.block_painted_redstone.name=喷涂红石 From f2136f0573ae1fa5d128437a0b7699d0a8ce9f1f Mon Sep 17 00:00:00 2001 From: mamaruo Date: Wed, 9 Feb 2022 14:56:48 +0800 Subject: [PATCH 08/29] Update zh_cn.lang --- projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang index 69d66c20e678..8761f3299339 100644 --- a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang +++ b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang @@ -651,7 +651,7 @@ tile.block_painted_stone_fence.name=喷涂石栅栏 tile.block_painted_stone_slab.name=喷涂石台阶 tile.block_painted_stone_stair.name=喷涂石楼梯 tile.block_painted_wall.name=喷涂墙 -tile.block_painted_wooden_trapdoor.name=喷涂木活板门 +tile.block_painted_wooden_trapdoor.name=喷涂木质活板门 tile.block_painted_workbench.name=喷涂工作台 tile.block_painted_reinforced_obsidian.name=喷涂强化黑曜石 tile.block_painted_reinforced_obsidian.tooltip.common.line1=能抵挡凋零爆炸 From 94b012684beced95c90d86b3cc49db8d7782407c Mon Sep 17 00:00:00 2001 From: mamaruo Date: Wed, 9 Feb 2022 21:28:45 +0800 Subject: [PATCH 09/29] Update zh_cn.lang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 译名标准化（2018年版）里写“石头压力板”，游戏里是“石质”，离谱 --- projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang index 8761f3299339..f4a9c18ee0e8 100644 --- a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang +++ b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang @@ -618,10 +618,10 @@ tile.block_painted_pressure_plate.soularium.silent.name=魂金压力板（静音 tile.block_painted_pressure_plate.soularium.silent.tooltip.detailed.line1=只能被敌对生物激活。 tile.block_painted_pressure_plate.soularium.silent.tooltip.detailed.line2=可在喷涂机喷涂，用纯净玻璃喷涂后会隐形 tile.block_painted_pressure_plate.soularium.silent.tooltip.detailed.line3=可在灵魂绑定器中调整设定。 -tile.block_painted_pressure_plate.stone.name=石头压力板 +tile.block_painted_pressure_plate.stone.name=石质压力板 tile.block_painted_pressure_plate.stone.tooltip.detailed.line1=只能被生物和玩家激活。 tile.block_painted_pressure_plate.stone.tooltip.detailed.line2=可在喷涂机喷涂，用纯净玻璃喷涂后会隐形 -tile.block_painted_pressure_plate.stone.silent.name=石头压力板（静音） +tile.block_painted_pressure_plate.stone.silent.name=石质压力板（静音） tile.block_painted_pressure_plate.stone.silent.tooltip.detailed.line1=只能被生物和玩家激活。 tile.block_painted_pressure_plate.stone.silent.tooltip.detailed.line2=可在喷涂机喷涂，用纯净玻璃喷涂后会隐形 tile.block_painted_pressure_plate.tuned.name=魂金压力板（已配置） @@ -651,7 +651,7 @@ tile.block_painted_stone_fence.name=喷涂石栅栏 tile.block_painted_stone_slab.name=喷涂石台阶 tile.block_painted_stone_stair.name=喷涂石楼梯 tile.block_painted_wall.name=喷涂墙 -tile.block_painted_wooden_trapdoor.name=喷涂木质活板门 +tile.block_painted_wooden_trapdoor.name=喷涂木活板门 tile.block_painted_workbench.name=喷涂工作台 tile.block_painted_reinforced_obsidian.name=喷涂强化黑曜石 tile.block_painted_reinforced_obsidian.tooltip.common.line1=能抵挡凋零爆炸 From 786e7d8f81611156688c86238ff62e5d5005d407 Mon Sep 17 00:00:00 2001 From: mamaruo Date: Thu, 17 Feb 2022 23:40:19 +0800 Subject: [PATCH 10/29] Revert "hmm" This reverts commit fcab462f1e972eeae402d16c777ea73e06374018. --- projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang index f4a9c18ee0e8..498557b6e1cc 100644 --- a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang +++ b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang @@ -780,7 +780,7 @@ enderio.config.items.darksteel.upgrades.gogglesofrevealing=头盔：揭示之护 enderio.config.items.darksteel.upgrades.soundlocator=头盔：声波定位升级 enderio.config.items.darksteel.upgrades.travel=镐/剑：旅行升级 enderio.config.items.darksteel.upgrades.spoon=镐：勺子（锹）升级 -enderio.config.items.darksteel.upgrades.padding=头盔：隔音升级 +enderio.config.items.darksteel.upgrades.padding=头盔：填充升级 enderio.config.recipe=配方设置 enderio.config.recipe.tooltip=配置所有东西！ @@ -989,8 +989,8 @@ enderio.darksteel.upgrade.sound.tooltip.detailed.line1=显示附近声源的位 enderio.darksteel.upgrade.sound.enabled=声波定位已启用 enderio.darksteel.upgrade.sound.disabled=声波定位已禁用 -enderio.darksteel.upgrade.padding.name=隔音 -enderio.darksteel.upgrade.padding.tooltip.detailed.line1=隔绝周围的声音 +enderio.darksteel.upgrade.padding.name=填充 +enderio.darksteel.upgrade.padding.tooltip.detailed.line1=模糊不清的声音 enderio.darksteel.upgrade.direct.name=存入 enderio.darksteel.upgrade.direct.tooltip.detailed.line1=将挖掘得到的东西直接传送到你的物品栏 From a85ccaab0422bf1eb572f698c36e29bbb9050c0f Mon Sep 17 00:00:00 2001 From: mamaruo Date: Thu, 17 Feb 2022 23:41:34 +0800 Subject: [PATCH 11/29] Revert "dimtrc" This reverts commit 499d87ef514e481f36ff5e3d602b6922d461d1fb. --- projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang index 498557b6e1cc..2f32a3e0cf38 100644 --- a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang +++ b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang @@ -2409,7 +2409,7 @@ tile.block_dialing_device.tooltip.detailed.line1=放在传送台旁边 tile.block_dialing_device.tooltip.detailed.line2=存储和设置目的地。 -tile.block_transceiver.name=跨维度收发器 +tile.block_transceiver.name=空间传送器 tile.block_transceiver.tooltip.detailed.line1=在不同维度之间跨距离无线传输物品，流体和能量 tile.block_vacuum_chest.name=吸物箱 @@ -2542,7 +2542,7 @@ enderio.config.inhibitor=传送抑制方尖碑 enderio.config.killerjoe=杀手乔 enderio.config.experience=经验方尖碑 enderio.config.tank=流体储罐 -enderio.config.tranceiver=跨维度收发器 +enderio.config.tranceiver=空间传送器 enderio.config.generator=发电机 enderio.config.generator.combustion=燃烧发电机 From 3535fe4c730951f3073ddcfcf37e3a179b122f85 Mon Sep 17 00:00:00 2001 From: mamaruo Date: Thu, 17 Feb 2022 23:51:11 +0800 Subject: [PATCH 12/29] Revert "staff no power" This reverts commit 065b6e34f73c0d44d1cb2b3e7093f4679ed96b16. --- .../1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang index 2f32a3e0cf38..3969e9274f21 100644 --- a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang +++ b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang @@ -304,7 +304,7 @@ item.item_material.infinity_rod.name=无尽之杆 item.item_material.glazed_nether_brick.name=釉制地狱砖 item.item_material.infinity_goop.name=无尽试剂 item.item_material.infinity_goop.tooltip.detailed.line1=一种无尽的、粘稠的物质，用于传导能量。 -item.item_material.infinity_goop.tooltip.detailed.line2=有一次，Randalf 得到了这些玩意，然后在旅行之杖里被困了整整六个月…… +item.item_material.infinity_goop.tooltip.detailed.line2=有一次，Randalf 得到了这些玩意，然后他被困在旅行权杖长达六个月…… item.item_material.clayed_glowstone.name=粘土荧石粉 item.item_material.black_paper.name=黑纸 item.item_material.token_animal.name=动物标记徽章 @@ -358,7 +358,7 @@ item.item_soul_vial.tooltip.fluidname=流体名：%s item.item_soul_vial.tooltip.color=颜色：%s item.item_soul_vial.tooltip.empty=空 -item.item_travel_staff.name=旅行之杖 +item.item_travel_staff.name=旅行权杖 item.item_travel_staff.tooltip.detailed.line1=手持旅行锚时 item.item_travel_staff.tooltip.detailed.line2=可以透视锚点 item.item_travel_staff.tooltip.detailed.line3=右击直接传送 @@ -367,8 +367,8 @@ item.item_travel_staff.tooltip.detailed.line5=可短距离传送玩家 item.item_travel_staff.chat.notEnoughPower=能量不足 item.item_staff_of_levity.name=飘浮权杖 -item.item_staff_of_levity.tooltip.detailed.line1=Shift 右击来对目标玩家 -item.item_staff_of_levity.tooltip.detailed.line2=施加反重力效果 +item.item_staff_of_levity.tooltip.detailed.line1=作用反重力效果 +item.item_staff_of_levity.tooltip.detailed.line2=到 Shift 右击的玩家 item.item_xp_transfer.name=经验棒 item.item_xp_transfer.tooltip.detailed.line1=右击装有液态经验的 @@ -382,7 +382,7 @@ item.item_yeta_wrench.tooltip.detailed.line2=Shift 右击可立即 item.item_yeta_wrench.tooltip.detailed.line3=拆除机器与导管 item.item_yeta_wrench.tooltip.detailed.line4=Shift 左击一个导管 item.item_yeta_wrench.tooltip.detailed.line5=可打开导管设置 GUI -item.item_yeta_wrench.tooltip.detailed.line6=Shift + 鼠标滚轮或者按“%s”键 +item.item_yeta_wrench.tooltip.detailed.line6=Shift + 鼠标滚轮或者按 “%s” 键 item.item_yeta_wrench.tooltip.detailed.line7=可渲染单种类型导管 item.item_enderface.name=末影接口 @@ -2199,7 +2199,7 @@ enderio.gui.travel_accessable.promp.login=授权 enderio.chat.travel_accessable.error.private=只有 §4%s §f才能改变该方块的设置。 enderio.chat.travel_accessable.error.harvest=只有 §4%s §f才能挖掘该方块。 enderio.gui.travel_accessable.visible.line1=透明 -enderio.gui.travel_accessable.visible.line2=开启时，该方块只有在手持旅行之杖或站在旅行锚上时才能被看见 +enderio.gui.travel_accessable.visible.line2=开启时，该方块只有在手持旅行权杖或站在旅行锚上时才能被看见 enderio.chat.telepad.noFluid=%s 不足以传送！ enderio.gui.telepad.configure.travel=传送设置 @@ -2396,7 +2396,7 @@ tile.block_tank.tooltip.detailed.line2=可用于清空或填满流体容器 tile.block_travel_anchor.name=旅行锚 tile.block_travel_anchor.tooltip.detailed.line1=可让你在锚点之间传送 tile.block_travel_anchor.tooltip.detailed.line2=站在锚点上指向另一个锚点，按下跳跃键进行传送 -tile.block_travel_anchor.tooltip.detailed.line4=也可以使用旅行之杖来使用旅行锚 +tile.block_travel_anchor.tooltip.detailed.line4=也可以使用旅行权杖来使用旅行锚 tile.block_travel_anchor.tooltip.detailed.line6=可在喷涂机喷涂 From ec9fd067b2298245de751e2656bf34211c39aa6d Mon Sep 17 00:00:00 2001 From: mamaruo Date: Thu, 17 Feb 2022 23:53:08 +0800 Subject: [PATCH 13/29] Revert "vacuum dat vacuum" This reverts commit 38d18ca7aae6c9e18bed19e67cb2132b19233d82. --- .../assets/1UNKNOWN/enderio/lang/zh_cn.lang | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang index 3969e9274f21..816c2fdaa500 100644 --- a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang +++ b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang @@ -494,11 +494,11 @@ tile.block_decoration2.type10.name=斯特林发电机（装饰方块） tile.block_decoration2.type11.name=流体储罐（装饰方块） tile.block_decoration2.type12.name=高压流体储罐（装饰方块） tile.block_decoration2.type13.name=旅行锚（装饰方块） -tile.block_decoration2.type14.name=吸物箱（装饰方块） +tile.block_decoration2.type14.name=虚空箱子（装饰方块） tile.block_decoration2.type15.name=无线充能器（装饰方块） tile.block_decoration3.name=装饰方块 -tile.block_decoration3.type00.name=经验吸取箱（装饰方块） +tile.block_decoration3.type00.name=虚空经验箱（装饰方块） tile.block_decoration3.type01.name=简易合金炉（装饰方块） tile.block_decoration3.type02.name=简易斯特林发电机（装饰方块） tile.block_decoration3.type03.name=有线充能器（装饰方块） @@ -2169,11 +2169,11 @@ enderio.chat.vat.dump.fail=导出失败，输出槽非空 enderio.chat.vat.dump.active=导出失败，不能在酿液桶工作时导出 enderio.gui.vacuum.range=吸取强度 -enderio.gui.vacuum.header.chest=吸物箱 +enderio.gui.vacuum.header.chest=虚空箱子 enderio.gui.vacuum.header.filter=物品过滤器 enderio.gui.vacuum.header.range=范围 -enderio.gui.vacuum.xp.header=经验吸取箱 -enderio.gui.vacuum.prime=使用一桶液态经验右击以激活经验吸取箱。 +enderio.gui.vacuum.xp.header=虚空经验箱 +enderio.gui.vacuum.prime=使用一桶液态经验右击以激活虚空经验箱。 enderio.gui.trans.publicChannel=公共频道 enderio.gui.trans.privateChannel=私人频道 @@ -2412,11 +2412,11 @@ tile.block_dialing_device.tooltip.detailed.line2=存储和设置目的地。 tile.block_transceiver.name=空间传送器 tile.block_transceiver.tooltip.detailed.line1=在不同维度之间跨距离无线传输物品，流体和能量 -tile.block_vacuum_chest.name=吸物箱 +tile.block_vacuum_chest.name=虚空箱子 tile.block_vacuum_chest.tooltip.detailed.line1=将附近的物品吸入其中 -tile.block_xp_vacuum.name=经验吸取箱 +tile.block_xp_vacuum.name=虚空经验箱 tile.block_xp_vacuum.tooltip.detailed.line1=吸引附近的经验球并将它们送入相邻的储罐/导管。 tile.block_xp_vacuum.tooltip.detailed.line2=需使用液态经验激活。 @@ -2532,7 +2532,7 @@ enderio.config.client=客户端设置 enderio.config.soulbinder=灵魂绑定器 enderio.config.spawner=电动刷怪箱 enderio.config.spawner.tooltip=我想不出幽默的注释。 -enderio.config.vacuum=吸物箱与经验吸取箱 +enderio.config.vacuum=虚空箱子与虚空经验箱 enderio.config.vat=酿液桶 enderio.config.telepad=传送台 enderio.config.weather=天气方尖碑 From 678a64f320a4230f40a9f921c03208f31bb22d9a Mon Sep 17 00:00:00 2001 From: mamaruo Date: Thu, 17 Feb 2022 23:55:00 +0800 Subject: [PATCH 14/29] Revert "pulse vibra stuff ii" This reverts commit b51f96f8fad660f318b5502d839d06c93127c785. --- projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang index 816c2fdaa500..127e05ed63c7 100644 --- a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang +++ b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang @@ -241,8 +241,8 @@ item.item_material.powder_tin.name=锡粉 item.item_material.powder_soul.name=魂金粉 item.item_material.precient_crystal.name=预知水晶 item.item_material.precient_powder.name=预知水晶粉 -item.item_material.pulsating_crystal.name=脉冲水晶 -item.item_material.pulsating_powder.name=脉冲水晶粉 +item.item_material.pulsating_crystal.name=充能水晶 +item.item_material.pulsating_powder.name=充能水晶粉 item.item_material.silicon.name=硅 item.item_material.skull_ender_resonator.name=末影谐振器 item.item_material.skull_sentient_ender.name=意识末影谐振器 From 23e35a351f9ba1ea42e521f58da252b826129203 Mon Sep 17 00:00:00 2001 From: mamaruo Date: Fri, 18 Feb 2022 00:21:58 +0800 Subject: [PATCH 15/29] =?UTF-8?q?=E6=8C=AF=E5=8A=A8=E6=94=B9=E5=9B=9E?= =?UTF-8?q?=E8=84=89=E5=86=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/1UNKNOWN/simplyjetpacks/lang/zh_cn.lang | 8 ++++---- .../assets/exchangers/exchangers/lang/zh_cn.lang | 2 +- .../extra-anvils/extraanvils/lang/zh_cn.lang | 6 +++--- .../f0-resources/lang/zh_cn.lang | 2 +- .../ignition-foundry/foundry/lang/zh_cn.lang | 4 ++-- .../moar-tinkers/moartinkers/lang/zh_cn.lang | 2 +- .../assets/moarsigns/moarsigns/lang/zh_cn.lang | 2 +- .../assets/moreplates/moreplates/lang/zh_cn.lang | 4 ++-- .../mysticalagriculture/lang/zh_cn.lang | 6 +++--- .../assets/redstonic/redstonic/lang/zh_cn.lang | 6 +++--- .../simplyjetpacks/lang/zh_cn.lang | 14 +++++++------- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/projects/1.12.2/assets/1UNKNOWN/simplyjetpacks/lang/zh_cn.lang b/projects/1.12.2/assets/1UNKNOWN/simplyjetpacks/lang/zh_cn.lang index 1b3f842b1307..f0ae0c9ef6c9 100644 --- a/projects/1.12.2/assets/1UNKNOWN/simplyjetpacks/lang/zh_cn.lang +++ b/projects/1.12.2/assets/1UNKNOWN/simplyjetpacks/lang/zh_cn.lang @@ -28,7 +28,7 @@ item.simplyjetpacks.armorplating_eio4.name=玄钢护甲板 item.simplyjetpacks.thruster_eio1.name=导电铁推进器 item.simplyjetpacks.thruster_eio2.name=磁钢推进器 item.simplyjetpacks.thruster_eio3.name=充能合金推进器 -item.simplyjetpacks.thruster_eio4.name=振动合金推进器 +item.simplyjetpacks.thruster_eio4.name=脉冲合金推进器 item.simplyjetpacks.thruster_eio5.name=玄色魂金推进器 item.simplyjetpacks.jetpack_eio1.name=导电铁喷气背包 item.simplyjetpacks.jetpack_eio1_armored.name=导电铁喷气背包（装甲式） @@ -36,8 +36,8 @@ item.simplyjetpacks.jetpack_eio2.name=磁钢喷气背包 item.simplyjetpacks.jetpack_eio2_armored.name=磁钢喷气背包（装甲式） item.simplyjetpacks.jetpack_eio3.name=充能合金喷气背包 item.simplyjetpacks.jetpack_eio3_armored.name=充能合金喷气背包（装甲式） -item.simplyjetpacks.jetpack_eio4.name=振动合金喷气背包 -item.simplyjetpacks.jetpack_eio4_armored.name=振动合金喷气背包（装甲式） +item.simplyjetpacks.jetpack_eio4.name=脉冲合金喷气背包 +item.simplyjetpacks.jetpack_eio4_armored.name=脉冲合金喷气背包（装甲式） item.simplyjetpacks.jetpack_eio5.name=玄色魂金喷气背包（装甲式） item.simplyjetpacks.fluxpack_eio1.name=基础电容背包 item.simplyjetpacks.fluxpack_eio1_armored.name=基础电容背包 护甲 @@ -334,7 +334,7 @@ advancement.simplyjetpacks.eio.desc=启用末影接口集成 advancement.simplyjetpacks.jetpack_eio1.desc=获得导电铁喷气背包 advancement.simplyjetpacks.jetpack_eio2.desc=获得磁钢喷气背包 advancement.simplyjetpacks.jetpack_eio3.desc=获得充能合金喷气背包 -advancement.simplyjetpacks.jetpack_eio4.desc=获得振动合金喷气背包 +advancement.simplyjetpacks.jetpack_eio4.desc=获得脉冲合金喷气背包 advancement.simplyjetpacks.jetpack_eio5.desc=获得玄色魂金喷气背包（装甲式） advancement.simplyjetpacks.te.title=热力膨胀喷气背包 advancement.simplyjetpacks.te.desc=启用热力膨胀集成 diff --git a/projects/1.12.2/assets/exchangers/exchangers/lang/zh_cn.lang b/projects/1.12.2/assets/exchangers/exchangers/lang/zh_cn.lang index 37f4c3bbb6f0..6167c5d7720f 100644 --- a/projects/1.12.2/assets/exchangers/exchangers/lang/zh_cn.lang +++ b/projects/1.12.2/assets/exchangers/exchangers/lang/zh_cn.lang @@ -84,7 +84,7 @@ item.exchangers.te_exchanger_core_tier2.name=热力膨胀交换器核心（等 item.exchangers.te_exchanger_core_tier3.name=热力膨胀交换器核心（等级 3） item.exchangers.tuberous_exchanger.name=§e马铃薯方块交换器 item.exchangers.ultimate_exchanger.name=终极方块交换器 -item.exchangers.vibrant_exchanger.name=振动合金方块交换器 +item.exchangers.vibrant_exchanger.name=脉冲合金方块交换器 item.exchangers.wooden_exchanger.name=§a木质方块交换器 itemGroup.exchangers=方块交换器 key.categories.exchangers=方块交换器 diff --git a/projects/1.12.2/assets/extra-anvils/extraanvils/lang/zh_cn.lang b/projects/1.12.2/assets/extra-anvils/extraanvils/lang/zh_cn.lang index 50f9f5251645..41909d80af18 100644 --- a/projects/1.12.2/assets/extra-anvils/extraanvils/lang/zh_cn.lang +++ b/projects/1.12.2/assets/extra-anvils/extraanvils/lang/zh_cn.lang @@ -74,9 +74,9 @@ tile.extraanvils:bronze_anvil.name=青铜砧 tile.extraanvils:bronze_anvil_chipped.name=轻微损坏的青铜砧 tile.extraanvils:bronze_anvil_damaged.name=严重损坏的青铜砧 -tile.extraanvils:vibrant_alloy_anvil.name=振动合金砧 -tile.extraanvils:vibrant_alloy_anvil_chipped.name=轻微损坏的振动合金砧 -tile.extraanvils:vibrant_alloy_anvil_damaged.name=严重损坏的振动合金砧 +tile.extraanvils:vibrant_alloy_anvil.name=脉冲合金砧 +tile.extraanvils:vibrant_alloy_anvil_chipped.name=轻微损坏的脉冲合金砧 +tile.extraanvils:vibrant_alloy_anvil_damaged.name=严重损坏的脉冲合金砧 tile.extraanvils:energetic_alloy_anvil.name=充能合金砧 tile.extraanvils:energetic_alloy_anvil_chipped.name=轻微损坏的充能合金砧 tile.extraanvils:energetic_alloy_anvil_damaged.name=严重损坏的充能合金砧 diff --git a/projects/1.12.2/assets/factory0-resources/f0-resources/lang/zh_cn.lang b/projects/1.12.2/assets/factory0-resources/f0-resources/lang/zh_cn.lang index efc3943392da..b99c89d8016a 100644 --- a/projects/1.12.2/assets/factory0-resources/f0-resources/lang/zh_cn.lang +++ b/projects/1.12.2/assets/factory0-resources/f0-resources/lang/zh_cn.lang @@ -73,7 +73,7 @@ item.f0-resources.item.drill_head.f0r.wood.name=木钻头 item.f0-resources.item.drill_head.f0r.electrum.name=电钻头 item.f0-resources.item.drill_head.f0r.stone.name=石钻头 item.f0-resources.item.drill_head.f0r.silver.name=银钻头 -item.f0-resources.item.drill_head.f0r.vibrant.name=振动合金钻头 +item.f0-resources.item.drill_head.f0r.vibrant.name=脉冲合金钻头 item.f0-resources.item.drill_head.f0r.lead.name=铅钻头 item.f0-resources.item.drill_head.f0r.steel.name=钢质钻头 item.f0-resources.item.drill_head.f0r.soularium.name=魂金钻头 diff --git a/projects/1.12.2/assets/ignition-foundry/foundry/lang/zh_cn.lang b/projects/1.12.2/assets/ignition-foundry/foundry/lang/zh_cn.lang index 5ed5511150f9..33fce464e713 100644 --- a/projects/1.12.2/assets/ignition-foundry/foundry/lang/zh_cn.lang +++ b/projects/1.12.2/assets/ignition-foundry/foundry/lang/zh_cn.lang @@ -77,7 +77,7 @@ fluid.liquidTartarite.name=液态熔火石 fluid.liquidTerrasteel.name=液态泰拉钢 fluid.liquidTin.name=液态锡 fluid.liquidTitanium.name=液态钛 -fluid.liquidVibrantAlloy.name=液态振动合金 +fluid.liquidVibrantAlloy.name=液态脉冲合金 fluid.liquidVulcanite.name=液态熔岩结晶 fluid.liquidVyroxeres.name=液态幽冥剧毒晶 fluid.liquidZinc.name=液态锌 @@ -191,7 +191,7 @@ foundry.router.material.Titanium=钛 foundry.router.material.Topaz=黄玉 foundry.router.material.Tungsten=钨 foundry.router.material.Uranium=铀 -foundry.router.material.VibrantAlloy=振动合金 +foundry.router.material.VibrantAlloy=脉冲合金 foundry.router.material.Void=虚空金属 foundry.router.material.Vulcanite=熔岩 foundry.router.material.Vyroxeres=幽冥剧毒晶 diff --git a/projects/1.12.2/assets/moar-tinkers/moartinkers/lang/zh_cn.lang b/projects/1.12.2/assets/moar-tinkers/moartinkers/lang/zh_cn.lang index 4d9162a8142d..f9c9ffb95c4d 100644 --- a/projects/1.12.2/assets/moar-tinkers/moartinkers/lang/zh_cn.lang +++ b/projects/1.12.2/assets/moar-tinkers/moartinkers/lang/zh_cn.lang @@ -93,7 +93,7 @@ material.tin.name=锡 material.titanium.name=钛 material.tungsten.name=钨 material.tungstensteel.name=钨钢 -material.vibrantalloy.name=振动合金 +material.vibrantalloy.name=脉冲合金 material.wyverndraconium.name=双足飞龙 material.yellorium.name=黄铀 material.yellowgarnet.name=黄石榴石 diff --git a/projects/1.12.2/assets/moarsigns/moarsigns/lang/zh_cn.lang b/projects/1.12.2/assets/moarsigns/moarsigns/lang/zh_cn.lang index c68c34d5356c..becb421bd687 100644 --- a/projects/1.12.2/assets/moarsigns/moarsigns/lang/zh_cn.lang +++ b/projects/1.12.2/assets/moarsigns/moarsigns/lang/zh_cn.lang @@ -342,7 +342,7 @@ item.moarsigns.sign.draconicevolution.draconic_sign.name=觉醒龙锭告示牌 #Ender IO item.moarsigns.sign.enderio.electricalsteel_sign.name=磁钢告示牌 item.moarsigns.sign.enderio.energeticalloy_sign.name=充能合金告示牌 -item.moarsigns.sign.enderio.vibrantalloy_sign.name=振动合金告示牌 +item.moarsigns.sign.enderio.vibrantalloy_sign.name=脉冲合金告示牌 item.moarsigns.sign.enderio.redstonealloy_sign.name=红石合金告示牌 item.moarsigns.sign.enderio.conductiveiron_sign.name=导电铁告示牌 item.moarsigns.sign.enderio.pulsatingiron_sign.name=脉冲铁锭告示牌 diff --git a/projects/1.12.2/assets/moreplates/moreplates/lang/zh_cn.lang b/projects/1.12.2/assets/moreplates/moreplates/lang/zh_cn.lang index 5ffc144bd62e..d010d9d2b13b 100644 --- a/projects/1.12.2/assets/moreplates/moreplates/lang/zh_cn.lang +++ b/projects/1.12.2/assets/moreplates/moreplates/lang/zh_cn.lang @@ -203,8 +203,8 @@ item.moreplates.tanzanite_plate.name=坦桑石板 item.moreplates.terrasteel_gear.name=泰拉钢齿轮 item.moreplates.terrasteel_plate.name=泰拉钢板 item.moreplates.tin_stick.name=锡杆 -item.moreplates.vibrant_alloy_gear.name=振动合金齿轮 -item.moreplates.vibrant_alloy_plate.name=振动合金板 +item.moreplates.vibrant_alloy_gear.name=脉冲合金齿轮 +item.moreplates.vibrant_alloy_plate.name=脉冲合金板 item.moreplates.vivid_alloy_gear.name=生动合金齿轮 item.moreplates.vivid_alloy_plate.name=生动合金板 item.moreplates.void_gear.name=煤晶齿轮 diff --git a/projects/1.12.2/assets/mystical-agriculture/mysticalagriculture/lang/zh_cn.lang b/projects/1.12.2/assets/mystical-agriculture/mysticalagriculture/lang/zh_cn.lang index 54c5513ff1cf..1e74af00686e 100644 --- a/projects/1.12.2/assets/mystical-agriculture/mysticalagriculture/lang/zh_cn.lang +++ b/projects/1.12.2/assets/mystical-agriculture/mysticalagriculture/lang/zh_cn.lang @@ -521,8 +521,8 @@ item.ma.uranium_essence.name=铀精华 item.ma.uranium_seeds.name=铀种子 item.ma.valonite_essence.name=法罗钠精华 item.ma.valonite_seeds.name=法罗钠种子 -item.ma.vibrant_alloy_essence.name=振动合金精华 -item.ma.vibrant_alloy_seeds.name=振动合金种子 +item.ma.vibrant_alloy_essence.name=脉冲合金精华 +item.ma.vibrant_alloy_seeds.name=脉冲合金种子 item.ma.vinteum_essence.name=温特姆精华 item.ma.vinteum_seeds.name=温特姆种子 item.ma.void_metal_essence.name=虚空金属精华 @@ -763,7 +763,7 @@ tile.ma.ultimate_reprocessor.name=§8极限种子再处理器 tile.ma.uranium_238_crop.name=铀-238作物 tile.ma.uranium_crop.name=铀作物 tile.ma.valonite_crop.name=法罗钠作物 -tile.ma.vibrant_alloy_crop.name=振动合金作物 +tile.ma.vibrant_alloy_crop.name=脉冲合金作物 tile.ma.vinteum_crop.name=温特姆作物 tile.ma.void_metal_crop.name=虚空金属作物 tile.ma.water_crop.name=水作物 diff --git a/projects/1.12.2/assets/redstonic/redstonic/lang/zh_cn.lang b/projects/1.12.2/assets/redstonic/redstonic/lang/zh_cn.lang index 641a0e1324ed..e74fe78642f8 100644 --- a/projects/1.12.2/assets/redstonic/redstonic/lang/zh_cn.lang +++ b/projects/1.12.2/assets/redstonic/redstonic/lang/zh_cn.lang @@ -4,7 +4,7 @@ energizer.name=充电器 energizer_full.name=充电器（满） gear_energized.name=充能合金齿轮 gear_iron.name=铁齿轮 -gear_vibrant.name=振动合金齿轮 +gear_vibrant.name=脉冲合金齿轮 ingot_glowsteel.name=魂钢锭 ingot_vibrantium.name=脉冲魂金锭 item.basic_energy.name=基础通量电池 @@ -41,8 +41,8 @@ item.speed1_drill_augment.name=钻头速度升级 item.speed2_drill_augment.name=钻头速度II升级 item.ultimate_body.name=终极钻体 item.ultimate_head.name=终极钻头头部 -item.vibrant_blade.name=振动合金剑刃 -item.vibrant_body.name=振动合金钻体 +item.vibrant_blade.name=脉冲合金剑刃 +item.vibrant_body.name=脉冲合金钻体 item.wood_handle.name=木质剑柄 itemGroup.redstonic=红石电子 redstone_stick.name=红石浸渍棍 diff --git a/projects/1.12.2/assets/simply-jetpacks-2/simplyjetpacks/lang/zh_cn.lang b/projects/1.12.2/assets/simply-jetpacks-2/simplyjetpacks/lang/zh_cn.lang index 8c726d5fdbea..5b57cfe0f96f 100644 --- a/projects/1.12.2/assets/simply-jetpacks-2/simplyjetpacks/lang/zh_cn.lang +++ b/projects/1.12.2/assets/simply-jetpacks-2/simplyjetpacks/lang/zh_cn.lang @@ -36,8 +36,8 @@ item.simplyjetpacks.jetpack_EIO2.name=磁钢飞行背包 item.simplyjetpacks.jetpack_EIO2_Armored.name=磁钢飞行背包（带盔甲） item.simplyjetpacks.jetpack_EIO3.name=充能合金飞行背包 item.simplyjetpacks.jetpack_EIO3_Armored.name=充能合金飞行背包（带盔甲） -item.simplyjetpacks.jetpack_EIO4.name=振动合金飞行背包 -item.simplyjetpacks.jetpack_EIO4_Armored.name=振动合金飞行背包（带盔甲） +item.simplyjetpacks.jetpack_EIO4.name=脉冲合金飞行背包 +item.simplyjetpacks.jetpack_EIO4_Armored.name=脉冲合金飞行背包（带盔甲） item.simplyjetpacks.jetpack_EIO5.name=魂金合金飞行背包 item.simplyjetpacks.jetpack_Potato.name=土豆飞行背包 item.simplyjetpacks.jetpack_TE1.name=铅石飞行背包 @@ -64,7 +64,7 @@ item.simplyjetpacks.reinforced_gliderwing.name=强化滑翔翼 item.simplyjetpacks.thruster_EIO1.name=导电铁推进器 item.simplyjetpacks.thruster_EIO2.name=磁钢推进器 item.simplyjetpacks.thruster_EIO3.name=充能合金推进器 -item.simplyjetpacks.thruster_EIO4.name=振动合金推进器 +item.simplyjetpacks.thruster_EIO4.name=脉冲合金推进器 item.simplyjetpacks.thruster_EIO5.name=魂金合金推进器 item.simplyjetpacks.thruster_TE1.name=铅石推进器 item.simplyjetpacks.thruster_TE2.name=硬化推进器 @@ -118,7 +118,7 @@ simplyjetpacks.config.tuning.jetpackCreative=调整 - 创造飞行背包 simplyjetpacks.config.tuning.jetpackEIO1=调整 - 导电铁飞行背包 (EIO 1) simplyjetpacks.config.tuning.jetpackEIO2=调整 - 磁钢飞行胸甲 (EIO 2) simplyjetpacks.config.tuning.jetpackEIO3=调整 - 充能合金飞行背包 (EIO 3) -simplyjetpacks.config.tuning.jetpackEIO4=调整 - 振动合金飞行背包 (EIO 4) +simplyjetpacks.config.tuning.jetpackEIO4=调整 - 脉冲合金飞行背包 (EIO 4) simplyjetpacks.config.tuning.jetpackEIO5=调整 - 魂金合金飞行背包 (EIO 5) simplyjetpacks.config.tuning.jetpackPotato=调整 - 土豆飞行背包 simplyjetpacks.config.tuning.jetpackTE1=调整 - 铅石飞行背包 (TE 1) @@ -204,12 +204,12 @@ item.simplyjetpacks.jetpackCreative.name=创造飞行背包 item.simplyjetpacks.jetpackEIO1.name=导电铁飞行背包 item.simplyjetpacks.jetpackEIO2.name=磁钢飞行背包 item.simplyjetpacks.jetpackEIO3.name=充能合金飞行背包 -item.simplyjetpacks.jetpackEIO4.name=振动合金飞行背包 +item.simplyjetpacks.jetpackEIO4.name=脉冲合金飞行背包 item.simplyjetpacks.jetpackEIO5.name=浓缩魂金飞行背包 item.simplyjetpacks.jetpackEIO1Armored.name=导电铁飞行背包（护甲加成） item.simplyjetpacks.jetpackEIO2Armored.name=磁钢飞行背包（护甲加成） item.simplyjetpacks.jetpackEIO3Armored.name=充能合金飞行背包（护甲加成） -item.simplyjetpacks.jetpackEIO4Armored.name=振动合金飞行背包（护甲加成） +item.simplyjetpacks.jetpackEIO4Armored.name=脉冲合金飞行背包（护甲加成） item.simplyjetpacks.jetpackVanilla1.name=铁飞行背包 item.simplyjetpacks.jetpackVanilla2.name=金飞行背包 item.simplyjetpacks.jetpackVanilla3.name=钻石飞行背包 @@ -226,7 +226,7 @@ item.simplyjetpacks.leatherStrap.name=皮质背带 item.simplyjetpacks.thrusterEIO1.name=导电铁推进器 item.simplyjetpacks.thrusterEIO2.name=磁钢推进器 item.simplyjetpacks.thrusterEIO3.name=充能合金推进器 -item.simplyjetpacks.thrusterEIO4.name=振动合金推进器 +item.simplyjetpacks.thrusterEIO4.name=脉冲合金推进器 item.simplyjetpacks.thrusterEIO5.name=浓缩魂金推进器 item.simplyjetpacks.thrusterVanilla1.name=铁推进器 item.simplyjetpacks.thrusterVanilla2.name=金推进器 From 3d2dbe2fbbd04f7681de8d5980ec46d1827a43e5 Mon Sep 17 00:00:00 2001 From: mamaruo Date: Fri, 18 Feb 2022 00:24:07 +0800 Subject: [PATCH 16/29] revert --- .../assets/1UNKNOWN/enderio/lang/zh_cn.lang | 48 +++++++++++-------- .../advgenerators/lang/zh_cn.lang | 22 +++++++-- 2 files changed, 46 insertions(+), 24 deletions(-) diff --git a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang index 127e05ed63c7..3c006f936453 100644 --- a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang +++ b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang @@ -19,10 +19,10 @@ item.item_alloy_ingot_conductive_iron.name=导电铁锭 item.item_alloy_ingot_dark_steel.name=玄钢锭 item.item_alloy_ingot_electrical_steel.name=磁钢锭 item.item_alloy_ingot_energetic_alloy.name=充能合金锭 -item.item_alloy_ingot_pulsating_iron.name=脉冲铁锭 +item.item_alloy_ingot_pulsating_iron.name=充能铁锭 item.item_alloy_ingot_redstone_alloy.name=红石合金锭 item.item_alloy_ingot_soularium.name=魂金锭 -item.item_alloy_ingot_vibrant_alloy.name=振动合金锭 +item.item_alloy_ingot_vibrant_alloy.name=脉冲合金锭 item.item_alloy_ingot_end_steel.name=末地钢锭 item.item_alloy_ingot_construction_alloy.name=铁合金锭 @@ -30,10 +30,10 @@ item.item_alloy_ball_conductive_iron.name=导电铁磨珠 item.item_alloy_ball_dark_steel.name=玄钢磨珠 item.item_alloy_ball_electrical_steel.name=磁钢磨珠 item.item_alloy_ball_energetic_alloy.name=充能合金磨珠 -item.item_alloy_ball_pulsating_iron.name=脉冲铁磨珠 +item.item_alloy_ball_pulsating_iron.name=充能铁磨珠 item.item_alloy_ball_redstone_alloy.name=红石合金磨珠 item.item_alloy_ball_soularium.name=魂金磨珠 -item.item_alloy_ball_vibrant_alloy.name=振动合金磨珠 +item.item_alloy_ball_vibrant_alloy.name=脉冲合金磨珠 item.item_alloy_ball_end_steel.name=末地钢磨珠 item.item_alloy_ball_construction_alloy.name=铁合金磨珠 @@ -41,10 +41,10 @@ item.item_alloy_nugget_conductive_iron.name=导电铁粒 item.item_alloy_nugget_dark_steel.name=玄钢粒 item.item_alloy_nugget_electrical_steel.name=磁钢粒 item.item_alloy_nugget_energetic_alloy.name=充能合金粒 -item.item_alloy_nugget_pulsating_iron.name=脉冲铁粒 +item.item_alloy_nugget_pulsating_iron.name=充能铁粒 item.item_alloy_nugget_redstone_alloy.name=红石合金粒 item.item_alloy_nugget_soularium.name=魂金粒 -item.item_alloy_nugget_vibrant_alloy.name=振动合金粒 +item.item_alloy_nugget_vibrant_alloy.name=脉冲合金粒 item.item_alloy_nugget_end_steel.name=末地钢粒 item.item_alloy_nugget_construction_alloy.name=铁合金粒 @@ -217,7 +217,7 @@ item.item_material.ender_crystal_powder.name=末影水晶粉 item.item_material.gear_energized.name=充能合金齿轮 item.item_material.gear_iron.name=铁齿轮 item.item_material.gear_stone.name=石齿轮 -item.item_material.gear_vibrant.name=振动合金齿轮 +item.item_material.gear_vibrant.name=脉冲合金齿轮 item.item_material.gear_wood.name=木齿轮 item.item_material.gear_darksteel.name=玄钢齿轮 item.item_material.glider_wing.name=滑翔机翼 @@ -250,9 +250,15 @@ item.item_material.skull_skeletal_contractor.name=骷髅契约板 item.item_material.skull_zombie_controller.name=Z-逻辑控制器 item.item_material.skull_zombie_electrode.name=僵尸电极 item.item_material.skull_zombie_frankenstien.name=人造僵尸 +<<<<<<< HEAD item.item_material.skull_guardian_diode.name=守卫者二极管 item.item_material.vibrant_crystal.name=振动水晶 item.item_material.vibrant_powder.name=振动水晶粉 +======= +item.item_material.skull_guardian_diode.name=守卫者电子二极管 +item.item_material.vibrant_crystal.name=脉冲水晶 +item.item_material.vibrant_powder.name=脉冲水晶粉 +>>>>>>> parent of 98e59d5ab2 (pulse vibra stuff) item.item_material.weather_crystal.name=天气水晶 item.item_material.organic_green_dye.name=有机绿色染料 item.item_material.powder_photovoltaic.name=光伏粉 @@ -413,10 +419,10 @@ tile.block_alloy.conductive_iron.name=导电铁块 tile.block_alloy.dark_steel.name=玄钢块 tile.block_alloy.electrical_steel.name=磁钢块 tile.block_alloy.energetic_alloy.name=充能合金块 -tile.block_alloy.pulsating_iron.name=脉冲铁块 +tile.block_alloy.pulsating_iron.name=充能铁块 tile.block_alloy.redstone_alloy.name=红石合金块 tile.block_alloy.soularium.name=魂金块 -tile.block_alloy.vibrant_alloy.name=振动合金块 +tile.block_alloy.vibrant_alloy.name=脉冲合金块 tile.block_alloy.end_steel.name=末地钢块 tile.block_alloy.construction_alloy.name=铁合金块 @@ -1384,7 +1390,7 @@ enderio.advancement.gear.g4_energized_gear.name=发光机械 enderio.advancement.gear.g4_energized_gear.desc=制作一个充能合金齿轮 enderio.advancement.gear.g5_vibrant_gear.name=神秘机械 -enderio.advancement.gear.g5_vibrant_gear.desc=制作一个振动合金齿轮 +enderio.advancement.gear.g5_vibrant_gear.desc=制作一个脉冲合金齿轮 # Filters enderio.gui.item_filter.damage.disabled=无视耐久 @@ -1520,7 +1526,7 @@ item.item_inventory_charger_basic.name=基础物品栏充能器 item.item_inventory_charger_basic.tooltip.detailed.line1=充能物品栏所有物品。右击启用或禁用。 item.item_inventory_charger.name=物品栏充能器 item.item_inventory_charger.tooltip.detailed.line1=充能物品栏所有物品。右击启用或禁用。 -item.item_inventory_charger_vibrant.name=振动物品栏充能器 +item.item_inventory_charger_vibrant.name=脉冲物品栏充能器 item.item_inventory_charger_vibrant.tooltip.detailed.line1=充能物品栏所有物品。右击启用或禁用。 enderio.network.bad_config=错误：末影接口在客户端与服务端配置值“%s.%s”不同，此值决定着游戏如何开始，现在使用服务端数据为时已晚，无法继续进行游戏。为了修复此问题，请手动同步服务端与客户端的末影接口配置，或者手动把此数值设置为“%s”。 @@ -1601,7 +1607,7 @@ enderio.item_item_conduit.name=物品导管 tile.block_cap_bank.creative.name=创造模式电容库 tile.block_cap_bank.simple.name=基础电容库 tile.block_cap_bank.activated.name=电容库 -tile.block_cap_bank.vibrant.name=振动电容库 +tile.block_cap_bank.vibrant.name=脉冲电容库 tile.block_cap_bank.tooltip.detailed.line1=多方块能量存储。 tile.block_cap_bank.tooltip.detailed.line2=可以给使用能量的物品充能（弃用） tile.block_cap_bank.tooltip.detailed.line3=空手 Shift 右击一面 @@ -1900,10 +1906,10 @@ material.dark_steel.name=玄钢 material.conductive_iron.name=导电铁 material.electrical_steel.name=磁钢 material.energetic_alloy.name=充能合金 -material.pulsating_iron.name=脉冲铁 +material.pulsating_iron.name=充能铁 material.redstone_alloy.name=红石合金 material.soularium.name=魂金 -material.vibrant_alloy.name=振动合金 +material.vibrant_alloy.name=脉冲合金 material.end_steel.name=末地钢 material.construction_alloy.name=铁合金 @@ -1911,10 +1917,10 @@ material.dark_steel.prefix=玄钢%s material.conductive_iron.prefix=导电铁%s material.electrical_steel.prefix=磁钢%s material.energetic_alloy.prefix=充能合金%s -material.pulsating_iron.prefix=脉冲铁%s +material.pulsating_iron.prefix=充能铁%s material.redstone_alloy.prefix=红石合金%s material.soularium.prefix=魂金%s -material.vibrant_alloy.prefix=振动合金%s +material.vibrant_alloy.prefix=脉冲合金%s material.end_steel.prefix=末地钢%s material.construction_alloy.prefix=铁合金%s @@ -1928,14 +1934,14 @@ fluid.electrical_steel=熔融磁钢 tile.fluid.electrical_steel.name=熔融磁钢 fluid.energetic_alloy=熔融充能合金 tile.fluid.energetic_alloy.name=熔融充能合金 -fluid.vibrant_alloy=熔融振动合金 -tile.fluid.vibrant_alloy.name=熔融振动合金 +fluid.vibrant_alloy=熔融脉冲合金 +tile.fluid.vibrant_alloy.name=熔融脉冲合金 fluid.redstone_alloy=熔融红石合金 tile.fluid.redstone_alloy.name=熔融红石合金 fluid.conductive_iron=熔融导电铁 tile.fluid.conductive_iron.name=熔融导电铁 -fluid.pulsating_iron=熔融脉冲铁 -tile.fluid.pulsating_iron.name=熔融脉冲铁 +fluid.pulsating_iron=熔融充能铁 +tile.fluid.pulsating_iron.name=熔融充能铁 fluid.dark_steel=熔融玄钢 tile.fluid.dark_steel.name=熔融玄钢 fluid.soularium=熔融魂金 @@ -2352,7 +2358,7 @@ tile.block_slice_and_splice.tooltip.detailed.line1=切开头颅并装入各种 tile.block_solar_panel.simple.name=简易光伏电池 tile.block_solar_panel.name=光伏电池 tile.block_solar_panel.advanced.name=强化光伏电池 -tile.block_solar_panel.vibrant.name=振动光伏电池 +tile.block_solar_panel.vibrant.name=脉冲光伏电池 tile.block_solar_panel.compressed.name=晶化光伏电池 tile.block_solar_panel.concentrated.name=旋律光伏电池 tile.block_solar_panel.ultimate.name=恒星光伏电池 diff --git a/projects/1.12.2/assets/advanced-generators/advgenerators/lang/zh_cn.lang b/projects/1.12.2/assets/advanced-generators/advgenerators/lang/zh_cn.lang index 4410229b5d0f..52a40689290c 100644 --- a/projects/1.12.2/assets/advanced-generators/advgenerators/lang/zh_cn.lang +++ b/projects/1.12.2/assets/advanced-generators/advgenerators/lang/zh_cn.lang @@ -141,14 +141,14 @@ item.advgenerators.turbine_blade_enderium.name=末影锭涡轮叶片 item.advgenerators.turbine_blade_iron.name=铁涡轮叶片 item.advgenerators.turbine_blade_manyullyn.name=玛玉灵涡轮叶片 item.advgenerators.turbine_blade_steel.name=钢制涡轮叶片 -item.advgenerators.turbine_blade_vibrant.name=振动合金涡轮叶片 +item.advgenerators.turbine_blade_vibrant.name=脉冲合金涡轮叶片 item.advgenerators.turbine_kit_adv_alloy.name=高级合金转子升级组件 item.advgenerators.turbine_kit_bronze.name=青铜转子升级组件 item.advgenerators.turbine_kit_enderium.name=末影锭转子升级组件 item.advgenerators.turbine_kit_gold.name=镀金转子升级组件 item.advgenerators.turbine_kit_manyullyn.name=玛玉灵转子升级组件 item.advgenerators.turbine_kit_steel.name=钢制转子升级组件 -item.advgenerators.turbine_kit_vibrant.name=振动合金转子升级组件 +item.advgenerators.turbine_kit_vibrant.name=脉冲合金转子升级组件 item.advgenerators.turbine_rotor_adv_alloy.name=高级合金涡轮转子 item.advgenerators.turbine_rotor_bronze.name=青铜涡轮转子 item.advgenerators.turbine_rotor_enderium.name=末影锭涡轮转子 @@ -156,7 +156,7 @@ item.advgenerators.turbine_rotor_gold.name=镀金涡轮转子 item.advgenerators.turbine_rotor_iron.name=铁涡轮转子 item.advgenerators.turbine_rotor_manyullyn.name=玛玉灵涡轮转子 item.advgenerators.turbine_rotor_steel.name=钢制涡轮转子 -item.advgenerators.turbine_rotor_vibrant.name=振动合金涡轮转子 +item.advgenerators.turbine_rotor_vibrant.name=脉冲合金涡轮转子 item.advgenerators.upgrade_kit.name=升级组件 itemGroup.bdew.generators=高级(模块化)发电机 resource.fluid.format=%s / %s mB @@ -200,8 +200,13 @@ tile.advgenerators.turbine_enderium.name=末影锭涡轮机 tile.advgenerators.turbine_gold.name=镀金涡轮机 tile.advgenerators.turbine_iron.name=铁涡轮机 tile.advgenerators.turbine_manyullyn.name=玛玉灵涡轮机 +<<<<<<< HEAD tile.advgenerators.turbine_steel.name=钢涡轮机 tile.advgenerators.turbine_vibrant.name=振动合金涡轮机 +======= +tile.advgenerators.turbine_steel.name=钢质涡轮机 +tile.advgenerators.turbine_vibrant.name=脉冲合金涡轮机 +>>>>>>> parent of 98e59d5ab2 (pulse vibra stuff) tile.advgenerators.FluidInput.name=液体输入阀门 tile.advgenerators.TurbineController.name=燃气轮机控制器 tile.advgenerators.FuelTank.name=燃料箱 @@ -252,6 +257,7 @@ item.advgenerators.TurbineBladeEnderium.name=末影涡轮叶片 item.advgenerators.TurbineRotorEnderium.name=末影涡轮转子 item.advgenerators.TurbineKitEnderium.name=没有涡轮升级包 tile.advgenerators.TurbineEnderium.name=末影涡轮 +<<<<<<< HEAD item.advgenerators.TurbineBladeVibrant.name=振动合金涡轮叶片 item.advgenerators.TurbineRotorVibrant.name=振动合金涡轮转子 item.advgenerators.TurbineKitVibrant.name=振动合金涡轮升级包 @@ -260,6 +266,16 @@ item.advgenerators.TurbineBladeManyullyn.name=玛玉灵涡轮叶片 item.advgenerators.TurbineRotorManyullyn.name=玛玉灵涡轮转子 item.advgenerators.TurbineKitManyullyn.name=玛玉灵涡轮升级包 tile.advgenerators.TurbineManyullyn.name=玛玉灵涡轮 +======= +item.advgenerators.TurbineBladeVibrant.name=脉冲合金涡轮叶片 +item.advgenerators.TurbineRotorVibrant.name=脉冲合金涡轮转子 +item.advgenerators.TurbineKitVibrant.name=脉冲合金涡轮升级包 +tile.advgenerators.TurbineVibrant.name=脉冲合金涡轮 +item.advgenerators.TurbineBladeManyullyn.name=马玉林涡轮叶片 +item.advgenerators.TurbineRotorManyullyn.name=马玉林涡轮转子 +item.advgenerators.TurbineKitManyullyn.name=马玉林涡轮升级包 +tile.advgenerators.TurbineManyullyn.name=马玉林涡轮 +>>>>>>> parent of 98e59d5ab2 (pulse vibra stuff) item.advgenerators.TurbineBladeAdvAlloy.name=高级合金涡轮叶片 item.advgenerators.TurbineRotorAdvAlloy.name=高级合金涡轮转子 item.advgenerators.TurbineKitAdvAlloy.name=高级合金涡轮升级包 From fa00e6e41f759de62c6a2e6d6c419d00437dcd8d Mon Sep 17 00:00:00 2001 From: mamaruo Date: Fri, 18 Feb 2022 00:29:56 +0800 Subject: [PATCH 17/29] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang | 6 ------ .../advanced-generators/advgenerators/lang/zh_cn.lang | 5 ----- 2 files changed, 11 deletions(-) diff --git a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang index 3c006f936453..d611216d6303 100644 --- a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang +++ b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang @@ -250,15 +250,9 @@ item.item_material.skull_skeletal_contractor.name=骷髅契约板 item.item_material.skull_zombie_controller.name=Z-逻辑控制器 item.item_material.skull_zombie_electrode.name=僵尸电极 item.item_material.skull_zombie_frankenstien.name=人造僵尸 -<<<<<<< HEAD -item.item_material.skull_guardian_diode.name=守卫者二极管 -item.item_material.vibrant_crystal.name=振动水晶 -item.item_material.vibrant_powder.name=振动水晶粉 -======= item.item_material.skull_guardian_diode.name=守卫者电子二极管 item.item_material.vibrant_crystal.name=脉冲水晶 item.item_material.vibrant_powder.name=脉冲水晶粉 ->>>>>>> parent of 98e59d5ab2 (pulse vibra stuff) item.item_material.weather_crystal.name=天气水晶 item.item_material.organic_green_dye.name=有机绿色染料 item.item_material.powder_photovoltaic.name=光伏粉 diff --git a/projects/1.12.2/assets/advanced-generators/advgenerators/lang/zh_cn.lang b/projects/1.12.2/assets/advanced-generators/advgenerators/lang/zh_cn.lang index 52a40689290c..059c62b1fde8 100644 --- a/projects/1.12.2/assets/advanced-generators/advgenerators/lang/zh_cn.lang +++ b/projects/1.12.2/assets/advanced-generators/advgenerators/lang/zh_cn.lang @@ -200,13 +200,8 @@ tile.advgenerators.turbine_enderium.name=末影锭涡轮机 tile.advgenerators.turbine_gold.name=镀金涡轮机 tile.advgenerators.turbine_iron.name=铁涡轮机 tile.advgenerators.turbine_manyullyn.name=玛玉灵涡轮机 -<<<<<<< HEAD tile.advgenerators.turbine_steel.name=钢涡轮机 -tile.advgenerators.turbine_vibrant.name=振动合金涡轮机 -======= -tile.advgenerators.turbine_steel.name=钢质涡轮机 tile.advgenerators.turbine_vibrant.name=脉冲合金涡轮机 ->>>>>>> parent of 98e59d5ab2 (pulse vibra stuff) tile.advgenerators.FluidInput.name=液体输入阀门 tile.advgenerators.TurbineController.name=燃气轮机控制器 tile.advgenerators.FuelTank.name=燃料箱 From f6d0e0ffbaea6ca4d656d5576dc732b1fd58f929 Mon Sep 17 00:00:00 2001 From: mamaruo Date: Fri, 18 Feb 2022 00:34:46 +0800 Subject: [PATCH 18/29] Revert "endervoir" This reverts commit 1ba721fc799208f8c0c5e4bd5fd0312d241e9898. --- projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang index d611216d6303..b9f676f89d17 100644 --- a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang +++ b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang @@ -2322,9 +2322,9 @@ tile.block_experience_obelisk.tooltip.detailed.line2=可输出液态经验至相 # no description tile.block_painter.name=喷涂机 -tile.block_reservoir.name=末影水库 +tile.block_reservoir.name=蓄水库 tile.block_reservoir.tooltip.common.line1=无限产水的储存器。 -tile.block_reservoir.tooltip.detailed.line1=与其他末影水库连接时： +tile.block_reservoir.tooltip.detailed.line1=与其他蓄水库连接时： tile.block_reservoir.tooltip.detailed.line2=- 添加两桶水即可形成一个无限水源 tile.block_reservoir.tooltip.detailed.line3=- 每秒产生一桶水 tile.block_reservoir.tooltip.detailed.line4=- 用扳手右击可启用自动输出 From 944fec1df09de3650194ad48242a32d94be49489 Mon Sep 17 00:00:00 2001 From: mamaruo Date: Fri, 18 Feb 2022 00:35:44 +0800 Subject: [PATCH 19/29] Revert "pressurized. high? probly" This reverts commit c54b9d3bc3112cc7e9dea5a3639ec73b4d55eb76. --- projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang index b9f676f89d17..1c2281ca2fd4 100644 --- a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang +++ b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang @@ -1580,7 +1580,7 @@ enderio.power.max_output=最大输出 enderio.item_redstone_conduit_insulated.name=红石导管 enderio.item_liquid_conduit.name=流体导管 -enderio.item_liquid_conduit_advanced.name=加压流体导管 +enderio.item_liquid_conduit_advanced.name=高压流体导管 enderio.item_liquid_conduit_ender.name=末影流体导管 enderio.item_liquid_conduit.locked_type=流体种类锁定为 enderio.item_liquid_conduit.unlocked_type=流体种类解锁 @@ -1776,7 +1776,7 @@ enderio.advancement.conduits.fluid_conduit.basic.desc=制作一些流体导管 # Temp? enderio.advancement.conduits.fluid_conduit.pressurized.name=含有压力 -enderio.advancement.conduits.fluid_conduit.pressurized.desc=制作一些加压流体导管 +enderio.advancement.conduits.fluid_conduit.pressurized.desc=制作一些高压流体导管 enderio.advancement.conduits.fluid_conduit.ender.name=瞬间传输流体 enderio.advancement.conduits.fluid_conduit.ender.desc=制作一些末影流体导管 From 4fea658555b9da8eb45756eef11db32ad895d0cc Mon Sep 17 00:00:00 2001 From: mamaruo Date: Fri, 18 Feb 2022 00:38:24 +0800 Subject: [PATCH 20/29] =?UTF-8?q?Revert=20=E2=80=98end=20steel=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/1UNKNOWN/enderio/lang/zh_cn.lang | 92 +++++++++---------- .../exchangers/exchangers/lang/zh_cn.lang | 2 +- .../extra-anvils/extraanvils/lang/zh_cn.lang | 6 +- .../moarsigns/moarsigns/lang/zh_cn.lang | 2 +- .../moreplates/moreplates/lang/zh_cn.lang | 4 +- .../mysticalagriculture/lang/zh_cn.lang | 4 +- 6 files changed, 55 insertions(+), 55 deletions(-) diff --git a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang index 1c2281ca2fd4..7cf62bf11a01 100644 --- a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang +++ b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang @@ -23,7 +23,7 @@ item.item_alloy_ingot_pulsating_iron.name=充能铁锭 item.item_alloy_ingot_redstone_alloy.name=红石合金锭 item.item_alloy_ingot_soularium.name=魂金锭 item.item_alloy_ingot_vibrant_alloy.name=脉冲合金锭 -item.item_alloy_ingot_end_steel.name=末地钢锭 +item.item_alloy_ingot_end_steel.name=末影钢锭 item.item_alloy_ingot_construction_alloy.name=铁合金锭 item.item_alloy_ball_conductive_iron.name=导电铁磨珠 @@ -34,7 +34,7 @@ item.item_alloy_ball_pulsating_iron.name=充能铁磨珠 item.item_alloy_ball_redstone_alloy.name=红石合金磨珠 item.item_alloy_ball_soularium.name=魂金磨珠 item.item_alloy_ball_vibrant_alloy.name=脉冲合金磨珠 -item.item_alloy_ball_end_steel.name=末地钢磨珠 +item.item_alloy_ball_end_steel.name=末影钢磨珠 item.item_alloy_ball_construction_alloy.name=铁合金磨珠 item.item_alloy_nugget_conductive_iron.name=导电铁粒 @@ -45,7 +45,7 @@ item.item_alloy_nugget_pulsating_iron.name=充能铁粒 item.item_alloy_nugget_redstone_alloy.name=红石合金粒 item.item_alloy_nugget_soularium.name=魂金粒 item.item_alloy_nugget_vibrant_alloy.name=脉冲合金粒 -item.item_alloy_nugget_end_steel.name=末地钢粒 +item.item_alloy_nugget_end_steel.name=末影钢粒 item.item_alloy_nugget_construction_alloy.name=铁合金粒 item.item_basic_capacitor.activated.name=双层电容 @@ -118,7 +118,7 @@ item.item_dark_steel_hand.tooltip.common.line1=仅供种植站使用！ item.item_dark_steel_hand.tooltip.detailed.line1=给机器使用时比锄好使 item.item_dark_steel_bow.name=玄钢弓 -item.item_end_steel_bow.name=末地钢弓 +item.item_end_steel_bow.name=末影钢弓 item.item_dark_steel_armor.tooltip.line1=%s充能后可提供更好的保护 item.item_dark_steel_armor.tooltip.levelcost.line1=%s%s： @@ -151,36 +151,36 @@ item.item_dark_steel_shield.magenta.name=品红色玄钢盾牌 item.item_dark_steel_shield.orange.name=橙色玄钢盾牌 item.item_dark_steel_shield.white.name=白色玄钢盾牌 -item.item_end_steel_boots.name=末地钢靴子 +item.item_end_steel_boots.name=末影钢靴子 item.item_end_steel_boots.tooltip.line1=充能后可免疫摔落伤害 -item.item_end_steel_chestplate.name=末地钢胸甲 - -item.item_end_steel_helmet.name=末地钢头盔 - -item.item_end_steel_leggings.name=末地钢护腿 - -item.item_end_steel_shield.name=末地钢盾牌 -item.item_end_steel_shield.black.name=黑色末地钢盾牌 -item.item_end_steel_shield.red.name=红色末地钢盾牌 -item.item_end_steel_shield.green.name=绿色末地钢盾牌 -item.item_end_steel_shield.brown.name=棕色末地钢盾牌 -item.item_end_steel_shield.blue.name=蓝色末地钢盾牌 -item.item_end_steel_shield.purple.name=紫色末地钢盾牌 -item.item_end_steel_shield.cyan.name=青色末地钢盾牌 -item.item_end_steel_shield.silver.name=淡灰色末地钢盾牌 -item.item_end_steel_shield.gray.name=灰色末地钢盾牌 -item.item_end_steel_shield.pink.name=粉红色末地钢盾牌 -item.item_end_steel_shield.lime.name=黄绿色末地钢盾牌 -item.item_end_steel_shield.yellow.name=黄色末地钢盾牌 -item.item_end_steel_shield.lightBlue.name=淡蓝色末地钢盾牌 -item.item_end_steel_shield.magenta.name=品红色末地钢盾牌 -item.item_end_steel_shield.orange.name=橙色末地钢盾牌 -item.item_end_steel_shield.white.name=白色末地钢盾牌 +item.item_end_steel_chestplate.name=末影钢胸甲 + +item.item_end_steel_helmet.name=末影钢头盔 + +item.item_end_steel_leggings.name=末影钢护腿 + +item.item_end_steel_shield.name=末影钢盾 +item.item_end_steel_shield.black.name=黑色末影钢盾 +item.item_end_steel_shield.red.name=红色末影钢盾 +item.item_end_steel_shield.green.name=绿色末影钢盾 +item.item_end_steel_shield.brown.name=棕色末影钢盾 +item.item_end_steel_shield.blue.name=蓝色末影钢盾 +item.item_end_steel_shield.purple.name=紫色末影钢盾 +item.item_end_steel_shield.cyan.name=青色末影钢盾 +item.item_end_steel_shield.silver.name=淡灰色末影钢盾 +item.item_end_steel_shield.gray.name=灰色末影钢盾 +item.item_end_steel_shield.pink.name=粉红色末影钢盾 +item.item_end_steel_shield.lime.name=黄绿色末影钢盾 +item.item_end_steel_shield.yellow.name=黄色末影钢盾 +item.item_end_steel_shield.lightBlue.name=淡蓝色末影钢盾 +item.item_end_steel_shield.magenta.name=品红色末影钢盾 +item.item_end_steel_shield.orange.name=橙色末影钢盾 +item.item_end_steel_shield.white.name=白色末影钢盾 item.item_end_steel_sword.name=终结之剑 Ⅱ 型 -item.item_end_steel_pickaxe.name=末地钢镐 -item.item_end_steel_axe.name=末地钢斧 +item.item_end_steel_pickaxe.name=末影钢镐 +item.item_end_steel_axe.name=末影钢斧 item.item_ender_food.enderios.name=“末影麦片” item.item_ender_food.enderios.tooltip.common.line1=均衡早餐的一部分！ @@ -293,7 +293,7 @@ item.item_material.ender_fragment.name=末影碎片 item.item_material.withering_dust.name=凋零尘 item.item_material.remote_awareness_upgrade.name=远程接入升级 item.item_material.dish.name=无线能量传输蝶形集成元件 -item.item_material.end_steel_machine_chassi.name=末地钢机器框架 +item.item_material.end_steel_machine_chassi.name=末影钢机器框架 item.item_material.enhanced_machine_dye.name=强化涂料 item.item_material.enhanced_machine_dye.tooltip.detailed.line1=工业生产的含有魔法与无机成分的染料。 item.item_material.enhanced_machine_dye.tooltip.detailed.line2=§7警告：可能含有微量钻石，下咽前请细细咀嚼。过敏原警示：含麸质食物。 @@ -417,7 +417,7 @@ tile.block_alloy.pulsating_iron.name=充能铁块 tile.block_alloy.redstone_alloy.name=红石合金块 tile.block_alloy.soularium.name=魂金块 tile.block_alloy.vibrant_alloy.name=脉冲合金块 -tile.block_alloy.end_steel.name=末地钢块 +tile.block_alloy.end_steel.name=末影钢块 tile.block_alloy.construction_alloy.name=铁合金块 tile.block_alloy_endergy.name=末影合金块 @@ -433,7 +433,7 @@ tile.block_cold_fire.name=寒焰 tile.block_dark_iron_bars.name=玄钢栏杆 -tile.block_end_iron_bars.name=末地钢栏杆 +tile.block_end_iron_bars.name=末影钢栏杆 tile.block_dark_steel_anvil.name=玄钢砧 tile.block_dark_steel_anvil.tooltip.common.line1=经久耐用 @@ -1904,19 +1904,19 @@ material.pulsating_iron.name=充能铁 material.redstone_alloy.name=红石合金 material.soularium.name=魂金 material.vibrant_alloy.name=脉冲合金 -material.end_steel.name=末地钢 +material.end_steel.name=末影钢 material.construction_alloy.name=铁合金 -material.dark_steel.prefix=玄钢%s -material.conductive_iron.prefix=导电铁%s -material.electrical_steel.prefix=磁钢%s -material.energetic_alloy.prefix=充能合金%s -material.pulsating_iron.prefix=充能铁%s -material.redstone_alloy.prefix=红石合金%s -material.soularium.prefix=魂金%s -material.vibrant_alloy.prefix=脉冲合金%s -material.end_steel.prefix=末地钢%s -material.construction_alloy.prefix=铁合金%s +material.dark_steel.prefix=玄钢 %s +material.conductive_iron.prefix=导电铁 %s +material.electrical_steel.prefix=磁钢 %s +material.energetic_alloy.prefix=充能合金 %s +material.pulsating_iron.prefix=充能铁 %s +material.redstone_alloy.prefix=红石合金 %s +material.soularium.prefix=魂金 %s +material.vibrant_alloy.prefix=脉冲合金 %s +material.end_steel.prefix=末影钢 %s +material.construction_alloy.prefix=铁合金 %s modifier.enderport.name=传送 modifier.enderport.desc=§o别挡我的路！§r\n有几率将实体传送走。 @@ -1940,8 +1940,8 @@ fluid.dark_steel=熔融玄钢 tile.fluid.dark_steel.name=熔融玄钢 fluid.soularium=熔融魂金 tile.fluid.soularium.name=熔融魂金 -fluid.end_steel=熔融末地钢 -tile.fluid.end_steel.name=熔融末地钢 +fluid.end_steel=熔融末影钢 +tile.fluid.end_steel.name=熔融末影钢 fluid.construction_alloy=熔融铁合金 tile.fluid.construction_alloy.name=熔融铁合金 diff --git a/projects/1.12.2/assets/exchangers/exchangers/lang/zh_cn.lang b/projects/1.12.2/assets/exchangers/exchangers/lang/zh_cn.lang index 6167c5d7720f..ac0a28b1c640 100644 --- a/projects/1.12.2/assets/exchangers/exchangers/lang/zh_cn.lang +++ b/projects/1.12.2/assets/exchangers/exchangers/lang/zh_cn.lang @@ -55,7 +55,7 @@ item.exchangers.electrical_steel_exchanger.name=磁钢方块交换器 item.exchangers.elite_exchanger.name=精英方块交换器 item.exchangers.emerald_exchanger.name=§d绿宝石方块交换器 item.exchangers.end_exchanger.name=末影交换器 -item.exchangers.end_steel_exchanger.name=末地钢交换器 +item.exchangers.end_steel_exchanger.name=末影钢交换器 item.exchangers.energetic_exchanger.name=充能合金方块交换器 item.exchangers.exchanger_core_tier1.name=§a交换器核心（等级 1） item.exchangers.exchanger_core_tier2.name=§b交换器核心（等级 2） diff --git a/projects/1.12.2/assets/extra-anvils/extraanvils/lang/zh_cn.lang b/projects/1.12.2/assets/extra-anvils/extraanvils/lang/zh_cn.lang index 41909d80af18..b3ee1c78924f 100644 --- a/projects/1.12.2/assets/extra-anvils/extraanvils/lang/zh_cn.lang +++ b/projects/1.12.2/assets/extra-anvils/extraanvils/lang/zh_cn.lang @@ -16,9 +16,9 @@ tile.extraanvils:nickel_anvil_damaged.name=严重损坏的镍砧 tile.extraanvils:steel_anvil.name=钢砧 tile.extraanvils:steel_anvil_chipped.name=轻微损坏的钢砧 tile.extraanvils:steel_anvil_damaged.name=严重损坏的钢砧 -tile.extraanvils:endsteel_anvil.name=末地钢砧 -tile.extraanvils:endsteel_anvil_chipped.name=轻微损坏的末地钢砧 -tile.extraanvils:endsteel_anvil_damaged.name=严重损坏的末地钢砧 +tile.extraanvils:endsteel_anvil.name=末影钢砧 +tile.extraanvils:endsteel_anvil_chipped.name=轻微损坏的末影钢砧 +tile.extraanvils:endsteel_anvil_damaged.name=严重损坏的末影钢砧 tile.extraanvils:superium_anvil.name=§b高级精华砧 tile.extraanvils:superium_anvil_chipped.name=§b轻微损坏的高级精华砧 tile.extraanvils:superium_anvil_damaged.name=§b严重损坏的高级精华砧 diff --git a/projects/1.12.2/assets/moarsigns/moarsigns/lang/zh_cn.lang b/projects/1.12.2/assets/moarsigns/moarsigns/lang/zh_cn.lang index becb421bd687..15e7fd318698 100644 --- a/projects/1.12.2/assets/moarsigns/moarsigns/lang/zh_cn.lang +++ b/projects/1.12.2/assets/moarsigns/moarsigns/lang/zh_cn.lang @@ -348,7 +348,7 @@ item.moarsigns.sign.enderio.conductiveiron_sign.name=导电铁告示牌 item.moarsigns.sign.enderio.pulsatingiron_sign.name=脉冲铁锭告示牌 item.moarsigns.sign.enderio.darksteel_sign.name=玄钢告示牌 item.moarsigns.sign.enderio.soularium_sign.name=魂金告示牌 -item.moarsigns.sign.enderio.endsteel_sign.name=末地钢告示牌 +item.moarsigns.sign.enderio.endsteel_sign.name=末影钢告示牌 item.moarsigns.sign.enderio.ironalloy_sign.name=铁合金告示牌 #Factorization item.moarsigns.sign.factorization.silver_sign.name=银制告示牌 diff --git a/projects/1.12.2/assets/moreplates/moreplates/lang/zh_cn.lang b/projects/1.12.2/assets/moreplates/moreplates/lang/zh_cn.lang index d010d9d2b13b..64c1e1407302 100644 --- a/projects/1.12.2/assets/moreplates/moreplates/lang/zh_cn.lang +++ b/projects/1.12.2/assets/moreplates/moreplates/lang/zh_cn.lang @@ -83,8 +83,8 @@ item.moreplates.empowered_void_gear.name=充能煤晶齿轮 item.moreplates.empowered_void_plate.name=充能煤晶板 item.moreplates.enchanted_gear.name=附魔齿轮 item.moreplates.enchanted_plate.name=附魔板 -item.moreplates.end_steel_gear.name=末地钢齿轮 -item.moreplates.end_steel_plate.name=末地钢板 +item.moreplates.end_steel_gear.name=末影钢齿轮 +item.moreplates.end_steel_plate.name=末影钢板 item.moreplates.enderium_stick.name=末影杆 item.moreplates.energetic_alloy_gear.name=充能合金齿轮 item.moreplates.energetic_alloy_plate.name=充能合金板 diff --git a/projects/1.12.2/assets/mystical-agriculture/mysticalagriculture/lang/zh_cn.lang b/projects/1.12.2/assets/mystical-agriculture/mysticalagriculture/lang/zh_cn.lang index 1e74af00686e..8ae78dd941f8 100644 --- a/projects/1.12.2/assets/mystical-agriculture/mysticalagriculture/lang/zh_cn.lang +++ b/projects/1.12.2/assets/mystical-agriculture/mysticalagriculture/lang/zh_cn.lang @@ -225,7 +225,7 @@ item.ma.emerald_seeds.name=绿宝石种子 item.ma.end_essence.name=末地精华 item.ma.end_seeds.name=末地种子 item.ma.end_steel_essence.name=末影锭精华 -item.ma.end_steel_seeds.name=末地钢种子 +item.ma.end_steel_seeds.name=末影钢种子 item.ma.ender_amethyst_essence.name=末影紫晶精华 item.ma.ender_amethyst_seeds.name=末影紫晶种子 item.ma.ender_biotite_essence.name=末地云母精华 @@ -608,7 +608,7 @@ tile.ma.emerald_crop.name=绿宝石作物 tile.ma.end_crop.name=末地作物 tile.ma.end_inferium_ore.name=§e末地精华矿石 tile.ma.end_prosperity_ore.name=末地活化水晶矿石 -tile.ma.end_steel_crop.name=末地钢作物 +tile.ma.end_steel_crop.name=末影钢作物 tile.ma.ender_amethyst_crop.name=末影紫晶作物 tile.ma.ender_biotite_crop.name=末地云母作物 tile.ma.enderium_crop.name=末影作物 From 54e9031a3b9140c79faae8c69c31a7b36048a13f Mon Sep 17 00:00:00 2001 From: n0099 Date: Fri, 18 Feb 2022 20:55:35 +0800 Subject: [PATCH 21/29] =?UTF-8?q?[AdvancedGenerators]=20introducing=20?= =?UTF-8?q?=E8=84=89=E5=86=B2=20and=20=E7=8E=9B=E7=8E=89=E7=81=B5=20respec?= =?UTF-8?q?tively=20Co-authored-by:=20NostalgiaCyan?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../advgenerators/lang/zh_cn.lang | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/projects/1.12.2/assets/advanced-generators/advgenerators/lang/zh_cn.lang b/projects/1.12.2/assets/advanced-generators/advgenerators/lang/zh_cn.lang index 059c62b1fde8..f208b4d2b105 100644 --- a/projects/1.12.2/assets/advanced-generators/advgenerators/lang/zh_cn.lang +++ b/projects/1.12.2/assets/advanced-generators/advgenerators/lang/zh_cn.lang @@ -252,25 +252,14 @@ item.advgenerators.TurbineBladeEnderium.name=末影涡轮叶片 item.advgenerators.TurbineRotorEnderium.name=末影涡轮转子 item.advgenerators.TurbineKitEnderium.name=没有涡轮升级包 tile.advgenerators.TurbineEnderium.name=末影涡轮 -<<<<<<< HEAD -item.advgenerators.TurbineBladeVibrant.name=振动合金涡轮叶片 -item.advgenerators.TurbineRotorVibrant.name=振动合金涡轮转子 -item.advgenerators.TurbineKitVibrant.name=振动合金涡轮升级包 -tile.advgenerators.TurbineVibrant.name=振动合金涡轮 -item.advgenerators.TurbineBladeManyullyn.name=玛玉灵涡轮叶片 -item.advgenerators.TurbineRotorManyullyn.name=玛玉灵涡轮转子 -item.advgenerators.TurbineKitManyullyn.name=玛玉灵涡轮升级包 -tile.advgenerators.TurbineManyullyn.name=玛玉灵涡轮 -======= item.advgenerators.TurbineBladeVibrant.name=脉冲合金涡轮叶片 item.advgenerators.TurbineRotorVibrant.name=脉冲合金涡轮转子 item.advgenerators.TurbineKitVibrant.name=脉冲合金涡轮升级包 tile.advgenerators.TurbineVibrant.name=脉冲合金涡轮 -item.advgenerators.TurbineBladeManyullyn.name=马玉林涡轮叶片 -item.advgenerators.TurbineRotorManyullyn.name=马玉林涡轮转子 -item.advgenerators.TurbineKitManyullyn.name=马玉林涡轮升级包 -tile.advgenerators.TurbineManyullyn.name=马玉林涡轮 ->>>>>>> parent of 98e59d5ab2 (pulse vibra stuff) +item.advgenerators.TurbineBladeManyullyn.name=玛玉灵涡轮叶片 +item.advgenerators.TurbineRotorManyullyn.name=玛玉灵涡轮转子 +item.advgenerators.TurbineKitManyullyn.name=玛玉灵涡轮升级包 +tile.advgenerators.TurbineManyullyn.name=玛玉灵涡轮 item.advgenerators.TurbineBladeAdvAlloy.name=高级合金涡轮叶片 item.advgenerators.TurbineRotorAdvAlloy.name=高级合金涡轮转子 item.advgenerators.TurbineKitAdvAlloy.name=高级合金涡轮升级包 From aad46bced9c3c14ff397ddc9e9c56a7d99f91e66 Mon Sep 17 00:00:00 2001 From: mamaruo Date: Sat, 19 Feb 2022 00:39:13 +0800 Subject: [PATCH 22/29] =?UTF-8?q?=E8=A1=A5=E5=85=85=20#1525?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang index 7cf62bf11a01..77ee4c1fe260 100644 --- a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang +++ b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang @@ -651,7 +651,7 @@ tile.block_painted_stone_fence.name=喷涂石栅栏 tile.block_painted_stone_slab.name=喷涂石台阶 tile.block_painted_stone_stair.name=喷涂石楼梯 tile.block_painted_wall.name=喷涂墙 -tile.block_painted_wooden_trapdoor.name=喷涂木活板门 +tile.block_painted_wooden_trapdoor.name=喷涂木质活板门 tile.block_painted_workbench.name=喷涂工作台 tile.block_painted_reinforced_obsidian.name=喷涂强化黑曜石 tile.block_painted_reinforced_obsidian.tooltip.common.line1=能抵挡凋零爆炸 @@ -889,8 +889,8 @@ enderio.darksteel.upgrade.spoon.tooltip.detailed.line1=有了勺子，谁还要 enderio.darksteel.upgrade.hoe.name=叉子 enderio.darksteel.upgrade.hoe.tooltip.detailed.line1=有了叉子，谁还要锄…… -enderio.darksteel.upgrade.tnt.0.enabled=启用爆炸 -enderio.darksteel.upgrade.tnt.0.disabled=禁用爆炸 +enderio.darksteel.upgrade.tnt.0.enabled=爆炸已启用 +enderio.darksteel.upgrade.tnt.0.disabled=爆炸已禁用 enderio.darksteel.upgrade.tnt.0.name=爆炸 I enderio.darksteel.upgrade.tnt.0.tooltip.detailed.line1=为镐添加爆炸之力，挖掘时破坏周围的方块。 @@ -1511,8 +1511,8 @@ entity.enderio.primed_charge.name=激活的炸药 entity.enderio.enderio.primed_charge.name=激活的炸药 enderio.tooltip.inventory_charger.need_upgrade=§4未安装注能升级！ -enderio.tooltip.inventory_charger.enabled=启用物品栏充能 -enderio.tooltip.inventory_charger.disabled=禁用物品栏充能 +enderio.tooltip.inventory_charger.enabled=物品栏充能器已启用 +enderio.tooltip.inventory_charger.disabled=物品栏充能器已禁用 item.item_inventory_charger_simple.name=简易物品栏充能器 item.item_inventory_charger_simple.tooltip.detailed.line1=充能物品栏邻近物品。右击启用或禁用。 From 66f7d5ac5fb0a72c5bbcdf65c314cdbd45afb2d0 Mon Sep 17 00:00:00 2001 From: mamaruo Date: Sat, 19 Feb 2022 00:42:28 +0800 Subject: [PATCH 23/29] =?UTF-8?q?=E9=83=A8=E5=88=86=20revert=20=2013c152d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/1UNKNOWN/enderio/lang/zh_cn.lang | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang index 77ee4c1fe260..bd9059206fcf 100644 --- a/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang +++ b/projects/1.12.2/assets/1UNKNOWN/enderio/lang/zh_cn.lang @@ -516,7 +516,7 @@ tile.block_decoration3.type14.name=n/a（装饰方块） tile.block_decoration3.type15.name=n/a（装饰方块） tile.block_detector_block.name=方块检测器 -tile.block_detector_block_silent.name=方块检测器（静音） +tile.block_detector_block_silent.name=方块检测器（无声） tile.block_enderman_skull.name=末影人头颅 tile.block_enderman_skull.base.name=末影人头颅 @@ -595,33 +595,33 @@ tile.block_painted_pressure_plate.name=喷涂压力板 tile.block_painted_pressure_plate.darksteel.name=玄钢压力板 tile.block_painted_pressure_plate.darksteel.tooltip.detailed.line1=只能被玩家激活。 tile.block_painted_pressure_plate.darksteel.tooltip.detailed.line2=可在喷涂机喷涂，用纯净玻璃喷涂后会隐形 -tile.block_painted_pressure_plate.darksteel.silent.name=玄钢压力板（静音） +tile.block_painted_pressure_plate.darksteel.silent.name=玄钢压力板（无声） tile.block_painted_pressure_plate.darksteel.silent.tooltip.detailed.line1=只能被玩家激活。 tile.block_painted_pressure_plate.darksteel.silent.tooltip.detailed.line2=可在喷涂机喷涂，用纯净玻璃喷涂后会隐形 tile.block_painted_pressure_plate.gold.name=测重压力板（轻质） tile.block_painted_pressure_plate.gold.tooltip.detailed.line1=可变信号输出：一个物品可增加一格信号强度。 tile.block_painted_pressure_plate.gold.tooltip.detailed.line2=可在喷涂机喷涂，用纯净玻璃喷涂后会隐形 -tile.block_painted_pressure_plate.gold.silent.name=测重压力板（轻质）（静音） +tile.block_painted_pressure_plate.gold.silent.name=测重压力板（轻质）（无声） tile.block_painted_pressure_plate.gold.silent.tooltip.detailed.line1=可变信号输出：一个物品可增加一格信号强度。 tile.block_painted_pressure_plate.gold.silent.tooltip.detailed.line2=可在喷涂机喷涂，用纯净玻璃喷涂后会隐形 tile.block_painted_pressure_plate.iron.name=测重压力板（重质） tile.block_painted_pressure_plate.iron.tooltip.detailed.line1=可变信号输出：一个实体可增加一格信号强度。 tile.block_painted_pressure_plate.iron.tooltip.detailed.line2=可在喷涂机喷涂，用纯净玻璃喷涂后会隐形 -tile.block_painted_pressure_plate.iron.silent.name=测重压力板（重质）（静音） +tile.block_painted_pressure_plate.iron.silent.name=测重压力板（重质）（无声） tile.block_painted_pressure_plate.iron.silent.tooltip.detailed.line1=可变信号输出：一个实体可增加一格信号强度。 tile.block_painted_pressure_plate.iron.silent.tooltip.detailed.line2=可在喷涂机喷涂，用纯净玻璃喷涂后会隐形 tile.block_painted_pressure_plate.soularium.name=魂金压力板 tile.block_painted_pressure_plate.soularium.tooltip.detailed.line1=只能被敌对生物激活。 tile.block_painted_pressure_plate.soularium.tooltip.detailed.line2=可在喷涂机喷涂，用纯净玻璃喷涂后会隐形 tile.block_painted_pressure_plate.soularium.tooltip.detailed.line3=可在灵魂绑定器中调整设定。 -tile.block_painted_pressure_plate.soularium.silent.name=魂金压力板（静音） +tile.block_painted_pressure_plate.soularium.silent.name=魂金压力板（无声） tile.block_painted_pressure_plate.soularium.silent.tooltip.detailed.line1=只能被敌对生物激活。 tile.block_painted_pressure_plate.soularium.silent.tooltip.detailed.line2=可在喷涂机喷涂，用纯净玻璃喷涂后会隐形 tile.block_painted_pressure_plate.soularium.silent.tooltip.detailed.line3=可在灵魂绑定器中调整设定。 tile.block_painted_pressure_plate.stone.name=石质压力板 tile.block_painted_pressure_plate.stone.tooltip.detailed.line1=只能被生物和玩家激活。 tile.block_painted_pressure_plate.stone.tooltip.detailed.line2=可在喷涂机喷涂，用纯净玻璃喷涂后会隐形 -tile.block_painted_pressure_plate.stone.silent.name=石质压力板（静音） +tile.block_painted_pressure_plate.stone.silent.name=石质压力板（无声） tile.block_painted_pressure_plate.stone.silent.tooltip.detailed.line1=只能被生物和玩家激活。 tile.block_painted_pressure_plate.stone.silent.tooltip.detailed.line2=可在喷涂机喷涂，用纯净玻璃喷涂后会隐形 tile.block_painted_pressure_plate.tuned.name=魂金压力板（已配置） @@ -629,13 +629,13 @@ tile.block_painted_pressure_plate.tuned.tooltip.detailed.line1=只能被指定 tile.block_painted_pressure_plate.tuned.tooltip.detailed.line2=可在喷涂机喷涂，用纯净玻璃喷涂后会隐形 tile.block_painted_pressure_plate.tuned.tooltip.detailed.line3=可在灵魂绑定器中调整设定。 tile.block_painted_pressure_plate.tuned.tooltip=调频至：%s -tile.block_painted_pressure_plate.tuned.silent.name=魂金压力板（已配置）（静音） +tile.block_painted_pressure_plate.tuned.silent.name=魂金压力板（已配置）（无声） tile.block_painted_pressure_plate.tuned.silent.tooltip.detailed.line1=只能被指定敌对生物激活。 tile.block_painted_pressure_plate.tuned.silent.tooltip.detailed.line2=可在喷涂机喷涂，用纯净玻璃喷涂后会隐形 tile.block_painted_pressure_plate.tuned.silent.tooltip.detailed.line3=可在灵魂绑定器中调整设定。 tile.block_painted_pressure_plate.wood.name=木质压力板 tile.block_painted_pressure_plate.wood.tooltip.detailed.line1=可在喷涂机喷涂，用纯净玻璃喷涂后会隐形 -tile.block_painted_pressure_plate.wood.silent.name=木质压力板（静音） +tile.block_painted_pressure_plate.wood.silent.name=木质压力板（无声） tile.block_painted_pressure_plate.wood.silent.tooltip.detailed.line1=可在喷涂机喷涂，用纯净玻璃喷涂后会隐形 tile.block_painted_redstone.name=喷涂红石 @@ -2329,7 +2329,7 @@ tile.block_reservoir.tooltip.detailed.line2=- 添加两桶水即可形成一个 tile.block_reservoir.tooltip.detailed.line3=- 每秒产生一桶水 tile.block_reservoir.tooltip.detailed.line4=- 用扳手右击可启用自动输出 -tile.block_omni_reservoir.name=万用水库 +tile.block_omni_reservoir.name=万用蓄水库 tile.block_omni_reservoir.tooltip.common.line1=任何流体的储存器。 tile.block_omni_reservoir.tooltip.detailed.line1=- 用扳手右击可启用自动输出 From f729a16ca794d42504f6c83cea95f1959ead48ff Mon Sep 17 00:00:00 2001 From: mamaruo Date: Thu, 24 Feb 2022 02:58:18 +0800 Subject: [PATCH 24/29] Update en_us.json --- .../glass-cutter/glasscutter/lang/en_us.json | 39 ++++++++++++++++++- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/projects/1.16/assets/glass-cutter/glasscutter/lang/en_us.json b/projects/1.16/assets/glass-cutter/glasscutter/lang/en_us.json index 4e6ccedd3a9f..ad50842c4399 100644 --- a/projects/1.16/assets/glass-cutter/glasscutter/lang/en_us.json +++ b/projects/1.16/assets/glass-cutter/glasscutter/lang/en_us.json @@ -1,4 +1,39 @@ { - "item.glasscutter.glasscutter": "Glass Cutter", - "item.glasscutter.glasscutter_strong": "Obsidian Glass Cutter" + "block.glasscutter.glasscutter": "Glasscutter", + "container.glasscutter.glasscutter": "Glasscutter", + "block.glasscutter.glass_stairs": "Glass Stairs", + "block.glasscutter.glass_slab": "Glass Slab", + "block.glasscutter.black_stained_glass_stairs": "Black Stained Glass Stairs", + "block.glasscutter.red_stained_glass_stairs": "Red Stained Glass Stairs", + "block.glasscutter.green_stained_glass_stairs": "Green Stained Glass Stairs", + "block.glasscutter.brown_stained_glass_stairs": "Brown Stained Glass Stairs", + "block.glasscutter.blue_stained_glass_stairs": "Blue Stained Glass Stairs", + "block.glasscutter.purple_stained_glass_stairs": "Purple Stained Glass Stairs", + "block.glasscutter.cyan_stained_glass_stairs": "Cyan Stained Glass Stairs", + "block.glasscutter.light_gray_stained_glass_stairs": "Light Gray Stained Glass Stairs", + "block.glasscutter.gray_stained_glass_stairs": "Gray Stained Glass Stairs", + "block.glasscutter.pink_stained_glass_stairs": "Pink Stained Glass Stairs", + "block.glasscutter.lime_stained_glass_stairs": "Lime Stained Glass Stairs", + "block.glasscutter.yellow_stained_glass_stairs": "Yellow Stained Glass Stairs", + "block.glasscutter.light_blue_stained_glass_stairs": "Light Blue Stained Glass Stairs", + "block.glasscutter.magenta_stained_glass_stairs": "Magenta Stained Glass Stairs", + "block.glasscutter.orange_stained_glass_stairs": "Orange Stained Glass Stairs", + "block.glasscutter.white_stained_glass_stairs": "White Stained Glass Stairs", + "block.glasscutter.black_stained_glass_slab": "Black Stained Glass Slab", + "block.glasscutter.red_stained_glass_slab": "Red Stained Glass Slab", + "block.glasscutter.green_stained_glass_slab": "Green Stained Glass Slab", + "block.glasscutter.brown_stained_glass_slab": "Brown Stained Glass Slab", + "block.glasscutter.blue_stained_glass_slab": "Blue Stained Glass Slab", + "block.glasscutter.purple_stained_glass_slab": "Purple Stained Glass Slab", + "block.glasscutter.cyan_stained_glass_slab": "Cyan Stained Glass Slab", + "block.glasscutter.light_gray_stained_glass_slab": "Light Gray Stained Glass Slab", + "block.glasscutter.gray_stained_glass_slab": "Gray Stained Glass Slab", + "block.glasscutter.pink_stained_glass_slab": "Pink Stained Glass Slab", + "block.glasscutter.lime_stained_glass_slab": "Lime Stained Glass Slab", + "block.glasscutter.yellow_stained_glass_slab": "Yellow Stained Glass Slab", + "block.glasscutter.light_blue_stained_glass_slab": "Light Blue Stained Glass Slab", + "block.glasscutter.magenta_stained_glass_slab": "Magenta Stained Glass Slab", + "block.glasscutter.orange_stained_glass_slab": "Orange Stained Glass Slab", + "block.glasscutter.white_stained_glass_slab": "White Stained Glass Slab", + "gui.jei.category.glassCutter": "Glasscutting" } \ No newline at end of file From 6c7fe771e63458fb307db9dd1a76883e297fd8fc Mon Sep 17 00:00:00 2001 From: mamaruo Date: Sat, 26 Feb 2022 03:28:36 +0800 Subject: [PATCH 25/29] update glasscutter --- .../glass-cutter/glasscutter/lang/zh_cn.json | 40 ++++++++++++++++++- .../glass-cutter/glasscutter/lang/en_us.json | 4 -- .../glass-cutter/glasscutter/lang/zh_cn.json | 1 - 3 files changed, 39 insertions(+), 6 deletions(-) delete mode 100644 projects/1.18/assets/glass-cutter/glasscutter/lang/en_us.json delete mode 100644 projects/1.18/assets/glass-cutter/glasscutter/lang/zh_cn.json diff --git a/projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json b/projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json index 9e26dfeeb6e6..5c21286a99e7 100644 --- a/projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json +++ b/projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json @@ -1 +1,39 @@ -{} \ No newline at end of file +{ + "block.glasscutter.glasscutter": "切玻璃机", + "container.glasscutter.glasscutter": "切玻璃机", + "block.glasscutter.glass_stairs": "玻璃楼梯", + "block.glasscutter.glass_slab": "玻璃台阶", + "block.glasscutter.black_stained_glass_stairs": "黑色染色玻璃楼梯", + "block.glasscutter.red_stained_glass_stairs": "红色染色玻璃楼梯", + "block.glasscutter.green_stained_glass_stairs": "绿色染色玻璃楼梯", + "block.glasscutter.brown_stained_glass_stairs": "棕色染色玻璃楼梯", + "block.glasscutter.blue_stained_glass_stairs": "蓝色染色玻璃楼梯", + "block.glasscutter.purple_stained_glass_stairs": "紫色染色玻璃楼梯", + "block.glasscutter.cyan_stained_glass_stairs": "青色染色玻璃楼梯", + "block.glasscutter.light_gray_stained_glass_stairs": "淡青色染色玻璃楼梯", + "block.glasscutter.gray_stained_glass_stairs": "灰色染色玻璃楼梯", + "block.glasscutter.pink_stained_glass_stairs": "粉色染色玻璃楼梯", + "block.glasscutter.lime_stained_glass_stairs": "黄绿色染色玻璃楼梯", + "block.glasscutter.yellow_stained_glass_stairs": "黄色染色玻璃楼梯", + "block.glasscutter.light_blue_stained_glass_stairs": "淡蓝色染色玻璃楼梯", + "block.glasscutter.magenta_stained_glass_stairs": "品红色染色玻璃楼梯", + "block.glasscutter.orange_stained_glass_stairs": "橙色染色玻璃楼梯", + "block.glasscutter.white_stained_glass_stairs": "白色染色玻璃楼梯", + "block.glasscutter.black_stained_glass_slab": "黑色染色玻璃台阶", + "block.glasscutter.red_stained_glass_slab": "红色染色玻璃台阶", + "block.glasscutter.green_stained_glass_slab": "绿色染色玻璃台阶", + "block.glasscutter.brown_stained_glass_slab": "棕色染色玻璃台阶", + "block.glasscutter.blue_stained_glass_slab": "蓝色染色玻璃台阶", + "block.glasscutter.purple_stained_glass_slab": "紫色染色玻璃台阶", + "block.glasscutter.cyan_stained_glass_slab": "青色染色玻璃台阶", + "block.glasscutter.light_gray_stained_glass_slab": "淡青色染色玻璃台阶", + "block.glasscutter.gray_stained_glass_slab": "灰色染色玻璃台阶", + "block.glasscutter.pink_stained_glass_slab": "粉色染色玻璃台阶", + "block.glasscutter.lime_stained_glass_slab": "黄绿色染色玻璃台阶", + "block.glasscutter.yellow_stained_glass_slab": "黄色染色玻璃台阶", + "block.glasscutter.light_blue_stained_glass_slab": "淡蓝色染色玻璃台阶", + "block.glasscutter.magenta_stained_glass_slab": "品红色染色玻璃台阶", + "block.glasscutter.orange_stained_glass_slab": "橙色染色玻璃台阶", + "block.glasscutter.white_stained_glass_slab": "白色染色玻璃台阶", + "gui.jei.category.glassCutter": "玻璃切割" +} \ No newline at end of file diff --git a/projects/1.18/assets/glass-cutter/glasscutter/lang/en_us.json b/projects/1.18/assets/glass-cutter/glasscutter/lang/en_us.json deleted file mode 100644 index 4e6ccedd3a9f..000000000000 --- a/projects/1.18/assets/glass-cutter/glasscutter/lang/en_us.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "item.glasscutter.glasscutter": "Glass Cutter", - "item.glasscutter.glasscutter_strong": "Obsidian Glass Cutter" -} \ No newline at end of file diff --git a/projects/1.18/assets/glass-cutter/glasscutter/lang/zh_cn.json b/projects/1.18/assets/glass-cutter/glasscutter/lang/zh_cn.json deleted file mode 100644 index 9e26dfeeb6e6..000000000000 --- a/projects/1.18/assets/glass-cutter/glasscutter/lang/zh_cn.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file From e302917d84075ab69b852921c0d02d292c24eee7 Mon Sep 17 00:00:00 2001 From: mamaruo <37480168+mamaruo@users.noreply.github.com> Date: Sat, 26 Feb 2022 10:29:14 +0800 Subject: [PATCH 26/29] Update projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json Co-authored-by: NostalgiaCyan --- projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json b/projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json index 5c21286a99e7..269675cd2ed6 100644 --- a/projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json +++ b/projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json @@ -10,7 +10,7 @@ "block.glasscutter.blue_stained_glass_stairs": "蓝色染色玻璃楼梯", "block.glasscutter.purple_stained_glass_stairs": "紫色染色玻璃楼梯", "block.glasscutter.cyan_stained_glass_stairs": "青色染色玻璃楼梯", - "block.glasscutter.light_gray_stained_glass_stairs": "淡青色染色玻璃楼梯", + "block.glasscutter.light_gray_stained_glass_stairs": "淡灰色染色玻璃楼梯", "block.glasscutter.gray_stained_glass_stairs": "灰色染色玻璃楼梯", "block.glasscutter.pink_stained_glass_stairs": "粉色染色玻璃楼梯", "block.glasscutter.lime_stained_glass_stairs": "黄绿色染色玻璃楼梯", From 83720ed3e1a04b5e6597b69105df831143d2aa09 Mon Sep 17 00:00:00 2001 From: mamaruo <37480168+mamaruo@users.noreply.github.com> Date: Sat, 26 Feb 2022 10:29:22 +0800 Subject: [PATCH 27/29] Update projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json Co-authored-by: NostalgiaCyan --- projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json b/projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json index 269675cd2ed6..e854c9360c27 100644 --- a/projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json +++ b/projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json @@ -28,7 +28,7 @@ "block.glasscutter.cyan_stained_glass_slab": "青色染色玻璃台阶", "block.glasscutter.light_gray_stained_glass_slab": "淡青色染色玻璃台阶", "block.glasscutter.gray_stained_glass_slab": "灰色染色玻璃台阶", - "block.glasscutter.pink_stained_glass_slab": "粉色染色玻璃台阶", + "block.glasscutter.pink_stained_glass_slab": "粉红色染色玻璃台阶", "block.glasscutter.lime_stained_glass_slab": "黄绿色染色玻璃台阶", "block.glasscutter.yellow_stained_glass_slab": "黄色染色玻璃台阶", "block.glasscutter.light_blue_stained_glass_slab": "淡蓝色染色玻璃台阶", From 975b065e002f9f59d7bd30d421bf23d3df77bea2 Mon Sep 17 00:00:00 2001 From: mamaruo <37480168+mamaruo@users.noreply.github.com> Date: Sat, 26 Feb 2022 10:30:44 +0800 Subject: [PATCH 28/29] Update projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json Co-authored-by: NostalgiaCyan --- projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json b/projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json index e854c9360c27..506b822d0057 100644 --- a/projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json +++ b/projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json @@ -12,7 +12,7 @@ "block.glasscutter.cyan_stained_glass_stairs": "青色染色玻璃楼梯", "block.glasscutter.light_gray_stained_glass_stairs": "淡灰色染色玻璃楼梯", "block.glasscutter.gray_stained_glass_stairs": "灰色染色玻璃楼梯", - "block.glasscutter.pink_stained_glass_stairs": "粉色染色玻璃楼梯", + "block.glasscutter.pink_stained_glass_stairs": "粉红色染色玻璃楼梯", "block.glasscutter.lime_stained_glass_stairs": "黄绿色染色玻璃楼梯", "block.glasscutter.yellow_stained_glass_stairs": "黄色染色玻璃楼梯", "block.glasscutter.light_blue_stained_glass_stairs": "淡蓝色染色玻璃楼梯", From f1e854dc33db184caa2a644ffa9927bbd0bee779 Mon Sep 17 00:00:00 2001 From: mamaruo <37480168+mamaruo@users.noreply.github.com> Date: Sat, 26 Feb 2022 10:30:51 +0800 Subject: [PATCH 29/29] Update projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json Co-authored-by: NostalgiaCyan --- projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json b/projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json index 506b822d0057..8a766d499187 100644 --- a/projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json +++ b/projects/1.16/assets/glass-cutter/glasscutter/lang/zh_cn.json @@ -26,7 +26,7 @@ "block.glasscutter.blue_stained_glass_slab": "蓝色染色玻璃台阶", "block.glasscutter.purple_stained_glass_slab": "紫色染色玻璃台阶", "block.glasscutter.cyan_stained_glass_slab": "青色染色玻璃台阶", - "block.glasscutter.light_gray_stained_glass_slab": "淡青色染色玻璃台阶", + "block.glasscutter.light_gray_stained_glass_slab": "淡灰色染色玻璃台阶", "block.glasscutter.gray_stained_glass_slab": "灰色染色玻璃台阶", "block.glasscutter.pink_stained_glass_slab": "粉红色染色玻璃台阶", "block.glasscutter.lime_stained_glass_slab": "黄绿色染色玻璃台阶",