diff --git a/bin/com/kitsu/medievalcraft/Main.class b/bin/com/kitsu/medievalcraft/Main.class
index ac9f538d..70a766c5 100644
Binary files a/bin/com/kitsu/medievalcraft/Main.class and b/bin/com/kitsu/medievalcraft/Main.class differ
diff --git a/bin/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.class b/bin/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.class
index a0ee7f6e..564f1988 100644
Binary files a/bin/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.class and b/bin/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.class differ
diff --git a/bin/mcmod.info b/bin/mcmod.info
index dc8c8d60..18a9e0f5 100644
--- a/bin/mcmod.info
+++ b/bin/mcmod.info
@@ -3,7 +3,7 @@
   "modid": "kitsumedievalcraft",
   "name": "ForgeCraft",
   "description": "ForgeCraft",
-  "version": "{2.3.0}",
+  "version": "{2.3.1}",
   "mcversion": "{1.7.10}",
   "url": "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/2296334-wip-kitsus-forgecraft-blacksmith-style-forging",
   "updateUrl": "https://bitbucket.org/kitsushadow/kitsus-forgecraft/downloads",
diff --git a/src/main/java/com/kitsu/medievalcraft/Main.java b/src/main/java/com/kitsu/medievalcraft/Main.java
index 7723b8e7..1c9a7364 100644
--- a/src/main/java/com/kitsu/medievalcraft/Main.java
+++ b/src/main/java/com/kitsu/medievalcraft/Main.java
@@ -55,7 +55,7 @@ public class Main {
 
 	public static final String MODID = "kitsumedievalcraft";
 	public static final String MODNAME = "ForgeCraft";
-	public static final String VERSION = "2.3.0";
+	public static final String VERSION = "2.3.1";
 
 	public static SimpleNetworkWrapper sNet;
 
diff --git a/src/main/java/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.java b/src/main/java/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.java
index c55ae606..699b1383 100644
--- a/src/main/java/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.java
+++ b/src/main/java/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.java
@@ -85,7 +85,7 @@ public class ForgeHammer extends Item implements AnvilUtil{
 			tilePlate = (TileIronPlate) world.getTileEntity(x, y, z);
 		}
 		if((blockSub == ModBlocks.forgeAnvil)&&(p.isSwingInProgress == false)){
-			
+
 			TileEntityAnvilForge tileEnt = (TileEntityAnvilForge) world.getTileEntity(x, y-1, z);
 			if((block instanceof IngotBase)&&(block==ModBlocks.refinedIron)){
 				TileIngotBase tile = (TileIngotBase) world.getTileEntity(x, y, z);
@@ -103,29 +103,7 @@ public class ForgeHammer extends Item implements AnvilUtil{
 					}
 				}
 				if(tileEnt.getStackInSlot(0)!=null){
-				if((tileEnt.getStackInSlot(0).getItem().equals(Items.flower_pot))||tileEnt.getStackInSlot(0).getItem().equals(Items.bucket)){
-					p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F);
-					Main.sNet.sendToAll(new MsgPacket(true));
-					Main.sNet.sendToAll(new MsgPacketLocX(x));
-					Main.sNet.sendToAll(new MsgPacketLocY(y));
-					Main.sNet.sendToAll(new MsgPacketLocZ(z));
-					tile.hits++;
-					stack.damageItem(1, p);
-					if(tile.hits >= 4 + rand.nextInt(3)){
-						world.setBlock(x, y, z, Blocks.air, 0, 2);
-
-						if(tileEnt.getStackInSlot(0).getItem().equals(Items.flower_pot)){
-							tileEnt.decrStackSize(0, 1);
-						}
-						world.spawnEntityInWorld(new EntityItem(world, x+0.5D, y+0.6D, z+0.5D, new ItemStack(Items.bucket, 1)));
-					}
-				}
-				
-
-				//IRON FORMS
-				if(tileEnt.getStackInSlot(0)!=null){
-					if((tileEnt.getStackInSlot(0).getItem() instanceof IronForms)&&(tile.hot==true)){
-						//System.out.println("working");
+					if((tileEnt.getStackInSlot(0).getItem().equals(Items.flower_pot))||tileEnt.getStackInSlot(0).getItem().equals(Items.bucket)){
 						p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F);
 						Main.sNet.sendToAll(new MsgPacket(true));
 						Main.sNet.sendToAll(new MsgPacketLocX(x));
@@ -134,60 +112,86 @@ public class ForgeHammer extends Item implements AnvilUtil{
 						tile.hits++;
 						stack.damageItem(1, p);
 						if(tile.hits >= 4 + rand.nextInt(3)){
-							world.spawnEntityInWorld(new EntityItem(world, x+0.5D, y+0.6D, z+0.5D, formsIron.get(tileEnt.getStackInSlot(0).getItem())));
 							world.setBlock(x, y, z, Blocks.air, 0, 2);
-							if(tileEnt.getStackInSlot(0).getMaxStackSize() == 1){
-								if(tileEnt.getStackInSlot(0).getItemDamage() == tileEnt.getStackInSlot(0).getMaxDamage()-1){
-									tileEnt.decrStackSize(0, 1);
-								}
-								else {tileEnt.getStackInSlot(0).setItemDamage(tileEnt.getStackInSlot(0).getItemDamage()+1);
-								}
+
+							if(tileEnt.getStackInSlot(0).getItem().equals(Items.flower_pot)){
+								tileEnt.decrStackSize(0, 1);
 							}
+							world.spawnEntityInWorld(new EntityItem(world, x+0.5D, y+0.6D, z+0.5D, new ItemStack(Items.bucket, 1)));
 						}
 					}
-					//CLAY FORMS
-					if((tileEnt.getStackInSlot(0).getItem() instanceof ClayForms)&&(tile.hot==true)){
-						p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F);
-						Main.sNet.sendToAll(new MsgPacket(true));
-						Main.sNet.sendToAll(new MsgPacketLocX(x));
-						Main.sNet.sendToAll(new MsgPacketLocY(y));
-						Main.sNet.sendToAll(new MsgPacketLocZ(z));
-						tile.hits++;
-						stack.damageItem(1, p);
-						if(tile.hits >= 4 + rand.nextInt(3)){
-							world.spawnEntityInWorld(new EntityItem(world, x+0.5D, y+0.6D, z+0.5D, formsClay.get(tileEnt.getStackInSlot(0).getItem())));
-							world.setBlock(x, y, z, Blocks.air, 0, 2);
-							tileEnt.decrStackSize(0, 1);
-							tile.markForUpdate();
-						}
-					}
-				}
-			}
 
-			if((block instanceof IngotBase)){
-				//TileIngotBase tile = (TileIngotBase) world.getTileEntity(x, y, z);
-				//REPAIR TOOLS
 
-				if(tileEnt.getStackInSlot(0) != null){
-					Item checkItem = tileEnt.getStackInSlot(0).getItem();
-					String displayName = tileEnt.getStackInSlot(0).getDisplayName();
-					if(displayName.equals(getTool(tileEnt.getStackInSlot(0)))&&(tile.hot == true)&&(block==ModBlocks.refinedIron)){
-						if(tileEnt.getStackInSlot(0).isItemDamaged() == true){
+					//IRON FORMS
+					if(tileEnt.getStackInSlot(0)!=null){
+						if((tileEnt.getStackInSlot(0).getItem() instanceof IronForms)&&(tile.hot==true)){
+							//System.out.println("working");
 							p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F);
 							Main.sNet.sendToAll(new MsgPacket(true));
 							Main.sNet.sendToAll(new MsgPacketLocX(x));
 							Main.sNet.sendToAll(new MsgPacketLocY(y));
 							Main.sNet.sendToAll(new MsgPacketLocZ(z));
-							stack.damageItem(1, p);
 							tile.hits++;
+							stack.damageItem(1, p);
 							if(tile.hits >= 4 + rand.nextInt(3)){
-								checkItem.setDamage(tileEnt.getStackInSlot(0), 0);
+								world.spawnEntityInWorld(new EntityItem(world, x+0.5D, y+0.6D, z+0.5D, formsIron.get(tileEnt.getStackInSlot(0).getItem())));
 								world.setBlock(x, y, z, Blocks.air, 0, 2);
+								if(tileEnt.getStackInSlot(0).getMaxStackSize() == 1){
+									if(tileEnt.getStackInSlot(0).getItemDamage() == tileEnt.getStackInSlot(0).getMaxDamage()-1){
+										tileEnt.decrStackSize(0, 1);
+									}
+									else {tileEnt.getStackInSlot(0).setItemDamage(tileEnt.getStackInSlot(0).getItemDamage()+1);
+									}
+								}
+							}
+						}
+						//CLAY FORMS
+						if((tileEnt.getStackInSlot(0).getItem() instanceof ClayForms)&&(tile.hot==true)){
+							p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F);
+							Main.sNet.sendToAll(new MsgPacket(true));
+							Main.sNet.sendToAll(new MsgPacketLocX(x));
+							Main.sNet.sendToAll(new MsgPacketLocY(y));
+							Main.sNet.sendToAll(new MsgPacketLocZ(z));
+							tile.hits++;
+							stack.damageItem(1, p);
+							if(tile.hits >= 4 + rand.nextInt(3)){
+								world.spawnEntityInWorld(new EntityItem(world, x+0.5D, y+0.6D, z+0.5D, formsClay.get(tileEnt.getStackInSlot(0).getItem())));
+								world.setBlock(x, y, z, Blocks.air, 0, 2);
+								tileEnt.decrStackSize(0, 1);
+								tile.markForUpdate();
 							}
 						}
 					}
 				}
-				//MAKE FORMS
+
+				if((block instanceof IngotBase)){
+					//TileIngotBase tile = (TileIngotBase) world.getTileEntity(x, y, z);
+					//REPAIR TOOLS
+
+					if(tileEnt.getStackInSlot(0) != null){
+						Item checkItem = tileEnt.getStackInSlot(0).getItem();
+						String displayName = tileEnt.getStackInSlot(0).getDisplayName();
+						if(displayName.equals(getTool(tileEnt.getStackInSlot(0)))&&(tile.hot == true)&&(block==ModBlocks.refinedIron)){
+							if(tileEnt.getStackInSlot(0).isItemDamaged() == true){
+								p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F);
+								Main.sNet.sendToAll(new MsgPacket(true));
+								Main.sNet.sendToAll(new MsgPacketLocX(x));
+								Main.sNet.sendToAll(new MsgPacketLocY(y));
+								Main.sNet.sendToAll(new MsgPacketLocZ(z));
+								stack.damageItem(1, p);
+								tile.hits++;
+								if(tile.hits >= 4 + rand.nextInt(3)){
+									checkItem.setDamage(tileEnt.getStackInSlot(0), 0);
+									world.setBlock(x, y, z, Blocks.air, 0, 2);
+								}
+							}
+						}
+					}
+				}
+			}
+			//MAKE FORMS
+			if((block instanceof IngotBase)&&(block==ModBlocks.ironPlate)){
+				TileIngotBase tile = (TileIngotBase) world.getTileEntity(x, y, z);
 				if(tileEnt.getStackInSlot(0)!= null){
 					if((makeForms.containsKey(tileEnt.getStackInSlot(0).getItem())==true)){
 						if((tile.hot == true)&&(block==ModBlocks.ironPlate)){
@@ -209,8 +213,8 @@ public class ForgeHammer extends Item implements AnvilUtil{
 				}
 			}
 		}
-		}
 	}
+
 	/*
 	 * 		ItemStack gladius0 = new ItemStack(ModItems.gladius);
 		gladius0.stackTagCompound = new NBTTagCompound();
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index dc8c8d60..18a9e0f5 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
   "modid": "kitsumedievalcraft",
   "name": "ForgeCraft",
   "description": "ForgeCraft",
-  "version": "{2.3.0}",
+  "version": "{2.3.1}",
   "mcversion": "{1.7.10}",
   "url": "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/2296334-wip-kitsus-forgecraft-blacksmith-style-forging",
   "updateUrl": "https://bitbucket.org/kitsushadow/kitsus-forgecraft/downloads",