Merge branch 'master' into 1.6.4

common/crazypants/enderio/Config.java

@@ -35,7 +35,7 @@ public final class Config {
       e.load(config);
     }
 
-    useAlternateBinderRecipe = config.get("Settings", "useAlternateBinderRecipe", false, "Create industrail binder in crafting table instead of furnace")
+    useAlternateBinderRecipe = config.get("Settings", "useAlternateBinderRecipe", false, "Create conduit binder in crafting table instead of furnace")
         .getBoolean(false);
 
     conduitScale = config.get("Settings", "conduitScale", DEFAULT_CONDUIT_SCALE,
@@ -43,12 +43,13 @@ public final class Config {
             "In SMP, all clients must be using the same value as the server.").getDouble(DEFAULT_CONDUIT_SCALE);
     conduitScale = VecmathUtil.clamp(conduitScale, 0, 1);
 
-    useAlternateTesseractModel = config.get("Settings", "useAlternateTransceiverModel", false, "Use an alternatice model for the Dimensional Transceiver")
+    useAlternateTesseractModel = config.get("Settings", "useAlternateTransceiverModel", false,
+        "Use TheKazador's alternatice model for the Dimensional Transceiver")
         .getBoolean(false);
     transceiverEnergyLoss = config.get("Settings", "transceiverEnergyLoss", transceiverEnergyLoss,
         "Amount of energy lost when transfered by Dimensional Transceiver 0 is no loss, 1 is 100% loss").getDouble(transceiverEnergyLoss);
     transceiverUpkeepCost = config.get("Settings", "transceiverUpkeepCost", transceiverUpkeepCost,
-        "Number of MJ/t required to a Dimensional Transceiver connection open").getDouble(transceiverUpkeepCost);
+        "Number of MJ/t required to keep a Dimensional Transceiver connection open").getDouble(transceiverUpkeepCost);
     transceiverMaxIO = config.get("Settings", "transceiverMaxIO", transceiverMaxIO,
         "Maximum MJ/t sent and recieved by a Dimensional Transceiver per tick. Input and output limites are no cumulative").getInt(transceiverMaxIO);
     transceiverBucketTransmissionCost = config.get("Settings", "transceiverBucketTransmissionCost", transceiverBucketTransmissionCost,

common/crazypants/enderio/EnderIO.java

@@ -47,10 +47,10 @@ import crazypants.enderio.material.BlockFusedQuartz;
 import crazypants.enderio.material.ItemAlloy;
 import crazypants.enderio.material.ItemCapacitor;
 import crazypants.enderio.material.ItemFusedQuartzFrame;
-import crazypants.enderio.material.ItemIndustrialBinder;
 import crazypants.enderio.material.ItemMJReader;
 import crazypants.enderio.material.ItemMachinePart;
 import crazypants.enderio.material.ItemPowderIngot;
+import crazypants.enderio.material.ItemMaterial;
 import crazypants.enderio.material.ItemYetaWrench;
 import crazypants.enderio.material.MaterialRecipes;
 
@@ -67,13 +67,13 @@ public class EnderIO {
   public static GuiHandler guiHandler = new GuiHandler();
 
   // Materials
-  public static ItemIndustrialBinder itemIndustrialBinder;
   public static ItemCapacitor itemBasicCapacitor;
   public static ItemAlloy itemAlloy;
   public static BlockFusedQuartz blockFusedQuartz;
   public static ItemFusedQuartzFrame itemFusedQuartzFrame;
   public static ItemMachinePart itemMachinePart;
   public static ItemPowderIngot itemPowderIngot;
+  public static ItemMaterial itemMaterial;
 
   // Enderface
   public static BlockEnderIO blockEnderIo;
@@ -128,13 +128,13 @@ public class EnderIO {
 
     ConduitGeometryUtil.setupBounds((float) Config.conduitScale);
 
-    itemIndustrialBinder = ItemIndustrialBinder.create();
     itemBasicCapacitor = ItemCapacitor.create();
     itemAlloy = ItemAlloy.create();
     blockFusedQuartz = BlockFusedQuartz.create();
     itemFusedQuartzFrame = ItemFusedQuartzFrame.create();
     itemMachinePart = ItemMachinePart.create();
     itemPowderIngot = ItemPowderIngot.create();
+    itemMaterial = ItemMaterial.create();
 
     blockEnderIo = BlockEnderIO.create();
     itemEnderface = ItemEnderface.create();

common/crazypants/enderio/ModObject.java

@@ -19,10 +19,9 @@ public enum ModObject {
   itemPowerConduit(++Config.IID, CATEGORY_ITEM, "Energy Conduit"),
 
   // Liquid
-  itemLiquidConduit(++Config.IID, CATEGORY_ITEM, "Liquid Conduit"),
+  itemLiquidConduit(++Config.IID, CATEGORY_ITEM, "Fluid Conduit"),
 
   // Materials
-  itemIndustrialBinder(++Config.IID, CATEGORY_ITEM, "Industrial Binder"),
   itemBasicCapacitor(++Config.IID, CATEGORY_ITEM, "Basic Capacitor"),
   itemAlloy(++Config.IID, CATEGORY_ITEM, "Alloy"),
   blockFusedQuartz(++Config.BID, CATEGORY_BLOCK, "Fused Quartz"),
@@ -33,15 +32,15 @@ public enum ModObject {
   blockAlloySmelter(++Config.BID, CATEGORY_BLOCK, "Alloy Smelter"),
 
   // Painter
-  blockPainter(++Config.BID, CATEGORY_BLOCK, "Painter"),
+  blockPainter(++Config.BID, CATEGORY_BLOCK, "Painting Machine"),
   blockCustomFence(++Config.BID, CATEGORY_BLOCK, "Painted Fence"),
   blockCustomFenceGate(++Config.BID, CATEGORY_BLOCK, "Painted Gate"),
   blockCustomWall(++Config.BID, CATEGORY_BLOCK, "Painted Wall"),
-  blockCustomStair(++Config.BID, CATEGORY_BLOCK, "Painted Stair"),
+  blockCustomStair(++Config.BID, CATEGORY_BLOCK, "Painted Stairs"),
   itemFusedQuartzFrame(++Config.IID, CATEGORY_ITEM, "Fused Quartz Frame"),
 
   // Solar Panel
-  blockSolarPanel(++Config.BID, CATEGORY_BLOCK, "Photovoltaic Panel"),
+  blockSolarPanel(++Config.BID, CATEGORY_BLOCK, "Photovoltaic Cell"),
 
   blockElectricLight(++Config.BID, CATEGORY_BLOCK, "Electric Light"),
   blockLightNode(++Config.BID, CATEGORY_BLOCK, "Light Node (Internal Only)"),
@@ -60,8 +59,9 @@ public enum ModObject {
   itemMachinePart(++Config.IID, CATEGORY_ITEM, "Machine Parts"),
   itemPowderIngot(++Config.IID, CATEGORY_ITEM, "Powders & Ingots"),
 
-  itemMJReader(++Config.IID, CATEGORY_ITEM, "MJ Reader (WIP)");
-
+  itemMJReader(++Config.IID, CATEGORY_ITEM, "MJ Reader (WIP)"),
+  itemMaterial(++Config.IID, CATEGORY_ITEM, "Materials");
+  
   public final String unlocalisedName;
   public final String name;
   public final int defaultId;

common/crazypants/enderio/conduit/ConduitRecipes.java

@@ -2,44 +2,42 @@ package crazypants.enderio.conduit;
 
 import static crazypants.enderio.ModObject.blockPainter;
 import static crazypants.enderio.ModObject.itemConduitFacade;
-import static crazypants.enderio.ModObject.itemIndustrialBinder;
 import static crazypants.enderio.ModObject.itemLiquidConduit;
 import static crazypants.enderio.ModObject.itemPowerConduit;
 import static crazypants.enderio.ModObject.itemRedstoneConduit;
 import net.minecraft.block.Block;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import cpw.mods.fml.common.registry.GameRegistry;
 import crazypants.enderio.ModObject;
 import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadePainterRecipe;
 import crazypants.enderio.machine.MachineRecipeRegistry;
 import crazypants.enderio.material.Alloy;
+import crazypants.enderio.material.Material;
 
 public class ConduitRecipes {
 
   public static void addRecipes() {
-    ItemStack industialBinder = new ItemStack(itemIndustrialBinder.actualId, 1, 0);
-    // ItemStack glassPane = new ItemStack(Block.thinGlass, 1, 0);
-    ItemStack fusedQuartz = new ItemStack(ModObject.blockFusedQuartz.actualId, 1, 0);
 
-    // Facade
-    GameRegistry.addShapedRecipe(new ItemStack(itemConduitFacade.actualId, 1, 0), "bbb", "b b", "bbb", 'b', industialBinder);
-    MachineRecipeRegistry.instance.registerRecipe(blockPainter.unlocalisedName, new FacadePainterRecipe());
-
-    // Liquids
-    GameRegistry.addShapedRecipe(new ItemStack(itemLiquidConduit.actualId, 4, 0), "bgb", "g g", "bgb", 'b', industialBinder, 'g', fusedQuartz);
-
-    // Power
-    GameRegistry.addShapedRecipe(new ItemStack(itemPowerConduit.actualId, 4, 0), " b ", "bib", " b ", 'b', industialBinder, 'i', new ItemStack(Item.ingotIron));
-    ItemStack activatedIron = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ACTIVATED_IRON.ordinal());
-    GameRegistry.addShapedRecipe(new ItemStack(itemPowerConduit.actualId, 4, 1), " b ", "bib", " b ", 'b', industialBinder, 'i', activatedIron);
-    GameRegistry.addShapedRecipe(new ItemStack(itemPowerConduit.actualId, 4, 2), " b ", "bib", " b ", 'b', industialBinder, 'i', new ItemStack(
-        ModObject.itemAlloy.actualId, 1, Alloy.ENDER_IRON.ordinal()));
-
-    // Redstone
+    //Crafting Components
     ItemStack redstoneConduit = new ItemStack(itemRedstoneConduit.actualId, 1, 0);
-    GameRegistry.addShapedRecipe(redstoneConduit, " b ", "brb", " b ", 'b', industialBinder, 'r', new ItemStack(Item.redstone));
-    GameRegistry.addShapedRecipe(new ItemStack(itemRedstoneConduit.actualId, 1, 1), " l ", "lcl", " l ", 'c', redstoneConduit, 'l', Block.lever);
+    ItemStack conduitBinder = new ItemStack(ModObject.itemMaterial.actualId, 1, Material.CONDUIT_BINDER.ordinal());
+    ItemStack fusedQuartz = new ItemStack(ModObject.blockFusedQuartz.actualId, 1, 0);
+    ItemStack electricalSteel = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ELECTRICAL_STEEL.ordinal());
+    ItemStack energeticIron = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ENERGETIC_ALLOY.ordinal());
+    ItemStack phasedIron = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.PHASED_IRON.ordinal());
+    ItemStack redstoneAlloy = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.REDSTONE_ALLOY.ordinal());
+
+    //Recipes
+    GameRegistry.addShapedRecipe(new ItemStack(itemConduitFacade.actualId, 1, 0), "bbb", "b b", "bbb", 'b', conduitBinder);
+    GameRegistry.addShapedRecipe(new ItemStack(itemLiquidConduit.actualId, 4, 0), "bfb", "f f", "bfb", 'b', conduitBinder, 'f', fusedQuartz, 'g', Block.glass);
+    GameRegistry.addShapedRecipe(new ItemStack(itemPowerConduit.actualId, 4, 0), "bbb", "###", "bbb", 'b', conduitBinder, '#', electricalSteel);
+    GameRegistry.addShapedRecipe(new ItemStack(itemPowerConduit.actualId, 4, 1), "b#b", "###", "b#b", 'b', conduitBinder, 'f', fusedQuartz, '#', energeticIron);
+    GameRegistry.addShapedRecipe(new ItemStack(itemPowerConduit.actualId, 4, 2), "bpb", "###", "bpb", 'b', conduitBinder, 'p', phasedIron, '#', energeticIron);
+    GameRegistry.addShapedRecipe(new ItemStack(itemRedstoneConduit.actualId, 4, 0), "bbb", "###", "bbb", 'b', conduitBinder, 'f', fusedQuartz, '#',
+        redstoneAlloy);
+    GameRegistry.addShapedRecipe(new ItemStack(itemRedstoneConduit.actualId, 1, 1), "lbl", "bcb", "lbl", 'b', conduitBinder, 'c', redstoneConduit, 'l',
+        Block.lever);
+    MachineRecipeRegistry.instance.registerRecipe(blockPainter.unlocalisedName, new FacadePainterRecipe());
 
   }
 

common/crazypants/enderio/enderface/EnderfaceRecipes.java

@@ -11,12 +11,10 @@ import crazypants.enderio.material.Alloy;
 public class EnderfaceRecipes {
 
   public static void addRecipes() {
-    ItemStack gold = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ENDER_GOLD.ordinal());
-    GameRegistry.addRecipe(new ItemStack(EnderIO.itemEnderface), "nxn", "xyx", "nxn", 'x', new ItemStack(Item.diamond), 'y', new ItemStack(Item.eyeOfEnder),
-        'n', gold);
-    GameRegistry.addRecipe(new ItemStack(EnderIO.blockEnderIo), "zxz", "xyx", "zxz", 'x', new ItemStack(Item.eyeOfEnder), 'y', new ItemStack(Block.enderChest),
-        'z',
-        new ItemStack(Item.diamond));
+    ItemStack phasedGold = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.PHASED_GOLD.ordinal());
+    ItemStack phasedIron = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.PHASED_IRON.ordinal());
+    GameRegistry.addRecipe(new ItemStack(EnderIO.itemEnderface), "nxn", "xyx", "nxn", 'x', new ItemStack(Item.diamond), 'y', new ItemStack(Item.eyeOfEnder),'n', phasedGold);
+    GameRegistry.addRecipe(new ItemStack(EnderIO.blockEnderIo), "zxz", "xyx", "zxz", 'x', phasedIron, 'y', new ItemStack(Block.enderChest),'z',new ItemStack(Item.diamond));
   }
 
 }

