% Improved tooltip for Fluorite Ore.

% More ASM work on getDrops fix.
$ Made GT++ Materials utilise GT TextureSets.
$ Made Ore blocks use the most prominent texture set based on it's component materials.
$ Fixed https://github.com/GTNewHorizons/NewHorizons/issues/2522.
$ Fixed materials that require a blast furnace being fluid extractable.
$ Fixed https://github.com/GTNewHorizons/NewHorizons/issues/2530.

2 files changed, 85 insertions, 69 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
index 426b73f0d8..41fb792fc0 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
@@ -6,6 +6,7 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.material.state.MaterialState;
+import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.recipe.RecipeUtils;
 import net.minecraft.item.ItemStack;
@@ -224,6 +225,19 @@ public class RecipeGen_DustGeneration  implements Runnable{
 					input3 = (inputStacks.length >= 3) ? (input3 = (inputStacks[2] == null) ? null : inputStacks[2]) : null;
 					input4 = (inputStacks.length >= 4) ? (input4 = (inputStacks[3] == null) ? null : inputStacks[3]) : null;
 
+					if (inputStacks.length == 1) {
+						input2 = CI.getNumberedCircuit(20);
+					}
+					else if (inputStacks.length == 2) {
+						input3 = CI.getNumberedCircuit(20);
+						
+					}
+					else if (inputStacks.length == 3) {
+						input4 = CI.getNumberedCircuit(20);
+						
+					}
+					
+					
 					//Add mixer Recipe
 
 					FluidStack oxygen = GT_Values.NF;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
index 5388f68146..a29e6159f7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
@@ -40,78 +40,80 @@ public class RecipeGen_Fluids  implements Runnable{
 				Utils.LOG_WARNING("144l fluid extractor from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");
 			}*/
 
-			//Ingot
-			if (GT_Values.RA.addFluidExtractionRecipe(material.getIngot(1), //Input
-					null, //Input 2
-					material.getFluid(144), //Fluid Output
-					0, //Chance
-					1*20, //Duration
-					16 //Eu Tick
-					)){
-				Logger.WARNING("144l fluid extractor from 1 ingot Recipe: "+material.getLocalizedName()+" - Success");
-			}
-			else {
-				Logger.WARNING("144l fluid extractor from 1 ingot Recipe: "+material.getLocalizedName()+" - Failed");
-			}
+			if (!material.requiresBlastFurnace()) {
+
+				//Ingot
+				if (GT_Values.RA.addFluidExtractionRecipe(material.getIngot(1), //Input
+						null, //Input 2
+						material.getFluid(144), //Fluid Output
+						0, //Chance
+						1*20, //Duration
+						16 //Eu Tick
+						)){
+					Logger.WARNING("144l fluid extractor from 1 ingot Recipe: "+material.getLocalizedName()+" - Success");
+				}
+				else {
+					Logger.WARNING("144l fluid extractor from 1 ingot Recipe: "+material.getLocalizedName()+" - Failed");
+				}
+
+				//Plate
+				if (GT_Values.RA.addFluidExtractionRecipe(material.getPlate(1), //Input
+						null, //Input 2
+						material.getFluid(144), //Fluid Output
+						0, //Chance
+						1*20, //Duration
+						16 //Eu Tick
+						)){
+					Logger.WARNING("144l fluid extractor from 1 plate Recipe: "+material.getLocalizedName()+" - Success");
+				}
+				else {
+					Logger.WARNING("144l fluid extractor from 1 plate Recipe: "+material.getLocalizedName()+" - Failed");
+				}
+
+				//Double Plate
+				if (GT_Values.RA.addFluidExtractionRecipe(material.getPlateDouble(1), //Input
+						null, //Input 2
+						material.getFluid(288), //Fluid Output
+						0, //Chance
+						1*20, //Duration
+						16 //Eu Tick
+						)){
+					Logger.WARNING("144l fluid extractor from 1 double plate Recipe: "+material.getLocalizedName()+" - Success");
+				}
+				else {
+					Logger.WARNING("144l fluid extractor from 1 double plate Recipe: "+material.getLocalizedName()+" - Failed");
+				}
+
+				//Nugget
+				if (GT_Values.RA.addFluidExtractionRecipe(material.getNugget(1), //Input
+						null, //Input 2
+						material.getFluid(16), //Fluid Output
+						0, //Chance
+						16, //Duration
+						8 //Eu Tick
+						)){
+					Logger.WARNING("16l fluid extractor from 1 nugget Recipe: "+material.getLocalizedName()+" - Success");
+				}
+				else {
+					Logger.WARNING("16l fluid extractor from 1 nugget Recipe: "+material.getLocalizedName()+" - Failed");
+				}
+
+				//Block
+				if (GT_Values.RA.addFluidExtractionRecipe(material.getBlock(1), //Input
+						null, //Input 2
+						material.getFluid(144*9), //Fluid Output
+						0, //Chance
+						288, //Duration
+						16 //Eu Tick
+						)){
+					Logger.WARNING((144*9)+"l fluid extractor from 1 block Recipe: "+material.getLocalizedName()+" - Success");
+				}
+				else {
+					Logger.WARNING((144*9)+"l fluid extractor from 1 block Recipe: "+material.getLocalizedName()+" - Failed");
+				}
 
-			//Plate
-			if (GT_Values.RA.addFluidExtractionRecipe(material.getPlate(1), //Input
-					null, //Input 2
-					material.getFluid(144), //Fluid Output
-					0, //Chance
-					1*20, //Duration
-					16 //Eu Tick
-					)){
-				Logger.WARNING("144l fluid extractor from 1 plate Recipe: "+material.getLocalizedName()+" - Success");
-			}
-			else {
-				Logger.WARNING("144l fluid extractor from 1 plate Recipe: "+material.getLocalizedName()+" - Failed");
 			}
 
-			//Double Plate
-			if (GT_Values.RA.addFluidExtractionRecipe(material.getPlateDouble(1), //Input
-					null, //Input 2
-					material.getFluid(288), //Fluid Output
-					0, //Chance
-					1*20, //Duration
-					16 //Eu Tick
-					)){
-				Logger.WARNING("144l fluid extractor from 1 double plate Recipe: "+material.getLocalizedName()+" - Success");
-			}
-			else {
-				Logger.WARNING("144l fluid extractor from 1 double plate Recipe: "+material.getLocalizedName()+" - Failed");
-			}
-
-			//Nugget
-			if (GT_Values.RA.addFluidExtractionRecipe(material.getNugget(1), //Input
-					null, //Input 2
-					material.getFluid(16), //Fluid Output
-					0, //Chance
-					16, //Duration
-					8 //Eu Tick
-					)){
-				Logger.WARNING("16l fluid extractor from 1 nugget Recipe: "+material.getLocalizedName()+" - Success");
-			}
-			else {
-				Logger.WARNING("16l fluid extractor from 1 nugget Recipe: "+material.getLocalizedName()+" - Failed");
-			}
-
-			//Block
-			if (GT_Values.RA.addFluidExtractionRecipe(material.getBlock(1), //Input
-					null, //Input 2
-					material.getFluid(144*9), //Fluid Output
-					0, //Chance
-					288, //Duration
-					16 //Eu Tick
-					)){
-				Logger.WARNING((144*9)+"l fluid extractor from 1 block Recipe: "+material.getLocalizedName()+" - Success");
-			}
-			else {
-				Logger.WARNING((144*9)+"l fluid extractor from 1 block Recipe: "+material.getLocalizedName()+" - Failed");
-			}
-
-
-