From baf1f6ff533b9ada00aeb7de98dd0bdaf5c28e10 Mon Sep 17 00:00:00 2001
From: Alkalus <Draknyte1@hotmail.com>
Date: Sat, 11 Apr 2020 22:40:18 +0100
Subject: + Added more milled materials. + Added proper structure for Flotation
 Cells. + Added all milled materials to flotation cell recipes. + Added Human
 meat drops for dead players. + Added Slicing mode for ICM. % Changed
 getVoltageForTier to be a switch case. % Stopped download of cape list in dev
 environment. $ Adjusted how Fusion MK4 injects power, it now pulls the
 voltage of the hatch. $ Fixed Fake Player Handling.

---
 src/Java/gtPlusPlus/core/material/Material.java | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/material/Material.java')

diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index 7d49a8d635..dee064353a 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -3,11 +3,7 @@ package gtPlusPlus.core.material;
 import static gregtech.api.enums.GT_Values.M;
 import static gtPlusPlus.core.util.math.MathUtils.safeCast_LongToInt;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
@@ -1304,6 +1300,23 @@ public class Material {
 	}
 	
 	
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == null) {
+			return false;
+		}
+		if (!Material.class.isInstance(obj)) {
+			return false;
+		}
+		Material aObj = (Material) obj;
+		if (aObj.unlocalizedName.equals(this.unlocalizedName)) {
+			if (aObj.localizedName.equals(this.localizedName)) {
+				return true;
+			}
+		}		
+		return false;
+	}
+
 	public boolean registerComponentForMaterial(FluidStack aStack) {
 		return registerComponentForMaterial(this, aStack);
 	}
-- 
cgit