common/crazypants/enderio/machine/MachineRecipes.java

@@ -9,7 +9,6 @@ import static crazypants.enderio.ModObject.blockReservoir;
 import static crazypants.enderio.ModObject.blockSolarPanel;
 import static crazypants.enderio.ModObject.blockStirlingGenerator;
 import static crazypants.enderio.ModObject.itemBasicCapacitor;
-import static crazypants.enderio.ModObject.itemIndustrialBinder;
 
 import java.util.ArrayList;
 
@@ -20,68 +19,83 @@ import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import cpw.mods.fml.common.registry.GameRegistry;
 import crazypants.enderio.ModObject;
+import crazypants.enderio.material.Alloy;
 import crazypants.enderio.material.MachinePart;
+import crazypants.enderio.material.Material;
+import crazypants.enderio.material.PowderIngot;
 import crazypants.enderio.power.Capacitors;
 
 public class MachineRecipes {
 
   public static void addRecipes() {
     //Common ingredients
-    ItemStack industialBinder = new ItemStack(itemIndustrialBinder.actualId, 1, 0);
+    ItemStack conduitBinder = new ItemStack(ModObject.itemMaterial.actualId, 4, Material.CONDUIT_BINDER.ordinal());
+    ItemStack silicon = new ItemStack(ModObject.itemMaterial.actualId, 4, Material.SILICON.ordinal());
     ItemStack capacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 0);
     ItemStack activtedCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, Capacitors.ACTIVATED_CAPACITOR.ordinal());
     ItemStack enderCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, Capacitors.ENDER_CAPACITOR.ordinal());
     ItemStack basicGear = new ItemStack(ModObject.itemMachinePart.actualId, 1, MachinePart.BASIC_GEAR.ordinal());
