tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/aidancbrady/Mekanism

Browse source
This commit is contained in:
Aidan Brady 2013-11-17 10:55:27 -05:00
commit a1f814a953
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.xml
View file

@ -145,5 +145,7 @@
<zip destfile="MDK.zip"> <zip destfile="MDK.zip">
<fileset dir="mdkContents"/> <fileset dir="mdkContents"/>
</zip> </zip>
<copy todir="output" file="build.properties" />
</target> </target>
</project> </project>

21
resources/assets/mekanism/lang/zh_CN.lang
View file

@ -32,7 +32,7 @@ tile.BasicBlock.RefinedObsidian.name=强化黑曜石
tile.BasicBlock.CoalBlock.name=煤炭方块 tile.BasicBlock.CoalBlock.name=煤炭方块
tile.BasicBlock.RefinedGlowstone.name=强化荧石 tile.BasicBlock.RefinedGlowstone.name=强化荧石
tile.BasicBlock.SteelBlock.name=钢方块 tile.BasicBlock.SteelBlock.name=钢方块
tile.BasicBlock.Bin.name=Bin tile.BasicBlock.Bin.name=箱柜
tile.BasicBlock.TeleporterFrame.name=传送框架 tile.BasicBlock.TeleporterFrame.name=传送框架
tile.BasicBlock.SteelCasing.name=钢质机壳 tile.BasicBlock.SteelCasing.name=钢质机壳
tile.BasicBlock.DynamicTank.name=动态储罐 tile.BasicBlock.DynamicTank.name=动态储罐
@ -40,7 +40,7 @@ tile.BasicBlock.DynamicGlass.name=动态玻璃
tile.BasicBlock.DynamicValve.name=动态阀门 tile.BasicBlock.DynamicValve.name=动态阀门
//Machine Block //Machine Block
tile.MachineBlock.EnrichmentChamber.name=富集仓E tile.MachineBlock.EnrichmentChamber.name=富集仓
tile.MachineBlock.OsmiumCompressor.name=锇压缩机 tile.MachineBlock.OsmiumCompressor.name=锇压缩机
tile.MachineBlock.Combiner.name=融合机 tile.MachineBlock.Combiner.name=融合机
tile.MachineBlock.Crusher.name=粉碎机 tile.MachineBlock.Crusher.name=粉碎机
@ -92,7 +92,7 @@ item.tinClump.name=锡疙瘩
item.silverClump.name=银疙瘩 item.silverClump.name=银疙瘩
item.obsidianClump.name=黑曜石疙瘩 item.obsidianClump.name=黑曜石疙瘩
//Dirty粉 //DirtyDust
item.dirtyIronDust.name=污浊的铁粉 item.dirtyIronDust.name=污浊的铁粉
item.dirtyGoldDust.name=污浊的金粉 item.dirtyGoldDust.name=污浊的金粉
item.dirtyOsmiumDust.name=污浊的锇粉 item.dirtyOsmiumDust.name=污浊的锇粉
@ -211,3 +211,18 @@ item.SteelHelmet.name=钢头盔
item.SteelChestplate.name=钢胸甲 item.SteelChestplate.name=钢胸甲
item.SteelLeggings.name=钢护腿 item.SteelLeggings.name=钢护腿
item.SteelBoots.name=钢靴子 item.SteelBoots.name=钢靴子
//*********//
//INDUCTION//
//*********//
//Blocks
tile.Tesla.name=特斯拉线圈
tile.Multimeter.name=万用表
tile.ElectromagneticContractor.name=电磁承接口
tile.Battery.name=模块电池
//Items
item.Capacitor.name=电容器
item.InfiniteCapacitor.name=无限电容器
item.Linker.name=静电链接器