Begin work on copper and tin ore and ingots :)

common/mekanism/common/block/BlockOre.java

@@ -15,6 +15,8 @@ import cpw.mods.fml.relauncher.SideOnly;
 /**
  * Block class for handling multiple ore block IDs. 
  * 0: Osmium Ore
+ * 1: Copper Ore
+ * 2: Tin Ore
  * @author AidanBrady
  *
  */
@@ -35,19 +37,15 @@ public class BlockOre extends Block
 	public void registerIcons(IconRegister register)
 	{
 		icons[0] = register.registerIcon("mekanism:OsmiumOre");
+		icons[1] = register.registerIcon("mekanism:CopperOre");
+		icons[2] = register.registerIcon("mekanism:TinOre");
 	}
 	
 	@Override
 	@SideOnly(Side.CLIENT)
 	public Icon getIcon(int side, int meta)
 	{
-		switch(meta)
-		{
-			case 0:
-				return icons[0];
-		}
-		
-		return null;
+		return icons[meta];
 	}
 	
 	@Override
@@ -61,5 +59,7 @@ public class BlockOre extends Block
 	public void getSubBlocks(int i, CreativeTabs creativetabs, List list)
 	{
 		list.add(new ItemStack(i, 1, 0));
+		list.add(new ItemStack(i, 1, 1));
+		list.add(new ItemStack(i, 1, 2));
 	}
 }

common/mekanism/common/item/ItemBlockOre.java

@@ -16,6 +16,8 @@ import net.minecraft.util.Icon;
 /**
  * Item class for handling multiple ore block IDs.
  * 0: Osmium Ore
+ * 1: Copper Ore
+ * 2: Tin Ore
  * @author AidanBrady
  *
  */
@@ -71,6 +73,12 @@ public class ItemBlockOre extends ItemBlock
 			case 0:
 				name = "OsmiumOre";
 				break;
+			case 1:
+				name = "CopperOre";
+				break;
+			case 2:
+				name = "TinOre";
+				break;
 			default:
 				name = "Unknown";
 				break;

common/mekanism/common/item/ItemIngot.java

@@ -11,7 +11,7 @@ import net.minecraft.util.Icon;
 public class ItemIngot extends ItemMekanism
 {
 	public Icon[] icons = new Icon[256];
-	public static String[] en_USNames = {"Obsidian", "Osmium", "Bronze", "Glowstone", "Steel"};
+	public static String[] en_USNames = {"Obsidian", "Osmium", "Bronze", "Glowstone", "Steel", "Copper", "Tin"};
 	
 	public ItemIngot(int id)
 	{
@@ -38,7 +38,7 @@ public class ItemIngot extends ItemMekanism
 	@Override
 	public void getSubItems(int id, CreativeTabs tabs, List itemList)
 	{
-		for (int counter = 0; counter <= 4; ++counter)
+		for (int counter = 0; counter <= 6; ++counter)
 		{
 			itemList.add(new ItemStack(this, 1, counter));
 		}

resources/assets/mekanism/lang/en_US.lang

@@ -63,6 +63,8 @@ tile.MachineBlock2.RotaryCondensentrator.name=Rotary Condensentrator
 
 //Ore Block
 tile.OreBlock.OsmiumOre.name=Osmium Ore
+tile.OreBlock.CopperOre.name=Copper Ore
+tile.OreBlock.TinOre.name=Tin Ore
 
 //Transmitters
 tile.Transmitter.PressurizedTube.name=Pressurized Tube
@@ -113,6 +115,8 @@ item.osmiumIngot.name=Osmium Ingot
 item.bronzeIngot.name=Bronze Ingot
 item.glowstoneIngot.name=Glowstone Ingot
 item.steelIngot.name=Steel Ingot
+item.copperIngot.name=Copper Ingot
+item.tinIngot.name=Tin Ingot
 
 //Gasses
 gas.hydrogen=Hydrogen