-    ItemStack redstoneInductor = new ItemStack(ModObject.itemMachinePart.actualId, 1, MachinePart.REDSTONE_INDUCTOR.ordinal());
+    ItemStack machineChassi = new ItemStack(ModObject.itemMachinePart.actualId, 1, MachinePart.MACHINE_CHASSI.ordinal());
 
     ItemStack stirlingGen = new ItemStack(blockStirlingGenerator.actualId, 1, 0);
-    GameRegistry.addShapedRecipe(stirlingGen, " s ", "sfs", "gpg", 's', Block.stone, 'f', Block.furnaceIdle, 'p', Block.pistonBase, 'g', basicGear);
+    GameRegistry.addShapedRecipe(stirlingGen, "bcb", "bfb", "gpg", 'b', Block.stoneBrick, 'f', Block.furnaceIdle, 'p', Block.pistonBase, 'g', basicGear, 'c',
+        capacitor);
 
-    ItemStack painter = new ItemStack(blockPainter.actualId, 1, 0);
-    ItemStack red = new ItemStack(Item.dyePowder, 1, 1);
-    ItemStack green = new ItemStack(Item.dyePowder, 1, 2);
-    ItemStack blue = new ItemStack(Item.dyePowder, 1, 4);
-    GameRegistry.addShapedRecipe(painter, "bbb", "RGB", "bcb", 'b', industialBinder, 'R', red, 'G', green, 'B', blue, 'c', capacitor);
-
-    ItemStack reservoir = new ItemStack(blockReservoir.actualId, 1, 0);
-    ItemStack glassPane = new ItemStack(Block.thinGlass, 1, 0);
-    GameRegistry.addShapedRecipe(reservoir, "bgb", "gBg", "bgb", 'b', industialBinder, 'g', glassPane, 'B', Item.bucketEmpty);
-
-    ItemStack alloySmelter = new ItemStack(blockAlloySmelter.actualId, 1, 0);
-    GameRegistry.addShapedRecipe(alloySmelter, "bbb", "CfC", "bcb", 'b', industialBinder, 'f', Block.furnaceIdle, 'c', capacitor, 'C', Item.cauldron);
-
-    ItemStack solarPanel = new ItemStack(blockSolarPanel.actualId, 1, 0);
     ItemStack fusedQuartz = new ItemStack(ModObject.blockFusedQuartz.actualId, 1, 0);
-    GameRegistry.addShapedRecipe(solarPanel, "fff", "fdf", "ici", 'd', Block.daylightSensor, 'f', fusedQuartz, 'c', activtedCapacitor, 'i', redstoneInductor);
+    ItemStack reservoir = new ItemStack(blockReservoir.actualId, 2, 0);
+    ItemStack glassPane = new ItemStack(Block.thinGlass, 1, 0);
+    GameRegistry.addShapedRecipe(reservoir, "gfg", "gcg", "gfg", 'g', glassPane, 'c', Item.cauldron, 'f', fusedQuartz);
 
-    ItemStack electricLight = new ItemStack(blockElectricLight.actualId, 1, 0);
+    ItemStack coalPowder = new ItemStack(ModObject.itemPowderIngot.actualId, 1, PowderIngot.POWDER_COAL.ordinal());
+
+    ItemStack poweredLamp = new ItemStack(blockElectricLight.actualId, 1, 0);
     ItemStack glowstone = new ItemStack(Item.glowstone);
-    GameRegistry.addShapedRecipe(electricLight, "bqb", "bgb", "bcb", 'q', fusedQuartz, 'g', glowstone, 'b', industialBinder, 'c', capacitor);
+    GameRegistry.addShapedRecipe(poweredLamp, "ggg", "sds", "scs", 'g', Block.glass, 'd', glowstone, 's', silicon, 'c', capacitor);
 
-    ItemStack capacitorBank = new ItemStack(blockCapacitorBank.actualId, 1, 0);
-    GameRegistry.addShapedRecipe(capacitorBank, "bab", "aca", "bab", 'a', activtedCapacitor, 'b', industialBinder, 'c', capacitor);
+    ItemStack crusher = new ItemStack(blockCrusher.actualId, 1, 0);
+    GameRegistry.addShapedRecipe(crusher, "fff", "imi", "ici", 'f', Item.flint, 'm', machineChassi, 'i', Item.ingotIron, 'c', capacitor);
 
     ItemStack tesseract = new ItemStack(ModObject.blockHyperCube.actualId, 1, 0);
     ItemStack obsidian = new ItemStack(Block.obsidian);
-    ItemStack enderPearl = new ItemStack(Item.enderPearl);
-    GameRegistry.addShapedRecipe(tesseract, "oeo", "e e", "oco", 'o', obsidian, 'e', enderPearl, 'c', enderCapacitor);
+    ItemStack phasedIron = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.PHASED_IRON.ordinal());
+    GameRegistry.addShapedRecipe(tesseract, "oeo", "pdp", "oco", 'o', obsidian, 'e', Item.eyeOfEnder, 'c', enderCapacitor, 'p', phasedIron, 'd', Item.diamond);
 
   }
 
   public static void addOreDictionaryRecipes() {
     ItemStack capacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 0);
-    ItemStack crusher = new ItemStack(blockCrusher.actualId, 1, 0);
+    ItemStack alloySmelter = new ItemStack(blockAlloySmelter.actualId, 1, 0);
     ItemStack machineChassi = new ItemStack(ModObject.itemMachinePart.actualId, 1, MachinePart.MACHINE_CHASSI.ordinal());
 
     ArrayList<ItemStack> copperIngots = OreDictionary.getOres("ingotCopper");
     if(copperIngots != null && !copperIngots.isEmpty()) {
-      GameRegistry.addRecipe(new ShapedOreRecipe(crusher, "frf", "cmc", "cpc", 'c', "ingotCopper", 'm', machineChassi, 'f', Item.flint, 'p', Block.pistonBase,
-          'r', capacitor));
+      GameRegistry.addRecipe(new ShapedOreRecipe(alloySmelter, "bfb", "cmc", "cCc", 'c', "ingotCopper", 'm', machineChassi, 'b', Block.stoneBrick, 'f',
+          Block.furnaceIdle,
+          'C', capacitor));
     } else {
       GameRegistry
-          .addShapedRecipe(crusher, "frf", "imi", "ipi", 'i', Item.ingotIron, 'm', machineChassi, 'f', Item.flint, 'p', Block.pistonBase, 'r', capacitor);
-
+          .addShapedRecipe(alloySmelter, "bfb", "imi", "iCi", 'i', Item.ingotIron, 'm', machineChassi, 'b', Block.stoneBrick, 'C', capacitor);
     }
 
