+ Added Recipes for every single machine component from LV -> IV.

$ Small fix to GT Stack grabber.
$ Small fix to circuit tiering in CI.

2 files changed, 26 insertions, 12 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index 996682464b..ad5e4c634c 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -269,21 +269,24 @@ public class CI {
 				return GregtechItemList.Old_Circuit_Advanced.get(1);				
 			}
 			else if (tier == 4){
-				return GregtechItemList.Old_Circuit_Elite.get(1);				
+				return GregtechItemList.Old_Circuit_Data.get(1);				
 			}
 			else if (tier == 5){
-				return GregtechItemList.Old_Circuit_Master.get(1);				
+				return GregtechItemList.Old_Circuit_Elite.get(1);				
 			}
 			else if (tier == 6){
-				return GregtechItemList.Old_Circuit_Ultimate.get(1);				
+				return GregtechItemList.Old_Circuit_Master.get(1);				
 			}
 			else if (tier == 7){
-				return GregtechItemList.Circuit_IV.get(1);				
+				return GregtechItemList.Old_Circuit_Ultimate.get(1);				
 			}
 			else if (tier == 8){
-				return GregtechItemList.Circuit_LuV.get(1);				
+				return GregtechItemList.Circuit_IV.get(1);				
 			}
 			else if (tier == 9){
+				return GregtechItemList.Circuit_LuV.get(1);				
+			}
+			else if (tier == 10){
 				return GregtechItemList.Circuit_ZPM.get(1);				
 			}
 		}
@@ -306,23 +309,27 @@ public class CI {
 			}
 			else if (tier == 4){
 				//return ItemList.Circuit_Elite.get(1);		
-				return "circuitElite";			
+				return "circuitData";			
 			}
 			else if (tier == 5){
+				//return ItemList.Circuit_Elite.get(1);		
+				return "circuitElite";			
+			}
+			else if (tier == 6){
 				//return ItemList.Circuit_Master.get(1);	
 				return "circuitMaster";				
 			}
-			else if (tier == 6){
+			else if (tier == 7){
 				//return ItemList.Circuit_Ultimate.get(1);	
 				return "circuitUltimate";
 			}
-			else if (tier == 7){
+			else if (tier == 8){
 				return "circuitSuperconductor";				
 			}
-			else if (tier == 8){
+			else if (tier == 9){
 				return "circuitInfinite";				
 			}
-			else if (tier == 9){
+			else if (tier == 10){
 				return "circuitQuantum";				
 			}
 		}
diff --git a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
index 13fc4f02dd..852dde6a4b 100644
--- a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
@@ -674,8 +674,15 @@ public class ItemUtils {
 		return getItemStackOfAmountFromOreDictNoBroken(oredictName, amount);
 	}
 	public static ItemStack getGregtechOreStack(OrePrefixes mPrefix, Materials mMat, int mAmount) {
-		ItemStack gregstack = ItemUtils.getItemStackOfAmountFromOreDict(mPrefix.name().toLowerCase()+mMat.mDefaultLocalName, mAmount);
-		return (gregstack != null ? gregstack : null);
+		String mItemName = mPrefix.name()+mMat.mName;
+		Utils.LOG_INFO("[Component Maker] Trying to get "+mItemName+".");
+		ItemStack gregstack = ItemUtils.getItemStackOfAmountFromOreDict(mItemName, mAmount);		
+		if (gregstack == null){
+			Utils.LOG_INFO("[Component Maker] Failed to get "+mItemName+".");
+			return null;
+		}	
+		Utils.LOG_INFO("[Component Maker] Found "+mItemName+".");
+		return (gregstack);
 	}