Merge branch 'DEV' into Kitsu

2015-08-29 21:28:38 -04:00
parent e5a69ffba2 71d0eab21a
commit a774fd5a9e
5 changed files with 18 additions and 1 deletions
--- a/src/main/resources/assets/energy/lang/en_US.lang
+++ b/src/main/resources/assets/energy/lang/en_US.lang
@@ -4,6 +4,12 @@ item.schiselItem.name=Standard Chisel
 item.swheelItem.name=Standard Wheel
 item.sgearItem.name=Standard Gear
 item.saxleItem.name=Standard Axle
+item.stoneGrindWheel.name=Stone Grind Wheel
+item.coarseironItem.name=Coarse Iron Dust
+item.coarsegoldItem.name=Coarse Gold Dust

 tile.SMBBlock.name=Standard Machine Box
-tile.CrankBlock.name=Crank
+tile.CrankBlock.name=Crank
+tile.FlintLathe.name=Flint Lathe
+tile.CrankGrinder.name=Crank Grinder
+
--- a/src/main/resources/assets/energy/textures/items/coarsegoldItem.png
+++ b/src/main/resources/assets/energy/textures/items/coarsegoldItem.png
--- a/src/main/resources/assets/energy/textures/items/coarseironItem.png
+++ b/src/main/resources/assets/energy/textures/items/coarseironItem.png