Merge remote-tracking branch 'origin/master'

This commit is contained in:
Tntrololol 2015-06-07 13:06:08 -05:00
commit d9e219054e
6 changed files with 19 additions and 6 deletions

View file

@ -52,6 +52,7 @@ tile.techreborn.machineFrame.bronze.name=Brone Machine Hull
tile.techreborn.machineFrame.brass.name=Brass Machine Hull
tile.techreborn.machineFrame.steel.name=Steel Machine Hull
tile.techreborn.machineFrame.titanium.name=Titanium Machine Hull
tile.techreborn.industrialSawmill.name=Saw Mill
#Ores
tile.techreborn.ore.Galena.name=Galena Ore