Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -371,8 +371,8 @@ item.ma.nickel_essence.name=镍精华
item.ma.nickel_seeds.name=镍种子
item.ma.obsidian_essence.name=黑曜石精华
item.ma.obsidian_seeds.name=黑曜石种子
item.ma.octine_essence.name=炽炎铁精华
item.ma.octine_seeds.name=炽炎铁种子
item.ma.octine_essence.name=炽炎精华
item.ma.octine_seeds.name=炽炎种子
item.ma.osmium_essence.name=锇精华
item.ma.osmium_seeds.name=锇种子
item.ma.peridot_essence.name=橄榄石精华
Expand Down Expand Up @@ -490,8 +490,8 @@ item.ma.supremium_shears.name=§c终极精华剪刀
item.ma.supremium_shovel.name=§c终极精华锹
item.ma.supremium_sickle.name=§c终极精华镰刀
item.ma.supremium_sword.name=§c终极精华剑
item.ma.syrmorite_essence.name=赛摩铜精华
item.ma.syrmorite_seeds.name=赛摩铜种子
item.ma.syrmorite_essence.name=赛摩精华
item.ma.syrmorite_seeds.name=赛摩种子
item.ma.tanzanite_essence.name=坦桑石精华
item.ma.tanzanite_seeds.name=坦桑石种子
item.ma.terrasteel_essence.name=泰拉钢精华
Expand Down Expand Up @@ -519,8 +519,8 @@ item.ma.uranium_238_essence.name=铀-238精华
item.ma.uranium_238_seeds.name=铀238种子
item.ma.uranium_essence.name=铀精华
item.ma.uranium_seeds.name=铀种子
item.ma.valonite_essence.name=法罗钠精华
item.ma.valonite_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.vinteum_essence.name=温特姆精华
Expand Down Expand Up @@ -676,7 +676,7 @@ tile.ma.nether_prosperity_ore.name=下界活化水晶矿石
tile.ma.nether_quartz_crop.name=下界石英作物
tile.ma.nickel_crop.name=镍作物
tile.ma.obsidian_crop.name=黑曜石作物
tile.ma.octine_crop.name=炽炎铁作物
tile.ma.octine_crop.name=炽炎作物
tile.ma.osmium_crop.name=锇作物
tile.ma.peridot_crop.name=橄榄石作物
tile.ma.pig_crop.name=猪作物
Expand Down Expand Up @@ -741,7 +741,7 @@ tile.ma.superium_reprocessor.name=§b高级种子再处理器
tile.ma.supremium_furnace.name=§c终极精华熔炉
tile.ma.supremium_furnace_active.name=§c终极精华熔炉
tile.ma.supremium_reprocessor.name=§c终极种子再处理器
tile.ma.syrmorite_crop.name=赛摩铜作物
tile.ma.syrmorite_crop.name=赛摩作物
tile.ma.tanzanite_crop.name=坦桑石作物
tile.ma.terrasteel_crop.name=泰拉钢作物
tile.ma.thaumium_crop.name=神秘锭作物
Expand All @@ -762,7 +762,7 @@ tile.ma.ultimate_furnace_active.name=§8终焉熔炉
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.valonite_crop.name=英玫作物
tile.ma.vibrant_alloy_crop.name=脉冲合金作物
tile.ma.vinteum_crop.name=温特姆作物
tile.ma.void_metal_crop.name=虚空金属作物
Expand Down
10 changes: 5 additions & 5 deletions projects/1.12.2/assets/pewter/pewter/lang/zh_cn.lang
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ fluid.pewter.manasteel.name=熔融魔力钢
material.manastring.name=蕴魔丝线


material.octine.name=炽炎铁
fluid.pewter.octine.name=熔融炽炎铁
material.octine.name=炽炎
fluid.pewter.octine.name=熔融炽炎

material.osmium.name=锇
fluid.pewter.osmium.name=熔融锇
Expand All @@ -46,16 +46,16 @@ fluid.pewter.soulforgedsteel.name=熔融熔魂钢
material.starmetal.name=星辉
fluid.pewter.starmetal.name=熔融星辉

