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

3 files changed, 8 insertions, 8 deletions

diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java
index b322036ef7..0e2fff3f35 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java
@@ -254,7 +254,7 @@ public class HazmatUtils {
 			aItemFields.add(ReflectionUtils.getField(aItemsGravisuite, "graviChestPlate"));			
 			AutoMap<ItemStack> aGravisuite = new AutoMap<ItemStack>();
 			for (Field aItemField : aItemFields) {
-				Item aItemObject = (Item) ReflectionUtils.getFieldValue(aItemField);
+				Item aItemObject = ReflectionUtils.getFieldValue(aItemField);
 				if (aItemObject != null) {
 					aGravisuite.add(ItemUtils.getSimpleStack(aItemObject));
 				}
@@ -274,7 +274,7 @@ public class HazmatUtils {
 			aItemFields.add(ReflectionUtils.getField(aItemsEMT, "ultimateSolarHelmet"));			
 			AutoMap<ItemStack> aASP = new AutoMap<ItemStack>();
 			for (Field aItemField : aItemFields) {
-				Item aItemObject = (Item) ReflectionUtils.getFieldValue(aItemField);
+				Item aItemObject = ReflectionUtils.getFieldValue(aItemField);
 				if (aItemObject != null) {
 					aASP.add(ItemUtils.getSimpleStack(aItemObject));
 				}
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index e96bd3391b..fa685aa93c 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -1314,9 +1314,6 @@ public class ItemUtils {
 	}
 
 	public static boolean isCatalyst(ItemStack aStack) {
-		if (GT_Utility.areStacksEqual(aStack, RocketFuels.Formaldehyde_Catalyst_Stack, true)) {
-			return true;
-		}
 		if (GT_Utility.areStacksEqual(aStack, GenericChem.mBlueCatalyst, true)) {
 			return true;
 		}
@@ -1338,6 +1335,9 @@ public class ItemUtils {
 		if (GT_Utility.areStacksEqual(aStack, GenericChem.mPinkCatalyst, true)) {
 			return true;
 		}
+		if (GT_Utility.areStacksEqual(aStack, GenericChem.mFormaldehydeCatalyst, true)) {
+			return true;
+		}
 		if (GT_Utility.areStacksEqual(aStack, AgriculturalChem.mGreenCatalyst, true)) {
 			return true;
 		}
diff --git a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
index f3890aa932..12c765d049 100644
--- a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
@@ -1077,13 +1077,13 @@ public class ReflectionUtils {
 		return false;
 	}
 
-	public static Object getFieldValue(Field field) {
+	public static <T> T getFieldValue(Field field) {
 		return getFieldValue(field, null);
 	}
 
-	public static Object getFieldValue(Field field, Object instance) {
+	public static <T> T getFieldValue(Field field, Object instance) {
 		try {
-			return field.get(instance);
+			return (T) field.get(instance);
 		} catch (IllegalArgumentException | IllegalAccessException e) {
 		}
 		return null;