Merge branch 'master' of https://github.com/GTNewHorizons/GTplusplus into New-Multis-3

# Conflicts:
#	.gitignore
#	build.gradle
#	src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
#	src/main/java/gtPlusPlus/core/lib/LoadedMods.java
#	src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
#	src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
#	src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
#	src/main/resources/assets/miscutils/lang/en_US.lang

1 files changed, 8 insertions, 24 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index c7e652023b..2b8a110b09 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -659,14 +659,6 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 		if (((aInput1 == null) && (aFluidInput == null)) || ((aOutput1 == null) && (aFluidOutput == null))) {
 			return false;
 		}
-		if ((aOutput1 != null)
-				&& ((aDuration = GregTech_API.sRecipeFile.get("advancedmixer", aOutput1, aDuration)) <= 0)) {
-			return false;
-		}
-		if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("advancedmixer",
-				aFluidOutput.getFluid().getName(), aDuration)) <= 0)) {
-			return false;
-		}
 		GTPP_Recipe aSpecialRecipe = new GTPP_Recipe(
 				true,
 				new ItemStack[] { aInput1, aInput2, aInput3, aInput4 },
@@ -679,17 +671,9 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 				Math.max(1, aEUt), 
 				0);   
 
-		int aSize = GTPP_Recipe.GTPP_Recipe_Map.sAdvancedMixerRecipes.mRecipeList.size();
-		int aSize2 = aSize;
-		GTPP_Recipe.GTPP_Recipe_Map.sAdvancedMixerRecipes.add(aSpecialRecipe);
-		aSize = GTPP_Recipe.GTPP_Recipe_Map.sAdvancedMixerRecipes.mRecipeList.size();
-
-		/*GTPP_Recipe.GTPP_Recipe_Map.sAdvancedMixerRecipes.addRecipe(true,
-				new ItemStack[] { aInput1, aInput2, aInput3, aInput4 },
-				new ItemStack[] { aOutput1, aOutput2, aOutput3, aOutput4 }, null, null,
-				new FluidStack[] { aFluidInput }, new FluidStack[] { aFluidOutput }, aDuration, aEUt, 0);*/
-
-		return aSize > aSize2;
+		int aSize = GT_Recipe_Map.sMixerRecipes.mRecipeList.size();
+		GT_Recipe_Map.sMixerRecipes.add(aSpecialRecipe);
+		return GT_Recipe_Map.sMixerRecipes.mRecipeList.size() > aSize;
 	}
 
 	// Machine Component Assembler
@@ -1473,18 +1457,18 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 	}
 
 	@Override
-	public boolean addUvLaserRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput, int time, long eu) {
+	public boolean addUvLaserRecipe(ItemStack aInput1, ItemStack aOutput, int time, long eu) {
 		// Generate Special Laser Recipe
 		GT_Recipe u = new GTPP_Recipe(
 				false,
 				new ItemStack[] {
 						aInput1,
-						aInput2,
+						GregtechItemList.Laser_Lens_WoodsGlass.get(1),
 				},
 				new ItemStack[] {
 						aOutput
 				},
-				GregtechItemList.Laser_Lens_WoodsGlass.get(1),
+				null,
 				new int[] {
 						10000
 				}, 
@@ -1497,8 +1481,8 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 	}
 
 	@Override
-	public boolean addIrLaserRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput, int time, long eu) {
-		return addUvLaserRecipe(aInput1, aInput2, aOutput, time, eu);
+	public boolean addIrLaserRecipe(ItemStack aInput1, ItemStack aOutput, int time, long eu) {
+		return addUvLaserRecipe(aInput1, aOutput, time, eu);
 	}