From be3bdb8df41e3f05c9b48b5323c4d4dbd4bdbf7b Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Fri, 26 Oct 2018 17:18:48 +0100
Subject: + Added a roasting recipe for obtaining small quantities of
 Germanium. - Disabled obfuscated method names in ASM. % More adjustments to
 EBF and ABS recipes. $ Fixed names of Tungsten Steel & Stainless Steel
 Hexadecuple Pipes. $ Fixed recipe collision of Rose Gold and Tumbaga in the
 mixer.

---
 .../gregtech/loaders/RecipeGen_BlastSmelter.java   |  4 ++--
 .../gregtech/loaders/RecipeGen_DustGeneration.java | 26 ++++++++++++++++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

(limited to 'src/Java/gtPlusPlus/xmod/gregtech/loaders')

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
index ac3c8727d7..b3115bbab5 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
@@ -87,10 +87,10 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
 			
 			
 			//Set a duration - NEW
-			int duration = 120*M.vTier*20;
+			int duration = 120*M.vTier*10;
 
 			if (M.vTier <= 4){
-				duration = 20*M.vTier*20;
+				duration = 20*M.vTier*10;
 			}
 
 			int mMaterialListSize=0;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
index f78f81f82c..1bef648bd2 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
@@ -142,13 +142,31 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
 					//Get us four ItemStacks to input into the mixer
 					ItemStack[] input = new ItemStack[4];
 					
-					/*input[0] = (inputStacks.length >= 1) ? ((inputStacks[0] == null) ? null : inputStacks[0]) : null;
+					input[0] = (inputStacks.length >= 1) ? ((inputStacks[0] == null) ? null : inputStacks[0]) : null;
 					input[1] = (inputStacks.length >= 2) ? ((inputStacks[1] == null) ? null : inputStacks[1]) : null;
 					input[2] = (inputStacks.length >= 3) ? ((inputStacks[2] == null) ? null : inputStacks[2]) : null;
 					input[3] = (inputStacks.length >= 4) ? ((inputStacks[3] == null) ? null : inputStacks[3]) : null;
-					*/
 					
-					for (int g = 0; g<4; g++) {						
+					
+					if (inputStacks.length == 1) {
+						input[1] = input[0];
+						input[0] = CI.getNumberedCircuit(inputStacks.length+10);
+					}
+					else if (inputStacks.length == 2) {
+						input[2] = input[1];
+						input[1] = input[0];
+						input[0] = CI.getNumberedCircuit(inputStacks.length+10);
+
+					}
+					else if (inputStacks.length == 3) {
+						input[3] = input[2];
+						input[2] = input[1];
+						input[1] = input[0];
+						input[0] = CI.getNumberedCircuit(inputStacks.length+10);
+					}
+					
+					
+					/*for (int g = 0; g<4; g++) {						
 						if(inputStacks.length > g) {
 							input[g] = inputStacks[g] != null ? inputStacks[g] : null;							
 						}
@@ -156,7 +174,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
 							input[g] = CI.getNumberedCircuit(g+10);
 							break;
 						}												
-					}					
+					}*/					
 
 					//Add mixer Recipe
 					FluidStack oxygen = GT_Values.NF;
-- 
cgit