+    ItemStack painter = new ItemStack(blockPainter.actualId, 1, 0);
+    ItemStack capacitorBank = new ItemStack(blockCapacitorBank.actualId, 1, 0);
+    ItemStack activatedCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 1);
+
+    ArrayList<ItemStack> tinIngots = OreDictionary.getOres("ingotTin");
+    if(tinIngots != null && !tinIngots.isEmpty()) {
+      GameRegistry.addRecipe(new ShapedOreRecipe(painter, "qdq", "tmt", "tCt", 't', "ingotTin", 'm', machineChassi, 'q', Item.netherQuartz, 'd', Item.diamond,
+          'C', capacitor));
+      GameRegistry.addRecipe(new ShapedOreRecipe(capacitorBank, "tct", "crc", "tct", 't', "ingotTin", 'c', activatedCapacitor, 'r', Block.blockRedstone));
+    }
+    else {
+      GameRegistry.addShapedRecipe(painter, "qdq", "imi", "iCi", 'i', Item.ingotIron, 'm', machineChassi, 'b', Block.netherBrick, 'C', activatedCapacitor);
+      GameRegistry.addShapedRecipe(capacitorBank, "ici", "crc", "ici", 'i', Item.ingotIron, 'c', activatedCapacitor, 'r', Block.blockRedstone);
+    }
+    int dustCoal = OreDictionary.getOreID("dustCoal");
+    ItemStack energeticAlloy = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ENERGETIC_ALLOY.ordinal());
+    ItemStack solarPanel = new ItemStack(blockSolarPanel.actualId, 1, 0);
+    ItemStack fusedQuartz = new ItemStack(ModObject.blockFusedQuartz.actualId, 1, 0);
+    GameRegistry.addRecipe(new ShapedOreRecipe(solarPanel, "efe", "efe", "cdc", 'd', Block.daylightSensor, 'f', fusedQuartz, 'c', "dustCoal", 'e',
+        energeticAlloy));
   }
 }

common/crazypants/enderio/material/Alloy.java

@@ -1,18 +1,18 @@
 package crazypants.enderio.material;
 
-import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-
-//public static final String[] alloyNames = new String[] {"Activated Iron", "Activated Gold", "Ender Iron", "Ender Gold"};
+import crazypants.enderio.ModObject;
 
 public enum Alloy {
 
-  ACTIVATED_IRON("Activated Iron", "activatedIron", new ItemStack(Item.ingotIron), new ItemStack(Item.redstone), new ItemStack(Item.glowstone)),
-  ACTIVATED_GOLD("Activated Gold", "activatedGold", new ItemStack(Item.ingotGold), new ItemStack(Item.redstone), new ItemStack(Item.glowstone)),
-  ENDER_IRON("Ender Iron", "enderIron", new ItemStack(Item.ingotIron), new ItemStack(Item.enderPearl), new ItemStack(Item.glowstone)),
-  ENDER_GOLD("Ender Gold", "enderGold", new ItemStack(Item.ingotGold), new ItemStack(Item.enderPearl), new ItemStack(Item.glowstone)),
-  BLUE_STEEL("Blue Steel", "blueSteel", new ItemStack(Item.ingotIron), new ItemStack(Item.dyePowder, 1, 4), new ItemStack(Block.obsidian));
+  ELECTRICAL_STEEL("Silicon Steel", "electricalSteel", new ItemStack(Item.ingotIron), new ItemStack(Item.coal, 2, 1), new ItemStack(
+      ModObject.itemMaterial.actualId, 1, Material.SILICON.ordinal())),
+  ENERGETIC_ALLOY("Energetic Alloy", "energeticAlloy", new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ELECTRICAL_STEEL.ordinal()), new ItemStack(
+      Item.redstone), new ItemStack(Item.glowstone)),
+  PHASED_IRON("Phased Iron", "phasedIron", new ItemStack(Item.ingotIron), new ItemStack(Item.glowstone), new ItemStack(Item.enderPearl)),
+  PHASED_GOLD("Phased Gold", "phasedGold", new ItemStack(Item.ingotGold), new ItemStack(Item.glowstone), new ItemStack(Item.enderPearl)),
+  REDSTONE_ALLOY("Redstone Alloy", "redstoneAlloy", new ItemStack(Item.ingotIron), new ItemStack(Item.redstone, 4, 0));
 
   public final String unlocalisedName;
   public final String uiName;

common/crazypants/enderio/material/ItemIndustrialBinder.java

@@ -1,38 +0,0 @@
-package crazypants.enderio.material;
-
-import net.minecraft.client.renderer.texture.IconRegister;
-import net.minecraft.item.Item;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import crazypants.enderio.EnderIOTab;
-import crazypants.enderio.ModObject;
-
-public class ItemIndustrialBinder extends Item {
-
-  public static ItemIndustrialBinder create() {
-    ItemIndustrialBinder result = new ItemIndustrialBinder();
-    result.init();
-    return result;
-  }
-
-  protected ItemIndustrialBinder() {
-    super(ModObject.itemIndustrialBinder.id);
-    setCreativeTab(EnderIOTab.tabEnderIO);
-    setUnlocalizedName(ModObject.itemIndustrialBinder.unlocalisedName);
-    setMaxStackSize(64);
-  }
-
-  protected void init() {
-    LanguageRegistry.addName(this, ModObject.itemIndustrialBinder.name);
-    GameRegistry.registerItem(this, ModObject.itemIndustrialBinder.unlocalisedName);
-  }
-
-  @Override
-  @SideOnly(Side.CLIENT)
-  public void registerIcons(IconRegister iconRegister) {
-    itemIcon = iconRegister.registerIcon("enderio:industrialBinder");
-  }
-
-}

common/crazypants/enderio/material/ItemMaterial.java

@@ -0,0 +1,73 @@
+package crazypants.enderio.material;
+
+import java.util.List;
+
+import net.minecraft.client.renderer.texture.IconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.Icon;
+import net.minecraft.util.MathHelper;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import crazypants.enderio.EnderIOTab;
+import crazypants.enderio.ModObject;
+
+public class ItemMaterial extends Item {
+
+  private final Icon[] icons;
+
+  public static ItemMaterial create() {
+    ItemMaterial mp = new ItemMaterial();
+    mp.init();
+    return mp;
+  }
+
+  private ItemMaterial() {
+    super(ModObject.itemMaterial.id);
+    setHasSubtypes(true);
+    setMaxDamage(0);
+    setCreativeTab(EnderIOTab.tabEnderIO);
+    setUnlocalizedName(ModObject.itemMaterial.unlocalisedName);
+
+    icons = new Icon[Material.values().length];
+  }
+
+  private void init() {
+    LanguageRegistry.addName(this, ModObject.itemMaterial.name);
+    GameRegistry.registerItem(this, ModObject.itemMaterial.unlocalisedName);
+    for (int i = 0; i < Material.values().length; i++) {
+      LanguageRegistry.instance().addStringLocalization(getUnlocalizedName() + "." + Material.values()[i].unlocalisedName + ".name",
+          Material.values()[i].uiName);
+    }
+  }
+
+  @Override
+  public Icon getIconFromDamage(int damage) {
+    damage = MathHelper.clamp_int(damage, 0, Material.values().length);
+    return icons[damage];
+  }
+
+  @Override
+  public void registerIcons(IconRegister iconRegister) {
+    int numParts = Material.values().length;
+    for (int i = 0; i < numParts; i++) {
+      icons[i] = iconRegister.registerIcon(Material.values()[i].iconKey);
+    }
+  }
+
+  @Override
+  public String getUnlocalizedName(ItemStack par1ItemStack) {
+    int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, Material.values().length);
+    return super.getUnlocalizedName() + "." + Material.values()[i].unlocalisedName;
+  }
+
+  @Override
+  @SuppressWarnings({ "rawtypes", "unchecked" })
+  public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) {
+    for (int j = 0; j < Material.values().length; ++j) {
+      par3List.add(new ItemStack(par1, 1, j));
+    }
+  }
+
+}

common/crazypants/enderio/material/MachinePart.java

