Skip to content
This repository has been archived by the owner on Dec 1, 2021. It is now read-only.

Commit

Permalink
Apply changes made in commit f600f71
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tanimodori
Tanimodori committed Sep 24, 2018
1 parent a0c8bc7 commit 6d6e9fd
Show file tree
Hide file tree
Showing 6 changed files with 1,419 additions and 1,419 deletions.
4 changes: 2 additions & 2 deletions lang/fluid/zh_cn.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -742,8 +742,8 @@ S:fluid.molten.tungsten=熔融钨
S:fluid.molten.tungsten.name=熔融钨
S:fluid.molten.tungstensteel=熔融钨钢
S:fluid.molten.tungstensteel.name=熔融钨钢
S:fluid.molten.ultimet=熔融哈式合金
S:fluid.molten.ultimet.name=熔融哈式合金
S:fluid.molten.ultimet=熔融哈氏合金
S:fluid.molten.ultimet.name=熔融哈氏合金
S:fluid.molten.vanadium=熔融钒
S:fluid.molten.vanadium.name=熔融钒
S:fluid.molten.vanadiumsteel=熔融钒钢
Expand Down
44 changes: 22 additions & 22 deletions lang/gt_block/zh_cn.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1054,35 +1054,35 @@ S:gt.block.lilypad.glowtus.8.name=灰色荧光睡莲
S:gt.block.lilypad.glowtus.9.name=粉色荧光睡莲
S:gt.block.log.1.0.name=枯死的原木
S:gt.block.log.1.1.name=腐败的原木
S:gt.block.log.1.10.name=长满苔藓的原木
S:gt.block.log.1.10.name=苔痕原木
S:gt.block.log.1.11.name=结冰的原木
S:gt.block.log.1.12.name=枯死的原木
S:gt.block.log.1.13.name=腐败的原木
S:gt.block.log.1.14.name=长满苔藓的原木
S:gt.block.log.1.14.name=苔痕原木
S:gt.block.log.1.15.name=结冰的原木
S:gt.block.log.1.2.name=长满苔藓的原木
S:gt.block.log.1.2.name=苔痕原木
S:gt.block.log.1.3.name=结冰的原木
S:gt.block.log.1.32767.name=任何该方块的子方块
S:gt.block.log.1.4.name=枯死的原木
S:gt.block.log.1.5.name=腐败的原木
S:gt.block.log.1.6.name=长满苔藓的原木
S:gt.block.log.1.6.name=苔痕原木
S:gt.block.log.1.7.name=结冰的原木
S:gt.block.log.1.8.name=枯死的原木
S:gt.block.log.1.9.name=腐败的原木
S:gt.block.log.1.fireproof.0.name=枯死的原木 (防火)
S:gt.block.log.1.fireproof.1.name=腐败的原木 (防火)
S:gt.block.log.1.fireproof.10.name=长满苔藓的原木 (防火)
S:gt.block.log.1.fireproof.10.name=苔痕原木 (防火)
S:gt.block.log.1.fireproof.11.name=结冰的原木 (防火)
S:gt.block.log.1.fireproof.12.name=枯死的原木 (防火)
S:gt.block.log.1.fireproof.13.name=腐败的原木 (防火)
S:gt.block.log.1.fireproof.14.name=长满苔藓的原木 (防火)
S:gt.block.log.1.fireproof.14.name=苔痕原木 (防火)
S:gt.block.log.1.fireproof.15.name=结冰的原木 (防火)
S:gt.block.log.1.fireproof.2.name=长满苔藓的原木 (防火)
S:gt.block.log.1.fireproof.2.name=苔痕原木 (防火)
S:gt.block.log.1.fireproof.3.name=结冰的原木 (防火)
S:gt.block.log.1.fireproof.32767.name=任何该方块的子方块
S:gt.block.log.1.fireproof.4.name=枯死的原木 (防火)
S:gt.block.log.1.fireproof.5.name=腐败的原木 (防火)
S:gt.block.log.1.fireproof.6.name=长满苔藓的原木 (防火)
S:gt.block.log.1.fireproof.6.name=苔痕原木 (防火)
S:gt.block.log.1.fireproof.7.name=结冰的原木 (防火)
S:gt.block.log.1.fireproof.8.name=枯死的原木 (防火)
S:gt.block.log.1.fireproof.9.name=腐败的原木 (防火)
Expand Down Expand Up @@ -1183,7 +1183,7 @@ S:gt.block.planks.10.name=压缩木板
S:gt.block.planks.11.name=空板条箱
S:gt.block.planks.12.name=枯死的木板
S:gt.block.planks.13.name=腐败的木板
S:gt.block.planks.14.name=长满苔藓的木板
S:gt.block.planks.14.name=苔痕木板
S:gt.block.planks.15.name=结冰的木板
S:gt.block.planks.2.name=柳树木板
S:gt.block.planks.3.name=高红槿木板
Expand All @@ -1200,7 +1200,7 @@ S:gt.block.planks.fireproof.10.name=木板 (防火)
S:gt.block.planks.fireproof.11.name=压缩木 (防火)
S:gt.block.planks.fireproof.12.name=枯死的木板 (防火)
S:gt.block.planks.fireproof.13.name=腐败的木板 (防火)
S:gt.block.planks.fireproof.14.name=长满苔藓的木板 (防火)
S:gt.block.planks.fireproof.14.name=苔痕木板 (防火)
S:gt.block.planks.fireproof.15.name=结冰的木板 (防火)
S:gt.block.planks.fireproof.2.name=柳树木板 (防火)
S:gt.block.planks.fireproof.3.name=高红槿木板 (防火)
Expand All @@ -1217,7 +1217,7 @@ S:gt.block.planks.fireproof.slab.0.10.name=木半砖 (防火)
S:gt.block.planks.fireproof.slab.0.11.name=压缩木木半砖 (防火)
S:gt.block.planks.fireproof.slab.0.12.name=枯死的木半砖 (防火)
S:gt.block.planks.fireproof.slab.0.13.name=腐败的木半砖 (防火)
S:gt.block.planks.fireproof.slab.0.14.name=长满苔藓的木半砖 (防火)
S:gt.block.planks.fireproof.slab.0.14.name=苔痕木半砖 (防火)
S:gt.block.planks.fireproof.slab.0.15.name=结冰的木半砖 (防火)
S:gt.block.planks.fireproof.slab.0.2.name=柳树木半砖 (防火)
S:gt.block.planks.fireproof.slab.0.3.name=高红槿木半砖 (防火)
Expand All @@ -1234,7 +1234,7 @@ S:gt.block.planks.fireproof.slab.1.10.name=木半砖 (防火)
S:gt.block.planks.fireproof.slab.1.11.name=压缩木木半砖 (防火)
S:gt.block.planks.fireproof.slab.1.12.name=枯死的木半砖 (防火)
S:gt.block.planks.fireproof.slab.1.13.name=腐败的木半砖 (防火)
S:gt.block.planks.fireproof.slab.1.14.name=长满苔藓的木半砖 (防火)
S:gt.block.planks.fireproof.slab.1.14.name=苔痕木半砖 (防火)
S:gt.block.planks.fireproof.slab.1.15.name=结冰的木半砖 (防火)
S:gt.block.planks.fireproof.slab.1.2.name=柳树木半砖 (防火)
S:gt.block.planks.fireproof.slab.1.3.name=高红槿木半砖 (防火)
Expand All @@ -1251,7 +1251,7 @@ S:gt.block.planks.fireproof.slab.2.10.name=木半砖 (防火)
S:gt.block.planks.fireproof.slab.2.11.name=压缩木木半砖 (防火)
S:gt.block.planks.fireproof.slab.2.12.name=枯死的木半砖 (防火)
S:gt.block.planks.fireproof.slab.2.13.name=腐败的木半砖 (防火)
S:gt.block.planks.fireproof.slab.2.14.name=长满苔藓的木半砖 (防火)
S:gt.block.planks.fireproof.slab.2.14.name=苔痕木半砖 (防火)
S:gt.block.planks.fireproof.slab.2.15.name=结冰的木半砖 (防火)
S:gt.block.planks.fireproof.slab.2.2.name=柳树木半砖 (防火)
S:gt.block.planks.fireproof.slab.2.3.name=高红槿木半砖 (防火)
Expand All @@ -1268,7 +1268,7 @@ S:gt.block.planks.fireproof.slab.3.10.name=木半砖 (防火)
S:gt.block.planks.fireproof.slab.3.11.name=压缩木木半砖 (防火)
S:gt.block.planks.fireproof.slab.3.12.name=枯死的木半砖 (防火)
S:gt.block.planks.fireproof.slab.3.13.name=腐败的木半砖 (防火)
S:gt.block.planks.fireproof.slab.3.14.name=长满苔藓的木半砖 (防火)
S:gt.block.planks.fireproof.slab.3.14.name=苔痕木半砖 (防火)
S:gt.block.planks.fireproof.slab.3.15.name=结冰的木半砖 (防火)
S:gt.block.planks.fireproof.slab.3.2.name=柳树木半砖 (防火)
S:gt.block.planks.fireproof.slab.3.3.name=高红槿木半砖 (防火)
Expand All @@ -1285,7 +1285,7 @@ S:gt.block.planks.fireproof.slab.4.10.name=木半砖 (防火)
S:gt.block.planks.fireproof.slab.4.11.name=压缩木木半砖 (防火)
S:gt.block.planks.fireproof.slab.4.12.name=枯死的木半砖 (防火)
S:gt.block.planks.fireproof.slab.4.13.name=腐败的木半砖 (防火)
S:gt.block.planks.fireproof.slab.4.14.name=长满苔藓的木半砖 (防火)
S:gt.block.planks.fireproof.slab.4.14.name=苔痕木半砖 (防火)
S:gt.block.planks.fireproof.slab.4.15.name=结冰的木半砖 (防火)
S:gt.block.planks.fireproof.slab.4.2.name=柳树木半砖 (防火)
S:gt.block.planks.fireproof.slab.4.3.name=高红槿木半砖 (防火)
Expand All @@ -1302,7 +1302,7 @@ S:gt.block.planks.fireproof.slab.5.10.name=木半砖 (防火)
S:gt.block.planks.fireproof.slab.5.11.name=压缩木木半砖 (防火)
S:gt.block.planks.fireproof.slab.5.12.name=枯死的木半砖 (防火)
S:gt.block.planks.fireproof.slab.5.13.name=腐败的木半砖 (防火)
S:gt.block.planks.fireproof.slab.5.14.name=长满苔藓的木半砖 (防火)
S:gt.block.planks.fireproof.slab.5.14.name=苔痕木半砖 (防火)
S:gt.block.planks.fireproof.slab.5.15.name=结冰的木半砖 (防火)
S:gt.block.planks.fireproof.slab.5.2.name=柳树木半砖 (防火)
S:gt.block.planks.fireproof.slab.5.3.name=高红槿木半砖 (防火)
Expand All @@ -1319,7 +1319,7 @@ S:gt.block.planks.slab.0.10.name=压缩木半砖
S:gt.block.planks.slab.0.11.name=压缩木木半砖
S:gt.block.planks.slab.0.12.name=枯死的木半砖
S:gt.block.planks.slab.0.13.name=腐败的木半砖
S:gt.block.planks.slab.0.14.name=长满苔藓的木半砖
S:gt.block.planks.slab.0.14.name=苔痕木半砖
S:gt.block.planks.slab.0.15.name=结冰的木半砖
S:gt.block.planks.slab.0.2.name=柳树木半砖
S:gt.block.planks.slab.0.3.name=高红槿木半砖
Expand All @@ -1336,7 +1336,7 @@ S:gt.block.planks.slab.1.10.name=压缩木半砖
S:gt.block.planks.slab.1.11.name=压缩木木半砖
S:gt.block.planks.slab.1.12.name=枯死的木半砖
S:gt.block.planks.slab.1.13.name=腐败的木半砖
S:gt.block.planks.slab.1.14.name=长满苔藓的木半砖
S:gt.block.planks.slab.1.14.name=苔痕木半砖
S:gt.block.planks.slab.1.15.name=结冰的木半砖
S:gt.block.planks.slab.1.2.name=柳树木半砖
S:gt.block.planks.slab.1.3.name=高红槿木半砖
Expand All @@ -1353,7 +1353,7 @@ S:gt.block.planks.slab.2.10.name=压缩木半砖
S:gt.block.planks.slab.2.11.name=压缩木木半砖
S:gt.block.planks.slab.2.12.name=枯死的木半砖
S:gt.block.planks.slab.2.13.name=腐败的木半砖
S:gt.block.planks.slab.2.14.name=长满苔藓的木半砖
S:gt.block.planks.slab.2.14.name=苔痕木半砖
S:gt.block.planks.slab.2.15.name=结冰的木半砖
S:gt.block.planks.slab.2.2.name=柳树木半砖
S:gt.block.planks.slab.2.3.name=高红槿木半砖
Expand All @@ -1370,7 +1370,7 @@ S:gt.block.planks.slab.3.10.name=压缩木半砖
S:gt.block.planks.slab.3.11.name=压缩木木半砖
S:gt.block.planks.slab.3.12.name=枯死的木半砖
S:gt.block.planks.slab.3.13.name=腐败的木半砖
S:gt.block.planks.slab.3.14.name=长满苔藓的木半砖
S:gt.block.planks.slab.3.14.name=苔痕木半砖
S:gt.block.planks.slab.3.15.name=结冰的木半砖
S:gt.block.planks.slab.3.2.name=柳树木半砖
S:gt.block.planks.slab.3.3.name=高红槿木半砖
Expand All @@ -1387,7 +1387,7 @@ S:gt.block.planks.slab.4.10.name=压缩木半砖
S:gt.block.planks.slab.4.11.name=压缩木木半砖
S:gt.block.planks.slab.4.12.name=枯死的木半砖
S:gt.block.planks.slab.4.13.name=腐败的木半砖
S:gt.block.planks.slab.4.14.name=长满苔藓的木半砖
S:gt.block.planks.slab.4.14.name=苔痕木半砖
S:gt.block.planks.slab.4.15.name=结冰的木半砖
S:gt.block.planks.slab.4.2.name=柳树木半砖
S:gt.block.planks.slab.4.3.name=高红槿木半砖
Expand All @@ -1404,7 +1404,7 @@ S:gt.block.planks.slab.5.10.name=压缩木半砖
S:gt.block.planks.slab.5.11.name=压缩木木半砖
S:gt.block.planks.slab.5.12.name=枯死的木半砖
S:gt.block.planks.slab.5.13.name=腐败的木半砖
S:gt.block.planks.slab.5.14.name=长满苔藓的木半砖
S:gt.block.planks.slab.5.14.name=苔痕木半砖
S:gt.block.planks.slab.5.15.name=结冰的木半砖
S:gt.block.planks.slab.5.2.name=柳树木半砖
S:gt.block.planks.slab.5.3.name=高红槿木半砖
Expand Down
10 changes: 5 additions & 5 deletions lang/gt_material/zh_cn.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ S:gt.material.Alunite=明矾石
S:gt.material.Amber=琥珀
S:gt.material.Americium=镅
S:gt.material.Americium241=镅-241
S:gt.material.Amethyst=紫晶
S:gt.material.Amethyst=紫水晶
S:gt.material.AmethystEnder=末影紫晶
S:gt.material.Ammonia=氨
S:gt.material.Ammonium=铵
Expand Down Expand Up @@ -912,7 +912,7 @@ S:gt.material.Francium=钫
S:gt.material.FreshWater=淡水
S:gt.material.Frezarite=冰霜陨石
S:gt.material.FrozenIron=冰霜之铁
S:gt.material.FryingOilHot=热炸油
S:gt.material.FryingOilHot=热食用油
S:gt.material.Fuel=柴油
S:gt.material.FuelOil=燃油
S:gt.material.FullersEarth=漂白土
Expand Down Expand Up @@ -1060,7 +1060,7 @@ S:gt.material.Kyanite=蓝晶石
S:gt.material.Lantanium=镧
S:gt.material.Lantanum=镧
S:gt.material.Lapis=青金石
S:gt.material.Latex=天然橡胶
S:gt.material.Latex=胶乳
S:gt.material.Lava=岩浆
S:gt.material.LavenderQuartz=熏香石英
S:gt.material.Lawrencium=铹
Expand Down Expand Up @@ -1443,7 +1443,7 @@ S:gt.material.Steel=钢
S:gt.material.SteelGalvanized=镀锌钢
S:gt.material.SteelMagnetic=磁化钢
S:gt.material.Steeleaf=钢叶
S:gt.material.SterlingSilver=标准纯银
S:gt.material.SterlingSilver=纯银
S:gt.material.Stibnite=辉锑矿
S:gt.material.Stolzite=钨铅矿
S:gt.material.Stone=石
Expand Down Expand Up @@ -1631,7 +1631,7 @@ S:gt.material.Turquoise=绿松石
S:gt.material.UUAmplifier=UU增殖液
S:gt.material.UUMatter=UU物质
S:gt.material.Ultimate=极限
S:gt.material.Ultimet=哈式合金
S:gt.material.Ultimet=哈氏合金
S:gt.material.Umber=深棕石头
S:gt.material.Unbibium=122号元素(Ubb)
S:gt.material.Unbiennium=129号元素(Ube)
Expand Down
12 changes: 6 additions & 6 deletions lang/gt_multitileentity/zh_cn.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,12 +309,12 @@ S:gt.multitileentity.14502.name=能量水晶 (T2)
S:gt.multitileentity.14503.name=能量水晶 (T3)
S:gt.multitileentity.14504.name=能量水晶 (T4)
S:gt.multitileentity.14505.name=能量水晶 (T5)
S:gt.multitileentity.14510.name=青色能量水晶 (T0)
S:gt.multitileentity.14511.name=青色能量水晶 (T1)
S:gt.multitileentity.14512.name=青色能量水晶 (T2)
S:gt.multitileentity.14513.name=青色能量水晶 (T3)
S:gt.multitileentity.14514.name=青色能量水晶 (T4)
S:gt.multitileentity.14515.name=青色能量水晶 (T5)
S:gt.multitileentity.14510.name=青能水晶 (T0)
S:gt.multitileentity.14511.name=青能水晶 (T1)
S:gt.multitileentity.14512.name=青能水晶 (T2)
S:gt.multitileentity.14513.name=青能水晶 (T3)
S:gt.multitileentity.14514.name=青能水晶 (T4)
S:gt.multitileentity.14515.name=青能水晶 (T5)
S:gt.multitileentity.1452.name=致密燃烧室 (液体, 青铜)
S:gt.multitileentity.1453.name=致密燃烧室 (液体, 殷钢)
S:gt.multitileentity.1454.name=致密燃烧室 (液体, 钢)
Expand Down
Loading

0 comments on commit 6d6e9fd

Please sign in to comment.