Merge pull request #132 from valiray/master

sync lang entry locations and add missing entry's

Author: KasumiNova

src/main/resources/assets/modularmachinery/lang/en_US.lang

@@ -67,7 +67,6 @@ gui.meiteminputbus.inv_action.decrease=Press the %s key combination to decrease
 gui.meiteminputbus.items_marked=Items marked: %s
 gui.meitembus.item_cached=Items Cached: %s
 gui.meitembus.nbt_stored=Items have been stored internally.
-gui.mepatternprovider.nbt_stored=Provider Configured.
 
 gui.mefluidoutputbus.title=ME Machinery Fluid Output Bus
 gui.mefluidinputbus.title=ME Machinery Fluid Input Bus
@@ -86,6 +85,7 @@ gui.mepatternprovider.enhanced_blocking_mode.desc=Enhanced Blocking Mode: builds
 gui.mepatternprovider.work_mode.desc=Provider work mode (Click to switch between the 4 modes):
 gui.mepatternprovider.return_items=Return Items
 gui.mepatternprovider.return_items.desc=Return all items and fluids in the provider to the ME network. This will reset the state of the Crafting Lock Mode.
+gui.mepatternprovider.nbt_stored=Provider Configured.
 
 gui.preview.button.menu.tip=Click to open the Preview Options menu.
 gui.preview.button.machine_info=Extra Info:
@@ -183,6 +183,8 @@ message.assembly.tip.missing=Modular Assembly: %s Needs item assembly, but inven
 message.assembly.tip.required=Modular assembly: Missing ingredients, the following ingredients are required:
 message.assembly.tip.or=or
 message.assembly.tip.partial_assembly=Modular Assembly: despite the absence of some materials, the assembly §cwill continue using the existing materials!
+message.assembly.tip.too_quickly=Modular Assembly: You need to wait a moment before you can start assembly again.
+
 
 message.reloading=Modular Machinery: Reloading!
 message.reloaded=Modular Machinery: Reloaded recipes! Changes in JEI require a restart of the client! Machinery upgrades in the upgrade bus need to be repositioned to refresh their effects!
@@ -382,6 +384,8 @@ tile.modularmachinery.blockmeitemoutputbus.name=ME Machinery Item Output Bus
 tile.modularmachinery.blockmeiteminputbus.name=ME Machinery Item Input Bus
 tile.modularmachinery.blockmefluidoutputbus.name=ME Machinery Fluid Output Bus
 tile.modularmachinery.blockmefluidinputbus.name=ME Machinery Fluid Input Bus
+tile.modularmachinery.blockmegasoutputbus.name=ME Mechanical gas output bus
+tile.modularmachinery.blockmegasinputbus.name=ME Machinery Gas Input Bus
 tile.modularmachinery.blockmepatternprovider.name=ME Machinery Pattern Provider
 
 error.modularmachinery.requirement.lifeessence=Error while checking Life Essence requirement
@@ -435,4 +439,7 @@ tile.modularmachinery.blockrainbowprovider.name=Rainbow Input Hatch
 tile.modularmachinery.blockmanaproviderinput.name=Mana Input Hatch
 tile.modularmachinery.blockmanaprovideroutput.name=Mana Output Hatch
 tile.modularmachinery.blockimpetusproviderinput.name=Impetus Input Hatch
-tile.modularmachinery.blockimpetusprovideroutput.name=Impetus Output Hatch
+tile.modularmachinery.blockimpetusprovideroutput.name=Impetus Output Hatch
+
+
+tooltip.modularcontroller.machine_projector=Right-click on the controller while crouching to project the blueprint of his machine into the world.

src/main/resources/assets/modularmachinery/lang/zh_CN.lang

@@ -58,6 +58,7 @@ gui.upgradebus.incompatible=§e警告：%s 与此机械不兼容。
 
 gui.meitemoutputbus.title=ME 机械物品输出总线
 gui.meiteminputbus.title=ME 机械物品输入总线
+
 gui.meiteminputbus.inv_action=使用滚轮和 SHIFT, CONTROL, ALT 组合键来修改标记物品的数量。
 gui.meiteminputbus.inv_action.increase.normal=滚轮向上滚动增加 1 个物品数量。
 gui.meiteminputbus.inv_action.decrease.normal=滚轮向下滚动或右击物品减少 1 个物品数量。
@@ -121,10 +122,6 @@ gui.preview.optifine_shader_pack_warn=§4Optifine 光影不兼容！预览性能
 gui.preview.vbo_unsupported_warn=§4显卡不兼容顶点缓冲器！预览性能将大幅下降。
 gui.preview.vbo_disabled_warn=§4顶点缓冲器未启用！预览性能将大幅下降。
 
-gui.blueprint.popout.info=潜行以将当前预览锁定在当前世界中。
-gui.blueprint.popout.place=右击以显示预览；远离或放置其他结构预览（蓝图）将会清除此前世界中的结构预览；视角面对控制器时可以根据其朝向自动旋转。
-gui.blueprint.popout.placed.dynamic_pattern=投影期间使用自动组装时会优先使用投影的动态结构大小。
-
 top.recipe.progress=进度
 top.machine.owner=所有者：
 top.machine.owner.self=你
@@ -162,6 +159,10 @@ component.missing.modularmachinery.item.output=没有找到物品输出口！
 component.missing.modularmachinery.item.input=没有找到物品输入口！
 component.missing.modularmachinery.interface.number=没有找到对应类型的智能数据接口！
 
+gui.blueprint.popout.info=潜行以将当前预览锁定在当前世界中。
+gui.blueprint.popout.place=右击以显示预览；远离或放置其他结构预览（蓝图）将会清除此前世界中的结构预览；视角面对控制器时可以根据其朝向自动旋转。
+gui.blueprint.popout.placed.dynamic_pattern=投影期间使用自动组装时会优先使用投影的动态结构大小。
+
 jei.category.preview=结构预览
 
 message.structurebuild.confirmrotation=控制器面朝 %s
@@ -439,3 +440,5 @@ tile.modularmachinery.blockimpetusproviderinput.name=元动输入接口
 tile.modularmachinery.blockimpetusprovideroutput.name=元动输出接口
 
 tooltip.modularcontroller.machine_projector=蹲下时右击控制器以投影其机器的蓝图至世界。
+
+