From 218ff9070bb4825d67e6188a80d28f9f9dc91106 Mon Sep 17 00:00:00 2001 From: ZHAY10086 <34602681+ZHAY10086@users.noreply.github.com> Date: Sat, 22 Mar 2025 12:14:08 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B5=81=E4=BD=93?= =?UTF-8?q?=E8=AF=91=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thermalfoundation/lang/zh_cn.lang | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/1.12.2/assets/thermal-foundation/thermalfoundation/lang/zh_cn.lang b/projects/1.12.2/assets/thermal-foundation/thermalfoundation/lang/zh_cn.lang index 9b8bdc606d18..fb1a006f9c00 100644 --- a/projects/1.12.2/assets/thermal-foundation/thermalfoundation/lang/zh_cn.lang +++ b/projects/1.12.2/assets/thermal-foundation/thermalfoundation/lang/zh_cn.lang @@ -25,10 +25,10 @@ fluid.constantan=熔融康铜 fluid.creosote=杂酚油 fluid.crude_oil=石油 fluid.cryotheum=极寒之凛冰 -fluid.ender=谐振末影珍珠 +fluid.ender=谐振末影 fluid.enderium=熔融末影 fluid.experience=知识精华 -fluid.glowstone=充能液态荧石 +fluid.glowstone=充能荧石 fluid.invar=熔融殷钢 fluid.iridium=熔融铱 fluid.lumium=熔融流明 @@ -40,7 +40,7 @@ fluid.potion=药水 fluid.potion_lingering=滞留药水 fluid.potion_splash=喷溅药水 fluid.pyrotheum=烈焰之炽焱 -fluid.redstone=不稳定红石 +fluid.redstone=不稳红石 fluid.refined_biofuel=藿香碱 fluid.refined_fuel=精炼油 fluid.refined_oil=石脑油 @@ -196,7 +196,7 @@ item.thermalfoundation.material.crystalCinnabar.name=朱砂 item.thermalfoundation.material.crystalCrudeOil.name=沥青 item.thermalfoundation.material.crystalEnder.name=谐振末影络合物 item.thermalfoundation.material.crystalGlowstone.name=充能络合物 -item.thermalfoundation.material.crystalRedstone.name=不稳定红石络合物 +item.thermalfoundation.material.crystalRedstone.name=不稳红石络合物 item.thermalfoundation.material.crystalSlag.name=炉渣 item.thermalfoundation.material.crystalSlagRich.name=富炉渣 item.thermalfoundation.material.dustAerotheum.name=空气粉 @@ -540,12 +540,12 @@ tab.thermalfoundation.lexicon.transmute.1=压制此词典，迫使其放弃对 tile.thermalfoundation.fluid.aerotheum.name=飞扬之清风 tile.thermalfoundation.fluid.crude_oil.name=石油 tile.thermalfoundation.fluid.cryotheum.name=极寒之凛冰 -tile.thermalfoundation.fluid.ender.name=谐振末影珍珠 -tile.thermalfoundation.fluid.glowstone.name=充能液态荧石 +tile.thermalfoundation.fluid.ender.name=谐振末影 +tile.thermalfoundation.fluid.glowstone.name=充能荧石 tile.thermalfoundation.fluid.mana.name=元始魔力 tile.thermalfoundation.fluid.petrotheum.name=板块之层岩 tile.thermalfoundation.fluid.pyrotheum.name=烈焰之炽焱 -tile.thermalfoundation.fluid.redstone.name=不稳定红石 +tile.thermalfoundation.fluid.redstone.name=不稳红石 tile.thermalfoundation.glass.aluminum.name=硬化铝玻璃 tile.thermalfoundation.glass.bronze.name=硬化青铜玻璃 tile.thermalfoundation.glass.constantan.name=硬化康铜玻璃 @@ -575,7 +575,7 @@ tile.thermalfoundation.ore.lead.name=铅矿石 tile.thermalfoundation.ore.mithril.name=蕴魔秘银矿石 tile.thermalfoundation.ore.nickel.name=镍矿石 tile.thermalfoundation.ore.platinum.name=铂矿石 -tile.thermalfoundation.ore.redstone.name=不稳定红石矿石 +tile.thermalfoundation.ore.redstone.name=不稳红石矿石 tile.thermalfoundation.ore.silver.name=银矿石 tile.thermalfoundation.ore.tin.name=锡矿石 tile.thermalfoundation.rockwool.black.name=黑色石棉 From 31a3c2ab9be68737722e5930e0f682db6c9d6ee5 Mon Sep 17 00:00:00 2001 From: ZHAY10086 <34602681+ZHAY10086@users.noreply.github.com> Date: Sat, 22 Mar 2025 12:17:23 +0800 Subject: [PATCH 2/4] revert --- .../thermal-foundation/thermalfoundation/lang/zh_cn.lang | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/1.12.2/assets/thermal-foundation/thermalfoundation/lang/zh_cn.lang b/projects/1.12.2/assets/thermal-foundation/thermalfoundation/lang/zh_cn.lang index fb1a006f9c00..32f336fc1eb8 100644 --- a/projects/1.12.2/assets/thermal-foundation/thermalfoundation/lang/zh_cn.lang +++ b/projects/1.12.2/assets/thermal-foundation/thermalfoundation/lang/zh_cn.lang @@ -40,7 +40,7 @@ fluid.potion=药水 fluid.potion_lingering=滞留药水 fluid.potion_splash=喷溅药水 fluid.pyrotheum=烈焰之炽焱 -fluid.redstone=不稳红石 +fluid.redstone=不稳定红石 fluid.refined_biofuel=藿香碱 fluid.refined_fuel=精炼油 fluid.refined_oil=石脑油 @@ -196,7 +196,7 @@ item.thermalfoundation.material.crystalCinnabar.name=朱砂 item.thermalfoundation.material.crystalCrudeOil.name=沥青 item.thermalfoundation.material.crystalEnder.name=谐振末影络合物 item.thermalfoundation.material.crystalGlowstone.name=充能络合物 -item.thermalfoundation.material.crystalRedstone.name=不稳红石络合物 +item.thermalfoundation.material.crystalRedstone.name=不稳定红石络合物 item.thermalfoundation.material.crystalSlag.name=炉渣 item.thermalfoundation.material.crystalSlagRich.name=富炉渣 item.thermalfoundation.material.dustAerotheum.name=空气粉 @@ -545,7 +545,7 @@ tile.thermalfoundation.fluid.glowstone.name=充能荧石 tile.thermalfoundation.fluid.mana.name=元始魔力 tile.thermalfoundation.fluid.petrotheum.name=板块之层岩 tile.thermalfoundation.fluid.pyrotheum.name=烈焰之炽焱 -tile.thermalfoundation.fluid.redstone.name=不稳红石 +tile.thermalfoundation.fluid.redstone.name=不稳定红石 tile.thermalfoundation.glass.aluminum.name=硬化铝玻璃 tile.thermalfoundation.glass.bronze.name=硬化青铜玻璃 tile.thermalfoundation.glass.constantan.name=硬化康铜玻璃 @@ -575,7 +575,7 @@ tile.thermalfoundation.ore.lead.name=铅矿石 tile.thermalfoundation.ore.mithril.name=蕴魔秘银矿石 tile.thermalfoundation.ore.nickel.name=镍矿石 tile.thermalfoundation.ore.platinum.name=铂矿石 -tile.thermalfoundation.ore.redstone.name=不稳红石矿石 +tile.thermalfoundation.ore.redstone.name=不稳定红石矿石 tile.thermalfoundation.ore.silver.name=银矿石 tile.thermalfoundation.ore.tin.name=锡矿石 tile.thermalfoundation.rockwool.black.name=黑色石棉 From aee4738ca06464e29a62f79cb91ce6a46cee8764 Mon Sep 17 00:00:00 2001 From: ZHAY10086 <34602681+ZHAY10086@users.noreply.github.com> Date: Sat, 22 Mar 2025 14:49:22 +0800 Subject: [PATCH 3/4] Update zh_cn.lang --- .../1.12.2/assets/plusticminusbad/plustic/lang/zh_cn.lang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/1.12.2/assets/plusticminusbad/plustic/lang/zh_cn.lang b/projects/1.12.2/assets/plusticminusbad/plustic/lang/zh_cn.lang index 73fe542c68d7..4fad7445bc31 100644 --- a/projects/1.12.2/assets/plusticminusbad/plustic/lang/zh_cn.lang +++ b/projects/1.12.2/assets/plusticminusbad/plustic/lang/zh_cn.lang @@ -307,7 +307,7 @@ fluid.plustic.rosite.name=熔融玫石 fluid.plustic.emberstone.name=熔融余烬石 fluid.plustic.skeletal.name=熔融骷髅锭 fluid.plustic.mystite.name=熔融神秘锭 -fluid.plustic.blazium.name=熔融虚空锭 +fluid.plustic.blazium.name=熔融烈焰锭 material.starmetal.name=星辉 material.limonite.name=褐铁 material.rosite.name=玫石 @@ -317,8 +317,8 @@ material.crystallite.name=微晶 material.emberstone.name=余烬石 material.skeletal.name=骷髅 material.mystite.name=神秘锭 -material.ghostlystone.name=幽魂石 +material.ghostlystone.name=幽灵石 material.bloodstone.name=血石 -material.blazium.name=虚空 +material.blazium.name=烈焰 modifier.aoa_threshold.name=需要%s级%d modifier.aoa_threshold.desc=§o嘿！别总想着白嫖神器！§r\n这件工具需要%s级%d。 From 95c85138ae2079c55676fb7e11fc24ac1e51343e Mon Sep 17 00:00:00 2001 From: ZHAY10086 <34602681+ZHAY10086@users.noreply.github.com> Date: Sat, 22 Mar 2025 15:14:12 +0800 Subject: [PATCH 4/4] Update zh_cn.lang --- .../1.12.2/assets/moar-tinkers/moartinkers/lang/zh_cn.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ce8e7a69cf2c..89c3eeacde78 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 @@ -6,7 +6,7 @@ fluid.advancedalloy.name=熔融高级合金 fluid.blutonium.name=熔融蓝钚 fluid.chrome.name=熔融铬 fluid.constantan.name=熔融康铜 -fluid.cyanite.name=熔融蓝晶石 +fluid.cyanite.name=熔融蓝晶 fluid.ebonypsi.name=熔融乳白Psi金属 fluid.electrumflux.name=熔融红石琥珀金 fluid.elvenelementium.name=熔融源质钢 @@ -45,7 +45,7 @@ material.chaoticdraconium.name=混沌龙 material.chrome.name=铬 material.conductiveiron.name=导电铁 material.constantan.name=康铜 -material.cyanite.name=蓝晶石 +material.cyanite.name=蓝晶 material.darkmatter.name=暗物质 material.darksteel.name=玄钢 material.draconium.name=龙