@@ -3,8 +3,7 @@ package crazypants.enderio.material;
 public enum MachinePart {
 
   MACHINE_CHASSI("machineChassi","Machine Chassi","machineChassi"),
-  BASIC_GEAR("basicGear", "Basic Gear", "basicGear"),
-  REDSTONE_INDUCTOR("redstoneInductor", "Redstone Inductor", "redstoneInductor");
+  BASIC_GEAR("basicGear", "Basic Gear", "basicGear");
   
   public final String unlocalisedName;
   public final String uiName;

common/crazypants/enderio/material/Material.java

@@ -0,0 +1,19 @@
+package crazypants.enderio.material;
+
+public enum Material {
+
+  SILICON("silicon","Silicon","silicon"),
+  CONDUIT_BINDER("conduitBinder","Conduit Binder","conduitBinder");
+  
+  public final String unlocalisedName;
+  public final String uiName;
+  public final String iconKey;
+    
+  private Material(String unlocalisedName, String uiName, String iconKey) {
+    this.unlocalisedName = unlocalisedName;
+    this.uiName = uiName;
+    this.iconKey = "enderio:" + iconKey;
+  }
+  
+  
+}

common/crazypants/enderio/material/MaterialRecipes.java

@@ -1,7 +1,6 @@
 package crazypants.enderio.material;
 
 import static crazypants.enderio.ModObject.itemBasicCapacitor;
-import static crazypants.enderio.ModObject.itemIndustrialBinder;
 
 import java.util.ArrayList;
 
@@ -10,6 +9,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.FurnaceRecipes;
 import net.minecraftforge.oredict.OreDictionary;
+import net.minecraftforge.oredict.ShapedOreRecipe;
 import cpw.mods.fml.common.registry.GameRegistry;
 import crazypants.enderio.Config;
 import crazypants.enderio.ModObject;
@@ -21,6 +21,8 @@ import crazypants.enderio.machine.alloy.VanillaSmeltingRecipe;
 public class MaterialRecipes {
 
   public static void registerOresInDictionary() {
+    //Ore Dictionary Registeration
+    OreDictionary.registerOre("dustCoal", new ItemStack(ModObject.itemPowderIngot.actualId, 1, PowderIngot.POWDER_COAL.ordinal()));
     OreDictionary.registerOre("dustIron", new ItemStack(ModObject.itemPowderIngot.actualId, 1, PowderIngot.POWDER_IRON.ordinal()));
     OreDictionary.registerOre("dustGold", new ItemStack(ModObject.itemPowderIngot.actualId, 1, PowderIngot.POWDER_GOLD.ordinal()));
     OreDictionary.registerOre("dustCopper", new ItemStack(ModObject.itemPowderIngot.actualId, 1, PowderIngot.POWDER_COPPER.ordinal()));
@@ -29,39 +31,31 @@ public class MaterialRecipes {
 
   public static void addRecipes() {
 
-    ItemStack industialBinder;
-    if(Config.useAlternateBinderRecipe) {
-      industialBinder = new ItemStack(itemIndustrialBinder.actualId, 8, 0);
-      GameRegistry.addShapedRecipe(industialBinder, "   ", "gg ", "gg ", 'g', Block.gravel);
-      GameRegistry.addShapedRecipe(industialBinder, "   ", " gg", " gg", 'g', Block.gravel);
-    } else {
-      industialBinder = new ItemStack(itemIndustrialBinder.actualId, 4, 0);
-      GameRegistry.addSmelting(Block.gravel.blockID, industialBinder, 0);
-    }
-    ItemStack redstoneInductor = new ItemStack(ModObject.itemMachinePart.actualId, 1, MachinePart.REDSTONE_INDUCTOR.ordinal());
+    //Common Ingredients
+    ItemStack conduitBinder = new ItemStack(ModObject.itemMaterial.actualId, 6, Material.CONDUIT_BINDER.ordinal());
     ItemStack basicGear = new ItemStack(ModObject.itemMachinePart.actualId, 1, MachinePart.BASIC_GEAR.ordinal());
-    ItemStack IndustrialBinder = new ItemStack(ModObject.itemIndustrialBinder.actualId, 1, 0);
-    ItemStack basicCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 0);
+    ItemStack industrialBinder = new ItemStack(ModObject.itemMaterial.actualId, 1, Material.CONDUIT_BINDER.ordinal());
     ItemStack wrench = new ItemStack(ModObject.itemYetaWrench.actualId, 1, 0);
-    ItemStack blueSteel = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.BLUE_STEEL.ordinal());
-    ItemStack activatedCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 1);
     ItemStack enderCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 2);
     ItemStack fusedQuartzFrame = new ItemStack(ModObject.itemFusedQuartzFrame.actualId, 1, 0);
     ItemStack machineChassi = new ItemStack(ModObject.itemMachinePart.actualId, 1, MachinePart.MACHINE_CHASSI.ordinal());
     ItemStack mJReader = new ItemStack(ModObject.itemMJReader.actualId, 1, 0);
+    ItemStack capacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 0);
+    ItemStack activatedCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 1);
+    ItemStack enderiron = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.PHASED_IRON.ordinal());
+    ItemStack electricalSteel = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ELECTRICAL_STEEL.ordinal());
 
-    // Basic Capacitor
-    GameRegistry.addShapedRecipe(basicCapacitor, "   ", "rpr", "   ", 'r', redstoneInductor, 'p', Item.paper);
-
-    // Activated Capacitor
-    GameRegistry.addShapedRecipe(activatedCapacitor, "   ", "gwi", "RbR", 'b', blueSteel, 'g', new ItemStack(ModObject.itemAlloy.actualId, 1,
-        Alloy.ACTIVATED_GOLD.ordinal()), 'i',
-        new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ACTIVATED_IRON.ordinal()), 'R', new ItemStack(Item.redstoneRepeater), 'w', Block.cloth);
+    //Conduit Binder
+    if(Config.useAlternateBinderRecipe) {
+      ItemStack cb = conduitBinder.copy();
+      cb.stackSize = 4;
+      GameRegistry.addShapedRecipe(cb, "gg ", "gg ", "   ", 'g', Block.gravel);
+    } else {
+      GameRegistry.addSmelting(Block.gravel.blockID, conduitBinder, 0);
+    }
 
     // Ender Capacitor
