Merge branch 'experimental' into reMerge

# Conflicts:
#	build.properties
#	src/main/java/gregtech/api/enums/ItemList.java
#	src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
#	src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
#	src/main/java/gregtech/common/GT_Proxy.java
#	src/main/java/gregtech/common/GT_RecipeAdder.java
#	src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
#	src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
#	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
#	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
#	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
#	src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
#	src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png
#	src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/96.png

1 files changed, 51 insertions, 5 deletions

diff --git a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
index ac9389f081..f5da19e597 100644
--- a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
+++ b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
@@ -153,6 +153,21 @@ public interface IGT_RecipeAdder {
      */
     public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration, int aEUtick);
 
+    /**
+     +     * Adds a Chemical Recipe that only exists in the Large Chemical Reactor
+     +     *
+     +     * @param aInputs   item inputs
+     +     * @param aFluidInputs fluid inputs
+     +     * @param aFluidOutputs fluid outputs
+     +     * @param aOutputs  item outputs
+     +     * @param aDuration must be > 0
+     +     * @param aEUtick   must be > 0
+     +     * aInputs and aFluidInputs must contain at least one valid input.
+     +     * aOutputs and aFluidOutputs must contain at least one valid output.
+     +     */
+
+    public boolean addMultiblockChemicalRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int aDuration, int aEUtick);
+
 
     /**
      * Adds a Blast Furnace Recipe
@@ -217,17 +232,28 @@ public interface IGT_RecipeAdder {
     public boolean addCNCRecipe(ItemStack aInput1, ItemStack aOutput1, int aDuration, int aEUt);
 
     /**
-     * Adds a Assembler Recipe
+     * Adds an Assembler Recipe
      *
      * @param aInput1   must be != null
      * @param aOutput1  must be != null
+     * @param aInput2 	must be != null
      * @param aDuration must be > 0
      * @param aEUt      should be > 0
      */
     public boolean addAssemblerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt);
 
     /**
-     * Adds a Assembler Recipe
+     +     * Adds an Assembler Recipe
+     +     *
+     +     * @param aInputs   must be != null
+     +     * @param aOutput1  must be != null
+     +     * @param aDuration must be > 0
+     +     * @param aEUt      should be > 0
+     +     */
+    public boolean addAssemblerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt);
+
+    /**
+     * Adds an Assembler Recipe
      *
      * @param aInput1   must be != null
      * @param aOutput1  must be != null
@@ -242,7 +268,7 @@ public interface IGT_RecipeAdder {
 
 
     /**
-     * Adds a Assembler Recipe
+     * Adds an Circuit Assembler Recipe
      *
      * @param aInputs   must be 1-6 ItemStacks
      * @param aFluidInput 0-1 fluids
@@ -255,7 +281,7 @@ public interface IGT_RecipeAdder {
     public boolean addCircuitAssemblerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput, int aDuration, int aEUt, boolean aCleanroom);
     
     /**
-     * Adds a Assemblyline Recipe
+     * Adds an Assemblyline Recipe
      *
      * @param aInputs   must be != null, 4-16 inputs
      * @param aFluidInputs 0-4 fluids
@@ -467,8 +493,13 @@ public interface IGT_RecipeAdder {
     /**
      * Adds a Recipe for the Distillery
      */
+
+    public boolean addDistilleryRecipe(ItemStack aCircuit, FluidStack aInput, FluidStack aOutput, ItemStack aSolidOutput, int aDuration, int aEUt, boolean aHidden);
+
     public boolean addDistilleryRecipe(ItemStack aCircuit, FluidStack aInput, FluidStack aOutput, int aDuration, int aEUt, boolean aHidden);
 
+    public boolean addDistilleryRecipe(int circuitConfig, FluidStack aInput, FluidStack aOutput, ItemStack aSolidOutput, int aDuration, int aEUt, boolean aHidden);
+
     public boolean addDistilleryRecipe(int aCircuit, FluidStack aInput, FluidStack aOutput, int aDuration, int aEUt, boolean aHidden);
     
     /**
@@ -574,7 +605,7 @@ public interface IGT_RecipeAdder {
 
     /**
      * Adds a Distillation Tower Recipe
-     * Every Fluid also gets seperate distillation recipes
+     * Every Fluid also gets separate distillation recipes
      *
      * @param aInput  must be != null
      * @param aOutputs must be != null 1-5 Fluids
@@ -602,9 +633,24 @@ public interface IGT_RecipeAdder {
      * @param aDuration
      * @param aEUt
      */
+
+    @Deprecated
     public boolean addCrackingRecipe(FluidStack aInput, FluidStack aOutput, int aDuration, int aEUt);
 
     /**
+     * Adds Oil Cracking Recipe
+     *
+     * @param circuitConfig The circuit configuration to control cracking severity
+     * @param aInput The fluid to be cracked
+     * @param aInput2 The fluid to catalyze the cracking (typically Hydrogen or Steam)
+     * @param aOutput The cracked fluid
+     * @param aDuration
+     * @param aEUt
+     */
+
+      public boolean addCrackingRecipe(int circuitConfig, FluidStack aInput, FluidStack aInput2, FluidStack aOutput, int aDuration, int aEUt);
+
+    /**
      * Adds a Sound to the Sonictron9001
      * you should NOT call this in the preInit-Phase!
      *