+ Added a config option to adjust the Turbine Rotor removal cut-off point.

+ Added some new Bags/Packs for various things. An Automatic Lunchbox, a Tool Box and a Magicians Satchel.
+ Added full compound of Eglin Steel to ABS. Closes #392.
- Removed all Multi-Tools.
$ Rewrote and Fixed the recipe system. All recipes are queued regardless of when called, then created during the end of the POST_INIT load phase. Fixes too many bugs to list. (Few more to do before tomorrow)
$ Fixed COFH Hard requirement. Closes #398.
% Adjusted the internal map type of the AutoMap. Should improve performance, if only in single digit cpu cycles.

> To-Do) Fix Recipes pertaining to compound materials made from using fluids. State may be detected wrong after recipe system changes.

1 files changed, 7 insertions, 3 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
index 8e3ef4e21d..e15c5da29e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
@@ -108,6 +108,10 @@ public class RecipeGen_Recycling implements Runnable {
 			for (final Pair<OrePrefixes, ItemStack> validPrefix : mValidPairs) {
 				try {
 					
+					if (material == null || validPrefix == null) {
+						continue;
+					}
+					
 					if (material.getState() != MaterialState.SOLID ||  validPrefix.getKey() == OrePrefixes.ingotHot){
 						continue;
 					}
@@ -118,7 +122,7 @@ public class RecipeGen_Recycling implements Runnable {
 					int mFluidAmount = (int) GT_Utility.translateMaterialToFluidAmount(validPrefix.getKey().mMaterialAmount, true);
 							
 					//Maceration
-					if (tempStack != null) {
+					if (ItemUtils.checkForInvalidItems(tempStack)) {
 						// mValidItems[mSlotIndex++] = tempStack;
 						if ((mDust != null) && GT_ModHandler.addPulverisationRecipe(tempStack, mDust)) {
 							Logger.WARNING("Recycle Recipe: " + material.getLocalizedName() + " - Success - Recycle "
@@ -133,12 +137,12 @@ public class RecipeGen_Recycling implements Runnable {
 					}
 					
 					//Arc Furnace
-					if (tempStack != null) {
+					if (ItemUtils.checkForInvalidItems(tempStack)) {
 						
 					}					
 					
 					//Fluid Extractor
-					if (tempStack != null) {
+					if (ItemUtils.checkForInvalidItems(tempStack)) {
 						// mValidItems[mSlotIndex++] = tempStack;
 						if ((mDust != null) && GT_Values.RA.addFluidExtractionRecipe(tempStack, null, material.getFluid(mFluidAmount), 0, 30, 8)) {
 							Logger.WARNING("Fluid Recycle Recipe: " + material.getLocalizedName() + " - Success - Recycle "