-    GameRegistry.addShapedRecipe(enderCapacitor, "   ", "gwi", "RbR", 'b', blueSteel, 'g',
-        new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ENDER_GOLD.ordinal()), 'i',
-        new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ENDER_IRON.ordinal()), 'R', new ItemStack(Item.redstoneRepeater), 'w', Block.cloth);
+    GameRegistry.addShapedRecipe(enderCapacitor, " e ", "cgc", " e ", 'e', enderiron, 'c', activatedCapacitor, 'g', Block.glowStone);
 
     int meta = 0;
     for (Alloy alloy : Alloy.values()) {
@@ -84,24 +78,18 @@ public class MaterialRecipes {
     FurnaceRecipes.smelting().addSmelting(ModObject.itemPowderIngot.actualId, PowderIngot.POWDER_IRON.ordinal(), new ItemStack(Item.ingotIron), 0);
     FurnaceRecipes.smelting().addSmelting(ModObject.itemPowderIngot.actualId, PowderIngot.POWDER_GOLD.ordinal(), new ItemStack(Item.ingotGold), 0);
 
-    // Industrial Binder - will be removed!
-    GameRegistry.addShapedRecipe(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', industialBinder, 's', new ItemStack(Item.stick));
+    // Fused Quartz Frame
+    GameRegistry.addShapedRecipe(fusedQuartzFrame, "bsb", "s s", "bsb", 'b', conduitBinder, 's', new ItemStack(Item.stick));
 
     // Wrench
-    GameRegistry.addShapedRecipe(wrench, "i i", " b ", " i ", 'b', industialBinder, 'i', new ItemStack(Item.ingotIron));
+    GameRegistry.addShapedRecipe(wrench, "s s", " b ", " s ", 's', electricalSteel, 'b', basicGear);
 
     // Machine Chassi
     GameRegistry.addShapedRecipe(machineChassi, "fif", "i i", "fif", 'f', Block.fenceIron, 'i', Item.ingotIron);
 
-    // Redstone Inductor
-    GameRegistry.addShapedRecipe(redstoneInductor, "grg", "gig", "grg", 'r', Item.redstone, 'g', Item.goldNugget, 'i', Item.ingotIron);
-
     // Basic Gear
     GameRegistry.addShapedRecipe(basicGear, "scs", "c c", "scs", 's', Item.stick, 'c', Block.cobblestone);
 
-    // MJ Reader
-    //GameRegistry.addShapedRecipe(mJReader, "r r", "rir", "gxg", 'r', Item.redstone, 'i', Item.ingotIron, 'g', basicGear, 'x', redstoneInductor);
-    // TO-DO: Sort this class!    
   }
 
   public static void addOreDictionaryRecipes() {
@@ -115,6 +103,19 @@ public class MaterialRecipes {
     if(!ingots.isEmpty()) {
       FurnaceRecipes.smelting().addSmelting(ModObject.itemPowderIngot.actualId, PowderIngot.POWDER_TIN.ordinal(), ingots.get(0), 0);
     }
-  }
 
-}
+    ItemStack capacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 0);
+    ArrayList<ItemStack> copperIngots = OreDictionary.getOres("ingotCopper");
+    if(copperIngots != null && !copperIngots.isEmpty()) {
+
+      GameRegistry.addRecipe(new ShapedOreRecipe(capacitor, " gr", "gcg", "rg ", 'r', Item.redstone, 'g', Item.goldNugget, 'c', "ingotCopper"));
+    } else {
+      GameRegistry.
+          addShapedRecipe(capacitor, " gr", "gig", "rg ", 'r', Item.redstone, 'g', Item.goldNugget, 'i', Item.ingotIron);
+    }
+    int dustCoal = OreDictionary.getOreID("dustCoal");
+    ItemStack activatedCapacitor = new ItemStack(itemBasicCapacitor.actualId, 1, 1);
+    ItemStack electricalSteel = new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ELECTRICAL_STEEL.ordinal());
+    GameRegistry.addRecipe(new ShapedOreRecipe(activatedCapacitor, " e ", "cCc", " e ", 'e', electricalSteel, 'c', capacitor, 'C', "dustCoal"));
+  }
+}

common/crazypants/enderio/power/Capacitors.java

@@ -7,15 +7,15 @@ public enum Capacitors {
 
   BASIC_CAPACITOR(
       new BasicCapacitor(20, 10000, 2),
-      "Capacitor", "basicCapacitor"),
+      "Basic Capacitor", "basicCapacitor"),
 
   ACTIVATED_CAPACITOR(
       new BasicCapacitor(40, 20000, 6),
-      "D-L Capacitor", "activatedCapacitor"),
+      "Double-Layer Capacitor", "activatedCapacitor"),
 
   ENDER_CAPACITOR(
       new BasicCapacitor(100, 100000, 10),
-      "Hybrid Capacitor", "enderCapacitor");
+      "Octadic Capacitor", "enderCapacitor");
 
   public final ICapacitor capacitor;
   public final String unlocalisedName;

resources/assets/enderio/config/EnderIoCrusherRecipes.xml

@@ -70,7 +70,105 @@
 
   <!-- <dumpRegistery oreDictionary="true" modObjects="true" /> -->
 
-  <recipeGroup name="EnderIO">
+  <recipeGroup name="EnderIO"> <!--  Required for EnderIO to function correctly.  -->
+  
+     <!-- Sand to Silicon -->
+    <recipe energyCost="720">
+      <input>
+        <itemStack itemID="12" />
+      </input>
+      <output>
+        <itemStack modID="EnderIO" itemName="enderIO:itemMaterial" number="1" itemMeta="0" />
+      </output>
+    </recipe>
+    
+    <!-- Coal Ore -->
+    <recipe>
+      <input>
+        <itemStack itemID="16" />
+      </input>
+      <output>
+        <itemStack itemID="263" number="3" />
+      </output>
+      <output>
+        <itemStack modID="EnderIO" itemName="enderIO:itemPowderIngot" itemMeta="0" number="1" chance="0.6" />
+      </output>
+      <output>
+        <itemStack itemID="4" chance="0.15" />
+      </output>
+      <output>
+        <itemStack itemID="264" chance="0.001" />
+      </output>
+    </recipe>
+
+    <!-- Coal -->
+    <recipe energyCost="240">
+      <input>
+        <itemStack itemID="263" />
+      </input>
+      <output>
+        <itemStack modID="EnderIO" itemName="enderIO:itemPowderIngot" itemMeta="0" />
+      </output>
+    </recipe>
+
+    <!-- Iron Ore -->
+    <recipe>
+      <input>
+        <itemStack itemID="15" />
+      </input>
+      <output>
+        <itemStack modID="EnderIO" itemName="enderIO:itemPowderIngot" itemMeta="1" number="2" />
+      </output>
+      <output>
+        <itemStack modID="EnderIO" itemName="enderIO:itemPowderIngot" itemMeta="4" number="1" chance="0.05" />
+      </output>
+      <output>
+        <itemStack oreDictionary="dustNickel" number="1" chance="0.2" />
+      </output>
+      <output>
+        <itemStack itemID="4" chance="0.15" />
+      </output>
+    </recipe>
+
+    <!-- Iron Ingot -->
+    <recipe energyCost="240">
+      <input>
+        <itemStack itemID="265" />
+      </input>
+      <output>
+        <itemStack modID="EnderIO" itemName="enderIO:itemPowderIngot" itemMeta="1" />
+      </output>
+    </recipe>
+
+    <!-- Gold Ore -->
+    <recipe>
+      <input>
+        <itemStack itemID="14" />
+      </input>
+      <output>
+        <itemStack modID="EnderIO" itemName="enderIO:itemPowderIngot" itemMeta="2" number="2" />
+      </output>
+      <output>
+        <itemStack modID="EnderIO" itemName="enderIO:itemPowderIngot" itemMeta="3" number="1" chance="0.2" />
+      </output>
+      <output>
+        <itemStack itemID="4" chance="0.15" />
+      </output>
+    </recipe>
+
+    <!-- Gold Ingot -->
+    <recipe>
+      <input>
+        <itemStack itemID="266" />
+      </input>
+      <output>
+        <itemStack modID="EnderIO" itemName="enderIO:itemPowderIngot" itemMeta="2" />
+      </output>
+    </recipe>
+    
+  </recipeGroup>
+
+  <recipeGroup name="Vanilla">
 
     <recipe> <!-- Stone -> Cobblestone -->
       <input>
@@ -90,12 +188,16 @@
       </output>
     </recipe>
 
-    <recipe> <!-- Sandstone -> Sand -->
+    <!-- Sandstone -->
+    <recipe>
       <input>
         <itemStack itemID="24" />
       </input>
       <output>
-        <itemStack itemID="12" />
+        <itemStack itemID="12" number="2" />
+      </output>
+      <output>
+        <itemStack itemID="12" number="2" chance="0.4" />
       </output>
     </recipe>
 
@@ -106,15 +208,20 @@
       <output>
         <itemStack itemID="12" />
       </output>
+
     </recipe>
 
-    <recipe> <!-- Gravel -> flint -->
+    <!-- Gravel -->
+    <recipe>
       <input>
         <itemStack itemID="13" />
       </input>
       <output>
         <itemStack itemID="318" />
       </output>
+      <output>
+        <itemStack itemID="318" chance="0.1" />
+      </output>
     </recipe>
 
     <recipe energyCost="240"> <!-- Blaze Rod -> Blaze Powder -->
@@ -124,6 +231,9 @@
       <output>
         <itemStack itemID="377" number="4" />
       </output>
