Delete old textures, add Copper and Tin blocks

common/mekanism/common/Mekanism.java

@@ -307,6 +307,18 @@ public class Mekanism
 		CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Ingot, 9, 4), new Object[] {
 			"*", Character.valueOf('*'), new ItemStack(BasicBlock, 1, 5)
 		}));
+		CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 1, 12), new Object[] {
+			"***", "***", "***", Character.valueOf('*'), "ingotCopper"
+		}));
+		CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Ingot, 9, 5), new Object[] {
+			"*", Character.valueOf('*'), new ItemStack(BasicBlock, 1, 12)
+		}));
+		CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 1, 13), new Object[] {
+			"***", "***", "***", Character.valueOf('*'), "ingotTin"
+		}));
+		CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Ingot, 9, 6), new Object[] {
+			"*", Character.valueOf('*'), new ItemStack(BasicBlock, 1, 13)
+		}));
 		
 		//Base Recipes
 		CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ObsidianTNT, 1), new Object[] {
@@ -642,9 +654,11 @@ public class Mekanism
 		OreDictionary.registerOre("blockOsmium", new ItemStack(BasicBlock, 1, 0));
 		OreDictionary.registerOre("blockBronze", new ItemStack(BasicBlock, 1, 1));
 		OreDictionary.registerOre("blockRefinedObsidian", new ItemStack(BasicBlock, 1, 2));
-		OreDictionary.registerOre("blockCoal", new ItemStack(BasicBlock, 1, 3));
+		OreDictionary.registerOre("blockCharcoal", new ItemStack(BasicBlock, 1, 3));
 		OreDictionary.registerOre("blockRefinedGlowstone", new ItemStack(BasicBlock, 1, 4));
 		OreDictionary.registerOre("blockSteel", new ItemStack(BasicBlock, 1, 5));
+		OreDictionary.registerOre("blockCopper", new ItemStack(BasicBlock, 1, 12));
+		OreDictionary.registerOre("blockTin", new ItemStack(BasicBlock, 1, 13));
 		
 		OreDictionary.registerOre("dustDirtyIron", new ItemStack(DirtyDust, 1, 0));
 		OreDictionary.registerOre("dustDirtyGold", new ItemStack(DirtyDust, 1, 1));

common/mekanism/common/block/BlockBasic.java

@@ -58,6 +58,8 @@ import cpw.mods.fml.relauncher.SideOnly;
  * 9: Dynamic Tank
  * 10: Dynamic Glass
  * 11: Dynamic Valve
+ * 12: Copper Block
+ * 13: Tin Block
  * @author AidanBrady
  *
  */
@@ -109,6 +111,8 @@ public class BlockBasic extends Block
 		icons[9][0] = register.registerIcon("mekanism:DynamicTank");
 		icons[10][0] = register.registerIcon("mekanism:DynamicGlass");
 		icons[11][0] = register.registerIcon("mekanism:DynamicValve");
+		icons[12][0] = register.registerIcon("mekanism:CopperBlock");
+		icons[13][0] = register.registerIcon("mekanism:TinBlock");
 		
 		glassRenderer.registerIcons(register);
 	}
@@ -189,6 +193,8 @@ public class BlockBasic extends Block
 		list.add(new ItemStack(i, 1, 9));
 		list.add(new ItemStack(i, 1, 10));
 		list.add(new ItemStack(i, 1, 11));
+		list.add(new ItemStack(i, 1, 12));
+		list.add(new ItemStack(i, 1, 13));
 	}
 	
 	@Override

common/mekanism/common/item/ItemBlockBasic.java

@@ -32,6 +32,8 @@ import cpw.mods.fml.relauncher.SideOnly;
  * 9: Dynamic Tank
  * 10: Dynamic Glass
  * 11: Dynamic Valve
+ * 12: Copper Block
+ * 13: Tin Block
  * @author AidanBrady
  *
  */
@@ -191,6 +193,12 @@ public class ItemBlockBasic extends ItemBlock
 			case 11:
 				name = "DynamicValve";
 				break;
+			case 12:
+				name = "CopperBlock";
+				break;
+			case 13:
+				name = "TinBlock";
+				break;
 			default:
 				name = "Unknown";
 				break;

resources/assets/mekanism/lang/en_US.lang

@@ -39,6 +39,8 @@ tile.BasicBlock.SteelCasing.name=Steel Casing
 tile.BasicBlock.DynamicTank.name=Dynamic Tank
 tile.BasicBlock.DynamicGlass.name=Dynamic Glass
 tile.BasicBlock.DynamicValve.name=Dynamic Valve
+tile.BasicBlock.CopperBlock.name=Copper Block
+tile.BasicBlock.TinBlock.name=Tin Block
 
 //Machine Block
 tile.MachineBlock.EnrichmentChamber.name=Enrichment Chamber