Merge branch 'master' of https://github.com/SlimeKnights/TinkersConst…

…ruct
SlimeKnights · Dec 24, 2014 · 7eadf0d · 7eadf0d
2 parents 6966d8c + b32b12d
commit 7eadf0d
Show file tree

Hide file tree

Showing 2 changed files with 242 additions and 6 deletions.
diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang
@@ -3,6 +3,7 @@ itemGroup.TConstructMaterials=TConstruct Materials
 itemGroup.TConstructBlocks=TConstruct Blocks
 itemGroup.TConstructParts=TConstruct Tool Parts
 itemGroup.TConstructEquipables=TConstruct Equipables
+itemGroup.TConstructWeaponry=TConstruct Weaponry
 
 crafters.ToolStation=Tool Station
 crafters.ToolForge=Tool Forge