material.syrmorite.name=赛摩铜
fluid.pewter.syrmorite.name=熔融赛摩铜
material.syrmorite.name=赛摩
fluid.pewter.syrmorite.name=熔融赛摩

material.terrasteel.name=泰拉钢
fluid.pewter.terrasteel.name=熔融泰拉钢

material.thaumium.name=神秘
fluid.pewter.thaumium.name=熔融神秘

material.valonite.name=法罗钠
material.valonite.name=英玫


material.voidmetal.name=虚空金属
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ item.spartanlands:caestus_lurker.name=鳄皮拳套
#Materials
material.spartanlands:weedwood=杂草木
material.spartanlands:slimybone=粘骨
material.spartanlands:valonite=法罗钠
material.spartanlands:octine=炽炎铁
material.spartanlands:valonite=英玫
material.spartanlands:octine=炽炎



18 changes: 9 additions & 9 deletions projects/1.16/assets/planttech-2/planttech2/lang/zh_cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
"crop.netherrack": "下界岩",
"crop.neutronium": "中子素",
"crop.nickel": "镍",
"crop.octine": "炽炎铁",
"crop.octine": "炽炎",
"crop.orange_tulip": "橙色郁金香",
"crop.osmium": "锇",
"crop.oxeye_daisy": "雏菊",
Expand Down Expand Up @@ -359,7 +359,7 @@
"crop.sugarcane": "甘蔗",
"crop.sulfur": "硫磺",
"crop.sunstone": "太阳石",
"crop.syrmorite": "赛摩铜",
"crop.syrmorite": "赛摩",
"crop.tanzanite": "坦桑",
"crop.terrasteel": "泰拉钢",
"crop.thaumium": "神秘",
Expand All @@ -369,7 +369,7 @@
"crop.tungsten": "钨",
"crop.turtle": "海龟",
"crop.uranium": "铀",
"crop.valonite": "法罗钠",
"crop.valonite": "英玫",
"crop.vibrant_alloy": "充能合金",
"crop.villager": "村民",
"crop.vine": "藤蔓",
Expand Down Expand Up @@ -813,8 +813,8 @@
"item.planttech2.neutronium_seeds": "中子素种子",
"item.planttech2.nickel_particles": "镍颗粒",
"item.planttech2.nickel_seeds": "镍种子",
"item.planttech2.octine_particles": "炽炎铁颗粒",
"item.planttech2.octine_seeds": "炽炎铁种子",
"item.planttech2.octine_particles": "炽炎颗粒",
"item.planttech2.octine_seeds": "炽炎种子",
"item.planttech2.orange_tulip_seeds": "橙色郁金香种子",
"item.planttech2.osmium_particles": "锇颗粒",
"item.planttech2.osmium_seeds": "锇种子",
Expand Down Expand Up @@ -940,8 +940,8 @@
"item.planttech2.sunstone_particles": "太阳石颗粒",
"item.planttech2.sunstone_seeds": "太阳石种子",
"item.planttech2.sweeping_chip": "横扫之刃芯片",
"item.planttech2.syrmorite_particles": "赛摩铜颗粒",
"item.planttech2.syrmorite_seeds": "赛摩铜种子",
"item.planttech2.syrmorite_particles": "赛摩颗粒",
"item.planttech2.syrmorite_seeds": "赛摩种子",
"item.planttech2.tanzanite_particles": "坦桑颗粒",
"item.planttech2.tanzanite_seeds": "坦桑种子",
"item.planttech2.terrasteel_particles": "泰拉钢颗粒",
Expand Down Expand Up @@ -970,8 +970,8 @@
"item.planttech2.unlockchip_shovel": "解锁芯片-锹",
"item.planttech2.uranium_particles": "铀颗粒",
"item.planttech2.uranium_seeds": "铀种子",
"item.planttech2.valonite_particles": "法罗钠颗粒",
"item.planttech2.valonite_seeds": "法罗钠种子",
"item.planttech2.valonite_particles": "英玫颗粒",
"item.planttech2.valonite_seeds": "英玫种子",
"item.planttech2.vibrant_alloy_particles": "充能合金颗粒",
"item.planttech2.vibrant_alloy_seeds": "充能合金种子",
"item.planttech2.villager_particles": "村民颗粒",
Expand Down
18 changes: 9 additions & 9 deletions projects/1.18/assets/planttech-2/planttech2/lang/zh_cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@
"crop.netherrack": "下界岩",
"crop.neutronium": "中子素",
"crop.nickel": "镍",
"crop.octine": "炽炎铁",
"crop.octine": "炽炎",
"crop.orange_tulip": "橙色郁金香",
"crop.osmium": "锇",
"crop.oxeye_daisy": "雏菊",
Expand Down Expand Up @@ -335,7 +335,7 @@
"crop.sugarcane": "甘蔗",
"crop.sulfur": "硫磺",
"crop.sunstone": "太阳石",
"crop.syrmorite": "赛摩铜",
"crop.syrmorite": "赛摩",
"crop.tanzanite": "坦桑",
"crop.terrasteel": "泰拉钢",
"crop.thaumium": "神秘",
Expand All @@ -345,7 +345,7 @@
"crop.tungsten": "钨",
"crop.turtle": "海龟",
"crop.uranium": "铀",
"crop.valonite": "法罗钠",
"crop.valonite": "英玫",
"crop.vibrant_alloy": "充能合金",
"crop.villager": "村民",
"crop.vine": "藤蔓",
Expand Down Expand Up @@ -784,8 +784,8 @@
"item.planttech2.neutronium_seeds": "中子素种子",
"item.planttech2.nickel_particles": "镍颗粒",
"item.planttech2.nickel_seeds": "镍种子",
"item.planttech2.octine_particles": "炽炎铁颗粒",
"item.planttech2.octine_seeds": "炽炎铁种子",
"item.planttech2.octine_particles": "炽炎颗粒",
"item.planttech2.octine_seeds": "炽炎种子",
"item.planttech2.orange_tulip_seeds": "橙色郁金香种子",
"item.planttech2.osmium_particles": "锇颗粒",
"item.planttech2.osmium_seeds": "锇种子",
Expand Down Expand Up @@ -909,8 +909,8 @@
"item.planttech2.sunstone_particles": "太阳石颗粒",
"item.planttech2.sunstone_seeds": "太阳石种子",
"item.planttech2.sweeping_chip": "横扫之刃芯片",
"item.planttech2.syrmorite_particles": "赛摩铜颗粒",
"item.planttech2.syrmorite_seeds": "赛摩铜种子",
"item.planttech2.syrmorite_particles": "赛摩颗粒",
"item.planttech2.syrmorite_seeds": "赛摩种子",
"item.planttech2.tanzanite_particles": "坦桑颗粒",
"item.planttech2.tanzanite_seeds": "坦桑种子",
"item.planttech2.terrasteel_particles": "泰拉钢颗粒",
Expand Down Expand Up @@ -939,8 +939,8 @@
"item.planttech2.unlockchip_shovel": "解锁芯片-锹",
"item.planttech2.uranium_particles": "铀颗粒",
"item.planttech2.uranium_seeds": "铀种子",
"item.planttech2.valonite_particles": "法罗钠颗粒",
"item.planttech2.valonite_seeds": "法罗钠种子",
"item.planttech2.valonite_particles": "英玫颗粒",
"item.planttech2.valonite_seeds": "英玫种子",
"item.planttech2.vibrant_alloy_particles": "充能合金颗粒",
"item.planttech2.vibrant_alloy_seeds": "充能合金种子",
"item.planttech2.villager_particles": "村民颗粒",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@
"item.useless_sword.magmaticrock": "熔岩石",
"item.useless_sword.magmaticstonesword": "熔岩石剑",
"item.useless_sword.message_in_a_sword": "寄语之剑",
"item.useless_sword.molten_sword": "炽炎铁剑",
"item.useless_sword.moltenironsword": "炽炎铁剑",
"item.useless_sword.molten_sword": "炽炎剑",
"item.useless_sword.moltenironsword": "炽炎剑",
"item.useless_sword.mushroom_sword": "§c蘑菇剑",
"item.useless_sword.mushroomsword": "§c蘑菇剑",
"item.useless_sword.naga_slicer": "§b娜迦之刃",
Expand Down