+      <output>
+        <itemStack oreDictionary="dustSulfur" chance="0.25" />
+      </output>
     </recipe>
 
     <recipe energyCost="240"> <!-- Glow Stont -> dust -->
@@ -131,7 +241,10 @@
         <itemStack itemID="89" />
       </input>
       <output>
-        <itemStack itemID="348" number="4" />
+        <itemStack itemID="348" number="3" />
+      </output>
+      <output>
+        <itemStack itemID="348" number="1" chance="0.8" />
       </output>
     </recipe>
 
@@ -147,6 +260,29 @@
       </output>
     </recipe>
 
+    <!-- Clay (Block) -->
+    <recipe>
+      <input>
+        <itemStack itemID="82" />
+      </input>
+      <output>
+        <itemStack oreDictionary="dustClay" number="2" />
+      </output>
+      <output>
+        <itemStack modID="EnderIO" itemName="enderIO:itemMaterial" number="2" itemMeta="0" chance="0.8" />
+      </output>
+    </recipe>
+
+    <!-- Wool -->
+    <recipe>
+      <input>
+        <itemStack itemID="35" />
+      </input>
+      <output>
+        <itemStack itemID="287" number="4" />
+      </output>
+    </recipe>
+
     <recipe> <!-- Wheat -> Seeds -->
       <input>
         <itemStack itemID="296" />
@@ -154,69 +290,10 @@
       <output>
         <itemStack itemID="295" number="2" />
       </output>
-   </recipe>
-
-    <recipe> <!-- Coal Ore-> coal powder -->
-      <input>
-        <itemStack itemID="16" />
-      </input>
-      <output>
-        <itemStack modID="EnderIO" itemName="enderIO:itemPowderIngot" itemMeta="0" number="2" />
-      </output>
-      <output>
-        <itemStack modID="EnderIO" itemName="enderIO:itemPowderIngot" itemMeta="0" number="1" chance="0.5" />
-      </output>
     </recipe>
-
-    <recipe energyCost="240"> <!-- Coal -> coal powder -->
-      <input>
-        <itemStack itemID="263" />
-      </input>
-      <output>
-        <itemStack modID="EnderIO" itemName="enderIO:itemPowderIngot" itemMeta="0" />
-      </output>
-    </recipe>
-
-    <recipe> <!-- Iron Ore-> iron dust + gold dust -->
-      <input>
-        <itemStack itemID="15" />
-      </input>
-      <output>
-        <itemStack modID="EnderIO" itemName="enderIO:itemPowderIngot" itemMeta="1" number="2" />
-      </output>
-      <output>
-        <itemStack modID="EnderIO" itemName="enderIO:itemPowderIngot" itemMeta="2" number="1" chance="0.05" />
-      </output>
-    </recipe>
-
-    <recipe energyCost="240"> <!-- Iron Ingot -> iron dust -->
-      <input>
-        <itemStack itemID="265" />
-      </input>
-      <output>
-        <itemStack modID="EnderIO" itemName="enderIO:itemPowderIngot" itemMeta="1" />
-      </output>
-    </recipe>
-
-    <recipe> <!-- Gold Ore-> gold dust -->
-      <input>
-        <itemStack itemID="14" />
-      </input>
-      <output>
-        <itemStack modID="EnderIO" itemName="enderIO:itemPowderIngot" itemMeta="2" number="2" />
-      </output>
-    </recipe>
-
-    <recipe> <!-- Gold Ingot -> gold dust -->
-      <input>
-        <itemStack itemID="266" />
-      </input>
-      <output>
-        <itemStack modID="EnderIO" itemName="enderIO:itemPowderIngot" itemMeta="2" />
-      </output>
-    </recipe>
-
-    <recipe energyCost="300"> <!-- Redstone Ore -> Redstone Dust -->
+    
+     <!-- Redstone Ore -->
+    <recipe energyCost="300">
       <input>
         <itemStack itemID="73" />
       </input>
@@ -224,11 +301,18 @@
         <itemStack itemID="331" number="8" />
       </output>
       <output>
-        <itemStack itemID="331" number="2" chance="0.125" />
+        <itemStack itemID="331" number="1" chance="0.2" />
+      </output>
+      <output>
+        <itemStack modID="EnderIO" itemName="enderIO:itemMaterial" itemMeta="0" chance="0.8" />
+      </output>
+      <output>
+        <itemStack itemID="4" chance="0.15" />
       </output>
     </recipe>
 
-    <recipe energyCost="300"> <!-- Lapis Lazuli Ore -> Lapis Lazuli -->
+    <!-- Lapis Lazuli Ore -->
+    <recipe energyCost="300">
       <input>
         <itemStack itemID="21" />
       </input>
@@ -236,20 +320,35 @@
         <itemStack itemID="351" itemMeta="4" number="8" />
       </output>
       <output>
-        <itemStack itemID="351" itemMeta="4" number="2" chance="0.125" />
+        <itemStack itemID="351" itemMeta="4" number="1" chance="0.2" />
+      </output>
+      <output>
+        <itemStack itemID="4" chance="0.15" />
       </output>
     </recipe>
 
-    <recipe> <!-- Copper Ore-> copper dust -->
+  </recipeGroup>
+
+  <recipeGroup name="Common Ores/Ingots">
+
+    <!-- Copper Ore -->
+    <recipe>
       <input>
         <itemStack oreDictionary="oreCopper" />
       </input>
       <output>
         <itemStack modID="EnderIO" itemName="enderIO:itemPowderIngot" itemMeta="3" number="2" />
       </output>
+      <output>
+        <itemStack modID="EnderIO" itemName="enderIO:itemPowderIngot" itemMeta="2" chance="0.125" />
+      </output>
+      <output>
+        <itemStack itemID="4" chance="0.15" />
+      </output>
     </recipe>
 
-    <recipe energyCost="240"> <!-- Copper Ingot -> copper dust -->
+    <!-- Copper Ingot -->
+    <recipe energyCost="240">
       <input>
         <itemStack oreDictionary="ingotCopper" />
       </input>
@@ -258,19 +357,21 @@
       </output>
     </recipe>
 
-  </recipeGroup>
-
-  <recipeGroup name="Common Ores">
-    <recipe> <!-- Tin Ore-> tin dust -->
+    <!-- Tin Ore -->
+    <recipe>
       <input>
         <itemStack oreDictionary="oreTin" />
       </input>
       <output>
         <itemStack modID="EnderIO" itemName="enderIO:itemPowderIngot" itemMeta="4" number="2" />
       </output>
+      <output>
+        <itemStack itemID="4" chance="0.15" />
+      </output>
     </recipe>
 
-    <recipe energyCost="240"> <!-- Tin Ingot -> tin dust -->
+    <!-- Tin Ingot -->
+    <recipe energyCost="240">
       <input>
         <itemStack oreDictionary="ingotTin" />
       </input>
@@ -278,30 +379,116 @@
         <itemStack modID="EnderIO" itemName="enderIO:itemPowderIngot" itemMeta="4" />
       </output>
     </recipe>
