Merge branch 'DEV' into Kitsu

src/main/java/nmd/primal/energy/crafting/ModCrafting.java

@@ -41,6 +41,9 @@ public class ModCrafting {
 					" s ",
 					" s ",
 					'f', Items.string, 's', Items.stick});
+		
+		GameRegistry.addSmelting(ModItems.coarseironItem, new ItemStack(Items.iron_ingot), 1.0F);
+		GameRegistry.addSmelting(ModItems.coarsegoldItem, new ItemStack(Items.gold_ingot), 1.0F);
 				
 	}
 }

src/main/java/nmd/primal/energy/item/ModItems.java

@@ -14,6 +14,8 @@ public class ModItems {
 	public static Item sgearItem;
 	public static Item saxleItem;
 	public static Item stoneGrinder;
+	public static Item coarseironItem;
+	public static Item coarsegoldItem;
 	
 	public static void registerItems(){
 		
@@ -29,6 +31,12 @@ public class ModItems {
 		saxleItem = new Item().setUnlocalizedName("saxleItem").setCreativeTab(CustomTab.NMDEnergyTab).setTextureName(ModInfo.MOD_ID + ":saxleItem");
 		GameRegistry.registerItem(saxleItem, "saxleItem");
 		
+		coarseironItem = new Item().setUnlocalizedName("coarseironItem").setCreativeTab(CustomTab.NMDEnergyTab).setTextureName(ModInfo.MOD_ID + ":coarseironItem");
+		GameRegistry.registerItem(coarseironItem, "coarseironItem");
+		
+		coarsegoldItem = new Item().setUnlocalizedName("coarsegoldItem").setCreativeTab(CustomTab.NMDEnergyTab).setTextureName(ModInfo.MOD_ID + ":coarsegoldItem");
+		GameRegistry.registerItem(coarsegoldItem, "coarsegoldItem");
+		
 	}
 	
 	

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
+