+
+    <!-- Lead Ore -->
+    <recipe>
+      <input>
+        <itemStack oreDictionary="oreLead" />
+      </input>
+      <output>
+        <itemStack oreDictionary="dustLead" number="2" />
+      </output>
+      <output>
+        <itemStack oreDictionary="dustSilver" chance="0.1" />
+      </output>
+      <output>
+        <itemStack itemID="4" chance="0.15" />
+      </output>
+    </recipe>
+
+    <!-- Lead Ingot -->
+    <recipe energyCost="240">
+      <input>
+        <itemStack oreDictionary="ingotLead" />
+      </input>
+      <output>
+        <itemStack oreDictionary="dustLead" />
+      </output>
+    </recipe>
+
+    <!-- Silver Ore -->
+    <recipe>
+      <input>
+        <itemStack oreDictionary="oreSilver" />
+      </input>
+      <output>
+        <itemStack oreDictionary="dustSilver" number="2" />
+      </output>
+      <output>
+        <itemStack oreDictionary="dustLead" chance="0.1" />
+      </output>
+    </recipe>
+
+    <!-- Silver Ingot -->
+    <recipe energyCost="240">
+      <input>
+        <itemStack oreDictionary="ingotSilver" />
+      </input>
+      <output>
+        <itemStack oreDictionary="dustSilver" />
+      </output>
+    </recipe>
+
+    <!-- Bronze Ingot -->
+    <recipe energyCost="240">
+      <input>
+        <itemStack oreDictionary="ingotBronze" />
+      </input>
+      <output>
+        <itemStack oreDictionary="dustBronze" />
+      </output>
+    </recipe>
   </recipeGroup>
 
   <recipeGroup name="Forestry">
+
+    <!-- Log -> Wood Pulp -->
     <recipe energyCost="240">
       <input>
         <itemStack oreDictionary="logWood" />
       </input>
       <output>
-        <itemStack oreDictionary="pulpWood" number="4" />
+        <itemStack oreDictionary="pulpWood" number="1" />
+      </output>
+      <output>
+        <itemStack oreDictionary="pulpWood" number="1" chance="0.9" />
+      </output>
+      <output>
+        <itemStack oreDictionary="pulpWood" number="1" chance="0.5" />
+      </output>
+      <output>
+        <itemStack oreDictionary="pulpWood" number="1" chance="0.1" />
       </output>
     </recipe>
+
+    <!-- Plank -> Wood Pulp -->
     <recipe>
       <input>
         <itemStack oreDictionary="plankWood" />
       </input>
       <output>
-        <itemStack oreDictionary="pulpWood" number="1" />
+        <itemStack oreDictionary="pulpWood" number="1" chance="0.9" />
       </output>
     </recipe>
   </recipeGroup>
 
   <recipeGroup name="Applied Energistics">
 
-    <recipe energyCost="240"> <!-- Certus Quartz-> dust -->
+    <!-- Certus Quartz Ore -->
+    <recipe>
+      <input>
+        <itemStack oreDictionary="oreCertusQuartz" />
+      </input>
+      <output>
+        <itemStack oreDictionary="crystalCertusQuartz" />
+      </output>
+      <output>
+        <itemStack oreDictionary="dustCertusQuartz" />
+      </output>
+    </recipe>
+
+    <!-- Certus Quartz Crystal -->
+    <recipe energyCost="240">
       <input>
         <itemStack oreDictionary="crystalCertusQuartz" />
       </input>
@@ -310,7 +497,24 @@
       </output>
     </recipe>
 
-    <recipe energyCost="240"> <!-- Nether Quartz-> dust -->
+    <!-- Nether Quartz Ore -->
+    <recipe>
+      <input>
+        <itemStack itemID="153" />
+      </input>
+      <output>
+        <itemStack itemID="406" number="2" />
+      </output>
+      <output>
+        <itemStack oreDictionary="dustNetherQuartz" />
+      </output>
+      <output>
+        <itemStack oreDictionary="dustCertusQuartz" chance="0.05" />
+      </output>
+    </recipe>
+
+    <!-- Nether Quartz -->
+    <recipe energyCost="240">
       <input>
         <itemStack itemID="406" />
       </input>
@@ -318,68 +522,71 @@
         <itemStack oreDictionary="dustNetherQuartz" />
       </output>
     </recipe>
+  </recipeGroup>
 
-  </recipeGroup>
-  
   <recipeGroup name="Railcraft">
-  
-    <recipe energyCost="480"> <!-- Obsidian -> Crushed Obsidian + Dust -->
+
+    <!-- Obsidian -> Crushed Obsidian + Dust -->
+    <recipe energyCost="480">
       <input>
-            <itemStack itemID="49" />
+        <itemStack itemID="49" />
       </input>
       <output>
-            <itemStack modID="Railcraft" itemName="tile.railcraft.cube" itemMeta="4" number="1" />
+        <itemStack modID="Railcraft" itemName="tile.railcraft.cube" itemMeta="4" number="1" />
       </output>
-	  <output>
-            <itemStack oreDictionary="dustObsidian" number="1" chance="0.15" />
+      <output>
+        <itemStack oreDictionary="dustObsidian" number="1" chance="0.15" />
       </output>
-	  <output>
-            <itemStack oreDictionary="dustObsidian" number="2" chance="0.025" />
+      <output>
+        <itemStack oreDictionary="dustObsidian" number="1" chance="0.025" />
       </output>
     </recipe>
-    
-	<recipe energyCost="240"> <!-- Crushed Obsidian -> Dust -->
+
+    <!-- Crushed Obsidian -> Obsidian Dust -->
+    <recipe energyCost="240">
       <input>
-            <itemStack modID="Railcraft" itemName="tile.railcraft.cube" itemMeta="4" />
+        <itemStack modID="Railcraft" itemName="tile.railcraft.cube" itemMeta="4" />
       </input>
       <output>
-            <itemStack oreDictionary="dustObsidian" number="1" />
+        <itemStack oreDictionary="dustObsidian" number="1" />
       </output>
-	  <output>
-            <itemStack oreDictionary="dustObsidian" number="2" chance="0.01" />
+      <output>
+        <itemStack oreDictionary="dustObsidian" number="1" chance="0.01" />
       </output>
     </recipe>
-    
   </recipeGroup>
-  
-  <recipeGroup name="Biomes O Plenty">
-  
-    <recipe energyCost="260"> <!-- small bone segment -> bone meal -->
+
+  <recipeGroup name="Biomes O' Plenty">
+
+    <!-- Small Bone Segment -> Bone Meal -->
+    <recipe energyCost="260">
       <input>
-            <itemStack modID="BiomesOPlenty" itemName="bop.bones" itemMeta="0" />
+        <itemStack modID="BiomesOPlenty" itemName="bop.bones" itemMeta="0" />
       </input>
       <output>
-            <itemStack itemID="351" itemMeta="15" number="8" />
+        <itemStack itemID="351" itemMeta="15" number="8" />
       </output>
     </recipe>
-	
-    <recipe energyCost="300"> <!-- medium bone segment -> bone meal -->
+
+    <!-- Medium Bone Segment -> Bone Meal -->
+    <recipe energyCost="300">
       <input>
-            <itemStack modID="BiomesOPlenty" itemName="bop.bones" itemMeta="1" />
+        <itemStack modID="BiomesOPlenty" itemName="bop.bones" itemMeta="1" />
       </input>
       <output>
-            <itemStack itemID="351" itemMeta="15" number="12" />
+        <itemStack itemID="351" itemMeta="15" number="12" />
       </output>
     </recipe>
-	
-    <recipe energyCost="450"> <!-- large bone segment -> bone meal -->
+
+    <!-- Large Bone Segment -> Bone Meal -->
+    <recipe energyCost="450">
       <input>
-            <itemStack modID="BiomesOPlenty" itemName="bop.bones" itemMeta="2" />
+        <itemStack modID="BiomesOPlenty" itemName="bop.bones" itemMeta="2" />
       </input>
       <output>
-            <itemStack itemID="351" itemMeta="15" number="24" />
+        <itemStack itemID="351" itemMeta="15" number="24" />
       </output>
     </recipe>
-  
   </recipeGroup>
+
 </SAGMillRecipes>

resources/assets/enderio/textures/blocks/stirlingGenFrontOn.png.mcmeta

@@ -1,12 +1,8 @@
 {
   "animation": {
-	 "frametime": 2,
+	 "frametime": 4,
     "frames": [
       0,
-      1,
-      2,     
-      3,
-      2,
       1
     ]
   }