Enhanced radar, military circuits in recipes, more achievements

assets/hbm/lang/de_DE.lang

@@ -12,6 +12,10 @@ achievement.tasteofblood=Der Geschmack von Blut
 achievement.tasteofblood.desc=ist nicht Teil des Testprotokolls.
 achievement.freytag=Freytag
 achievement.freytag.desc=Leibgarde Herold
+achievement.selenium=Und täglich grüßt der Mond
+achievement.selenium.desc=Lange nicht gesehen!
+achievement.potato=Machtgeile KI
+achievement.potato.desc=Du stichst mich! Was soll denn das?
 
 potion.hbm_taint=Verdorben
 
@@ -517,7 +521,7 @@ item.circuit_targeting_tier4.name=Militärische Schaltplatte (Stufe 4)
 item.circuit_targeting_tier5.name=Militärische Schaltplatte (Stufe 5)
 item.circuit_targeting_tier6.name=Militärische Schaltplatte (Stufe 6)
 
-item.selenium_piston.name=Sternmotorenkolben
+item.piston_selenium.name=Sternmotorenkolben
 
 tile.block_aluminium.name=Aluminiumblock
 tile.block_copper.name=Kupferblock

assets/hbm/lang/en_US.lang

@@ -12,6 +12,10 @@ achievement.tasteofblood=The Taste of Blood
 achievement.tasteofblood.desc=is not part of any testing protocol.
 achievement.freytag=Freytag
 achievement.freytag.desc=Herold's life guards
+achievement.selenium=XVIII The Moon
+achievement.selenium.desc=Yeah.
+achievement.potato=Rogue AI
+achievement.potato.desc=You stabbed me! What is WRONG with yo-WOOOAAH
 
 potion.hbm_taint=Tainted
 
@@ -517,7 +521,7 @@ item.circuit_targeting_tier4.name=Military Grade Circuit Board (Tier 4)
 item.circuit_targeting_tier5.name=Military Grade Circuit Board (Tier 5)
 item.circuit_targeting_tier6.name=Military Grade Circuit Board (Tier 6)
 
-item.selenium_piston.name=Radial Engine Piston
+item.piston_selenium.name=Radial Engine Piston
 
 tile.block_aluminium.name=Block of Aluminium
 tile.block_copper.name=Block of Copper

assets/hbm/sounds.json

@@ -16,6 +16,7 @@
     "block.broadcast1": {"category": "block", "sounds": [{"name": "block/broadcast1", "stream": false}]},
     "block.broadcast2": {"category": "block", "sounds": [{"name": "block/broadcast2", "stream": false}]},
     "block.broadcast3": {"category": "block", "sounds": [{"name": "block/broadcast3", "stream": false}]},
+    "block.sonarPing": {"category": "block", "sounds": [{"name": "block/sonarPing", "stream": false}]},
 
 	"item.techBleep": {"category": "player", "sounds": [{"name": "tool/techBleep", "stream": false}]},
     "item.techBoop": {"category": "player", "sounds": [{"name": "tool/techBoop", "stream": false}]},

com/hbm/entity/missile/EntityMissileBunkerBuster.java

@@ -37,16 +37,16 @@ public class EntityMissileBunkerBuster extends EntityMissileBaseAdvanced {
 	public List<ItemStack> getDebris() {
 		List<ItemStack> list = new ArrayList<ItemStack>();
 
-		list.add(new ItemStack(ModItems.plate_steel, 16));
+		list.add(new ItemStack(ModItems.plate_titanium, 4));
-		list.add(new ItemStack(ModItems.plate_titanium, 10));
+		list.add(new ItemStack(ModItems.thruster_small, 1));
-		list.add(new ItemStack(ModItems.thruster_large, 1));
+		list.add(new ItemStack(ModItems.circuit_targeting_tier1, 1));
 		
 		return list;
 	}
 
 	@Override
 	public ItemStack getDebrisRareDrop() {
-		return new ItemStack(ModItems.warhead_buster_large);
+		return new ItemStack(ModItems.warhead_buster_small);
 	}
 
 	@Override

com/hbm/entity/missile/EntityMissileBurst.java

@@ -35,6 +35,7 @@ public class EntityMissileBurst extends EntityMissileBaseAdvanced {
 		list.add(new ItemStack(ModItems.plate_steel, 16));
 		list.add(new ItemStack(ModItems.plate_titanium, 10));
 		list.add(new ItemStack(ModItems.thruster_large, 1));
+		list.add(new ItemStack(ModItems.circuit_targeting_tier3, 1));
 		
 		return list;
 	}

com/hbm/entity/missile/EntityMissileBusterStrong.java

@@ -39,6 +39,7 @@ public class EntityMissileBusterStrong extends EntityMissileBaseAdvanced {
 		list.add(new ItemStack(ModItems.plate_steel, 10));
 		list.add(new ItemStack(ModItems.plate_titanium, 6));
 		list.add(new ItemStack(ModItems.thruster_medium, 1));
+		list.add(new ItemStack(ModItems.circuit_targeting_tier2, 1));
 		
 		return list;
 	}

com/hbm/entity/missile/EntityMissileCluster.java

@@ -39,6 +39,7 @@ public class EntityMissileCluster extends EntityMissileBaseAdvanced {
 
 		list.add(new ItemStack(ModItems.plate_titanium, 4));
 		list.add(new ItemStack(ModItems.thruster_small, 1));
+		list.add(new ItemStack(ModItems.circuit_targeting_tier1, 1));
 		
 		return list;
 	}

com/hbm/entity/missile/EntityMissileClusterStrong.java

@@ -40,6 +40,7 @@ public class EntityMissileClusterStrong extends EntityMissileBaseAdvanced {
 		list.add(new ItemStack(ModItems.plate_steel, 10));
 		list.add(new ItemStack(ModItems.plate_titanium, 6));
 		list.add(new ItemStack(ModItems.thruster_medium, 1));
+		list.add(new ItemStack(ModItems.circuit_targeting_tier2, 1));
 		
 		return list;
 	}

com/hbm/entity/missile/EntityMissileDrill.java

@@ -39,6 +39,7 @@ public class EntityMissileDrill extends EntityMissileBaseAdvanced {
 		list.add(new ItemStack(ModItems.plate_steel, 16));
 		list.add(new ItemStack(ModItems.plate_titanium, 10));
 		list.add(new ItemStack(ModItems.thruster_large, 1));
+		list.add(new ItemStack(ModItems.circuit_targeting_tier3, 1));
 		
 		return list;
 	}

com/hbm/entity/missile/EntityMissileEndo.java

@@ -36,6 +36,7 @@ public class EntityMissileEndo extends EntityMissileBaseAdvanced {
 		list.add(new ItemStack(ModItems.plate_steel, 14));
 		list.add(new ItemStack(ModItems.plate_aluminium, 8));
 		list.add(new ItemStack(ModItems.thruster_large, 1));
+		list.add(new ItemStack(ModItems.circuit_targeting_tier4, 1));
 		
 		return list;
 	}

com/hbm/entity/missile/EntityMissileExo.java

@@ -36,6 +36,7 @@ public class EntityMissileExo extends EntityMissileBaseAdvanced {
 		list.add(new ItemStack(ModItems.plate_steel, 14));
 		list.add(new ItemStack(ModItems.plate_aluminium, 8));
 		list.add(new ItemStack(ModItems.thruster_large, 1));
+		list.add(new ItemStack(ModItems.circuit_targeting_tier4, 1));
 		
 		return list;
 	}

com/hbm/entity/missile/EntityMissileGeneric.java

@@ -32,6 +32,7 @@ public class EntityMissileGeneric extends EntityMissileBaseAdvanced {
 
 		list.add(new ItemStack(ModItems.plate_titanium, 4));
 		list.add(new ItemStack(ModItems.thruster_small, 1));
+		list.add(new ItemStack(ModItems.circuit_targeting_tier1, 1));
 		
 		return list;
 	}

com/hbm/entity/missile/EntityMissileIncendiary.java

@@ -34,6 +34,7 @@ public class EntityMissileIncendiary extends EntityMissileBaseAdvanced {
 
 		list.add(new ItemStack(ModItems.plate_titanium, 4));
 		list.add(new ItemStack(ModItems.thruster_small, 1));
+		list.add(new ItemStack(ModItems.circuit_targeting_tier1, 1));
 		
 		return list;
 	}

com/hbm/entity/missile/EntityMissileIncendiaryStrong.java

@@ -35,6 +35,7 @@ public class EntityMissileIncendiaryStrong extends EntityMissileBaseAdvanced {
 		list.add(new ItemStack(ModItems.plate_steel, 10));
 		list.add(new ItemStack(ModItems.plate_titanium, 6));
 		list.add(new ItemStack(ModItems.thruster_medium, 1));
+		list.add(new ItemStack(ModItems.circuit_targeting_tier2, 1));
 		
 		return list;
 	}

com/hbm/entity/missile/EntityMissileInferno.java

@@ -36,6 +36,7 @@ public class EntityMissileInferno extends EntityMissileBaseAdvanced {
 		list.add(new ItemStack(ModItems.plate_steel, 16));
 		list.add(new ItemStack(ModItems.plate_titanium, 10));
 		list.add(new ItemStack(ModItems.thruster_large, 1));
+		list.add(new ItemStack(ModItems.circuit_targeting_tier3, 1));
 		
 		return list;
 	}

com/hbm/entity/missile/EntityMissileMicro.java

@@ -65,6 +65,7 @@ public class EntityMissileMicro extends EntityMissileBaseAdvanced {
 		list.add(new ItemStack(ModItems.plate_titanium, 4));
 		list.add(new ItemStack(ModItems.hull_small_aluminium, 2));
 		list.add(new ItemStack(ModItems.ducttape, 1));
+		list.add(new ItemStack(ModItems.circuit_targeting_tier1, 1));
 		
 		return list;
 	}

com/hbm/entity/missile/EntityMissileMirv.java

@@ -54,6 +54,7 @@ public class EntityMissileMirv extends EntityMissileBaseAdvanced {
 		list.add(new ItemStack(ModItems.plate_aluminium, 12));
 		list.add(new ItemStack(ModItems.thruster_large, 1));
 		list.add(new ItemStack(ModItems.warhead_mirvlet, 8));
+		list.add(new ItemStack(ModItems.circuit_targeting_tier5, 1));
 		
 		return list;
 	}

com/hbm/entity/missile/EntityMissileNuclear.java

@@ -53,6 +53,7 @@ public class EntityMissileNuclear extends EntityMissileBaseAdvanced {
 		list.add(new ItemStack(ModItems.plate_steel, 20));
 		list.add(new ItemStack(ModItems.plate_aluminium, 12));
 		list.add(new ItemStack(ModItems.thruster_large, 1));
+		list.add(new ItemStack(ModItems.circuit_targeting_tier4, 1));
 		
 		return list;
 	}

com/hbm/entity/missile/EntityMissileRain.java

@@ -40,6 +40,7 @@ public class EntityMissileRain extends EntityMissileBaseAdvanced {
 		list.add(new ItemStack(ModItems.plate_steel, 16));
 		list.add(new ItemStack(ModItems.plate_titanium, 10));
 		list.add(new ItemStack(ModItems.thruster_large, 1));
+		list.add(new ItemStack(ModItems.circuit_targeting_tier3, 1));
 		
 		return list;
 	}

com/hbm/entity/missile/EntityMissileStrong.java

@@ -33,6 +33,7 @@ public class EntityMissileStrong extends EntityMissileBaseAdvanced {
 		list.add(new ItemStack(ModItems.plate_steel, 10));
 		list.add(new ItemStack(ModItems.plate_titanium, 6));
 		list.add(new ItemStack(ModItems.thruster_medium, 1));
+		list.add(new ItemStack(ModItems.circuit_targeting_tier2, 1));
 		
 		return list;
 	}

com/hbm/entity/missile/EntityMissileTaint.java

@@ -42,6 +42,7 @@ public class EntityMissileTaint extends EntityMissileBaseAdvanced {
 		list.add(new ItemStack(ModItems.plate_titanium, 4));
 		list.add(new ItemStack(ModItems.hull_small_aluminium, 2));
 		list.add(new ItemStack(ModItems.powder_magic, 1));
+		list.add(new ItemStack(ModItems.circuit_targeting_tier1, 1));
 		
 		return list;
 	}

com/hbm/inventory/MachineRecipes.java

@@ -32,14 +32,18 @@ public class MachineRecipes {
 		return new MachineRecipes();
 	}
 
-	public static ItemStack getFurnaceProcessingResult(Item item, Item item2) {
+	public static ItemStack getFurnaceProcessingResult(ItemStack item, ItemStack item2) {
 		return getFurnaceOutput(item, item2);
 	}
 
-	public static ItemStack getFurnaceOutput(Item item, Item item2) {
+	public static ItemStack getFurnaceOutput(ItemStack item, ItemStack item2) {
+		
+		if(item == null || item2 == null)
+			return null;
+		
 		if (MainRegistry.enableDebugMode) {
-			if (item == Items.iron_ingot && item2 == Items.quartz
+			if (item.getItem() == Items.iron_ingot && item2.getItem() == Items.quartz
-					|| item == Items.quartz && item2 == Items.iron_ingot) {
+					|| item.getItem() == Items.quartz && item2.getItem() == Items.iron_ingot) {
 				return new ItemStack(ModBlocks.test_render, 1);
 			}
 		}
@@ -64,13 +68,13 @@ public class MachineRecipes {
 			return new ItemStack(ModItems.ingot_steel, 2);
 		}
 
-		if (mODE(item, new String[] {"ingotCopper", "dustCopper"}) && item2 == Items.redstone
+		if (mODE(item, new String[] {"ingotCopper", "dustCopper"}) && item2.getItem() == Items.redstone
-				|| item == Items.redstone && mODE(item2, new String[] {"ingotCopper", "dustCopper"})) {
+				|| item.getItem() == Items.redstone && mODE(item2, new String[] {"ingotCopper", "dustCopper"})) {
 			return new ItemStack(ModItems.ingot_red_copper, 2);
 		}
 
-		if (item == ModItems.canister_fuel && item2 == Items.slime_ball
+		if (item.getItem() == ModItems.canister_fuel && item2.getItem() == Items.slime_ball
-				|| item == Items.slime_ball && item2 == ModItems.canister_fuel) {
+				|| item.getItem() == Items.slime_ball && item2.getItem() == ModItems.canister_fuel) {
 			return new ItemStack(ModItems.canister_napalm, 1);
 		}
 
@@ -84,8 +88,8 @@ public class MachineRecipes {
 			return new ItemStack(ModItems.ingot_magnetized_tungsten, 1);
 		}
 
-		if (item == ModItems.plate_mixed && mODE(item2, "plateGold")
+		if (item.getItem() == ModItems.plate_mixed && mODE(item2, "plateGold")
-				|| mODE(item, "plateGold") && item2 == ModItems.plate_mixed) {
+				|| mODE(item, "plateGold") && item2.getItem() == ModItems.plate_mixed) {
 			return new ItemStack(ModItems.plate_paa, 2);
 		}
 
@@ -94,13 +98,13 @@ public class MachineRecipes {
 			return new ItemStack(ModItems.ingot_dura_steel, 2);
 		}
 
-		if (mODE(item, new String[] {"ingotSteel", "dustSteel"}) && item2 == ModItems.powder_cobalt
+		if (mODE(item, new String[] {"ingotSteel", "dustSteel"}) && item2.getItem() == ModItems.powder_cobalt
-				|| item == ModItems.powder_cobalt && mODE(item2, new String[] {"ingotSteel", "dustSteel"})) {
+				|| item.getItem() == ModItems.powder_cobalt && mODE(item2, new String[] {"ingotSteel", "dustSteel"})) {
 			return new ItemStack(ModItems.ingot_dura_steel, 2);
 		}
 
-		if (mODE(item, new String[] {"ingotSteel", "dustSteel"}) && item2 == ModItems.powder_meteorite
+		if (mODE(item, new String[] {"ingotSteel", "dustSteel"}) && item2.getItem() == ModItems.powder_meteorite
-				|| item == ModItems.powder_meteorite && mODE(item2, new String[] {"ingotSteel", "dustSteel"})) {
+				|| item.getItem() == ModItems.powder_meteorite && mODE(item2, new String[] {"ingotSteel", "dustSteel"})) {
 			return new ItemStack(ModItems.ingot_starmetal, 2);
 		}
 
@@ -268,15 +272,22 @@ public class MachineRecipes {
 		add(ModItems.stamp_obsidian_circuit);
 		add(ModItems.stamp_schrabidium_circuit);
 	}};
-	
 
-	public static ItemStack getPressResultNN(Item stamp, Item input) {
+
+	public static ItemStack getPressResultNN(ItemStack stamp, ItemStack input) {
 		return getPressResult(input, stamp) == null ? new ItemStack(ModItems.nothing) : getPressResult(input, stamp);
 	}
+
+	public static ItemStack getPressResultNN(Item stamp, Item input) {
+		return getPressResult(new ItemStack(input), new ItemStack(stamp)) == null ? new ItemStack(ModItems.nothing) : getPressResult(new ItemStack(input), new ItemStack(stamp));
+	}
 	
-	public static ItemStack getPressResult(Item input, Item stamp) {
+	public static ItemStack getPressResult(ItemStack input, ItemStack stamp) {
 		
-		if(stamps_flat.contains(stamp)) {
+		if(input == null || stamp == null)
+			return null;
+		
+		if(stamps_flat.contains(stamp.getItem())) {
 
 			if(mODE(input, "dustCoal"))
 				return new ItemStack(Items.coal);
@@ -290,13 +301,13 @@ public class MachineRecipes {
 				return new ItemStack(Items.diamond);
 			if(mODE(input, "dustEmerald"))
 				return new ItemStack(Items.emerald);
-			if(input == ModItems.pellet_coal)
+			if(input.getItem() == ModItems.pellet_coal)
 				return new ItemStack(Items.diamond);
-			if(input == ModItems.biomass)
+			if(input.getItem() == ModItems.biomass)
 				return new ItemStack(ModItems.biomass_compressed);
 		}
 		
-		if(stamps_plate.contains(stamp)) {
+		if(stamps_plate.contains(stamp.getItem())) {
 
 			if(mODE(input, "ingotIron"))
 				return new ItemStack(ModItems.plate_iron);
@@ -323,7 +334,7 @@ public class MachineRecipes {
 			
 		}
 		
-		if(stamps_wire.contains(stamp)) {
+		if(stamps_wire.contains(stamp.getItem())) {
 
 			if(mODE(input, "ingotAluminum"))
 				return new ItemStack(ModItems.wire_aluminium, 3);
@@ -347,9 +358,9 @@ public class MachineRecipes {
 				return new ItemStack(ModItems.wire_magnetized_tungsten, 3);
 		}
 		
-		if(stamps_circuit.contains(stamp)) {
+		if(stamps_circuit.contains(stamp.getItem())) {
 
-			if(input == ModItems.circuit_raw)
+			if(input.getItem() == ModItems.circuit_raw)
 				return new ItemStack(ModItems.circuit_aluminium);
 		}
 		
@@ -767,29 +778,29 @@ public class MachineRecipes {
 		}
 		try {
 			recipes.put(new ItemStack[] { new ItemStack(Items.iron_ingot), new ItemStack(Items.coal) },
-				getFurnaceOutput(Items.iron_ingot, Items.coal).copy());
+				getFurnaceOutput(new ItemStack(Items.iron_ingot), new ItemStack(Items.coal)).copy());
 			recipes.put(new ItemStack[] { new ItemStack(ModItems.ingot_lead), new ItemStack(ModItems.ingot_copper) },
-					getFurnaceOutput(ModItems.ingot_lead, ModItems.ingot_copper).copy());
+					getFurnaceOutput(new ItemStack(ModItems.ingot_lead), new ItemStack(ModItems.ingot_copper)).copy());
 			recipes.put(new ItemStack[] { new ItemStack(ModItems.plate_lead), new ItemStack(ModItems.plate_copper) },
-					getFurnaceOutput(ModItems.plate_lead, ModItems.plate_copper).copy());
+					getFurnaceOutput(new ItemStack(ModItems.plate_lead), new ItemStack(ModItems.plate_copper)).copy());
 			recipes.put(new ItemStack[] { new ItemStack(ModItems.ingot_tungsten), new ItemStack(Items.coal) },
-					getFurnaceOutput(ModItems.ingot_tungsten, Items.coal).copy());
+					getFurnaceOutput(new ItemStack(ModItems.ingot_tungsten), new ItemStack(Items.coal)).copy());
 			recipes.put(new ItemStack[] { new ItemStack(ModItems.ingot_copper), new ItemStack(Items.redstone) },
-					getFurnaceOutput(ModItems.ingot_copper, Items.redstone).copy());
+					getFurnaceOutput(new ItemStack(ModItems.ingot_copper), new ItemStack(Items.redstone)).copy());
 			recipes.put(new ItemStack[] { new ItemStack(ModItems.ingot_red_copper), new ItemStack(ModItems.ingot_steel) },
-					getFurnaceOutput(ModItems.ingot_red_copper, ModItems.ingot_steel).copy());
+					getFurnaceOutput(new ItemStack(ModItems.ingot_red_copper), new ItemStack(ModItems.ingot_steel)).copy());
 			recipes.put(new ItemStack[] { new ItemStack(ModItems.canister_fuel), new ItemStack(Items.slime_ball) },
-					getFurnaceOutput(ModItems.canister_fuel, Items.slime_ball).copy());
+					getFurnaceOutput(new ItemStack(ModItems.canister_fuel), new ItemStack(Items.slime_ball)).copy());
 			recipes.put(new ItemStack[] { new ItemStack(ModItems.ingot_tungsten), new ItemStack(ModItems.nugget_schrabidium) },
-					getFurnaceOutput(ModItems.ingot_tungsten, ModItems.nugget_schrabidium).copy());
+					getFurnaceOutput(new ItemStack(ModItems.ingot_tungsten), new ItemStack(ModItems.nugget_schrabidium)).copy());
 			recipes.put(new ItemStack[] { new ItemStack(ModItems.plate_mixed), new ItemStack(ModItems.plate_gold) },
-					getFurnaceOutput(ModItems.plate_mixed, ModItems.plate_gold).copy());
+					getFurnaceOutput(new ItemStack(ModItems.plate_mixed), new ItemStack(ModItems.plate_gold)).copy());
 			recipes.put(new ItemStack[] { new ItemStack(ModItems.ingot_steel), new ItemStack(ModItems.ingot_tungsten) },
-					getFurnaceOutput(ModItems.ingot_steel, ModItems.ingot_tungsten).copy());
+					getFurnaceOutput(new ItemStack(ModItems.ingot_steel), new ItemStack(ModItems.ingot_tungsten)).copy());
 			recipes.put(new ItemStack[] { new ItemStack(ModItems.ingot_steel), new ItemStack(ModItems.powder_cobalt) },
-					getFurnaceOutput(ModItems.ingot_steel, ModItems.powder_cobalt).copy());
+					getFurnaceOutput(new ItemStack(ModItems.ingot_steel), new ItemStack(ModItems.powder_cobalt)).copy());
 			recipes.put(new ItemStack[] { new ItemStack(ModItems.ingot_steel), new ItemStack(ModItems.powder_meteorite) },
-					getFurnaceOutput(ModItems.ingot_steel, ModItems.powder_meteorite).copy());
+					getFurnaceOutput(new ItemStack(ModItems.ingot_steel), new ItemStack(ModItems.powder_meteorite)).copy());
 		} catch (Exception x) {
 			MainRegistry.logger.error("Unable to register alloy recipes for NEI!");
 		}
@@ -1812,6 +1823,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.plate_titanium, 6));
 			list.add(new ItemStack(ModItems.wire_aluminium, 6));
 			list.add(new ItemStack(ModItems.canister_kerosene, 3));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier1, 1));
 			break;
 		case WT1_CLUSTER:
 			list.add(new ItemStack(ModItems.warhead_generic_small, 1));
@@ -2572,14 +2584,14 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.sphere_steel, 1));
 			list.add(new ItemStack(ModItems.fins_flat, 2));
 			list.add(new ItemStack(ModItems.pedestal_steel, 1));
-			list.add(new ItemStack(ModItems.circuit_red_copper, 1));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier3, 1));
 			list.add(new ItemStack(ModItems.wire_gold, 6));
 			list.add(new ItemStack(Items.dye, 6, 8));
 			break;
 		case LITTLE_BOY:
 			list.add(new ItemStack(ModItems.hull_small_steel, 2));
 			list.add(new ItemStack(ModItems.fins_small_steel, 1));
-			list.add(new ItemStack(ModItems.circuit_copper, 1));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier2, 1));
 			list.add(new ItemStack(ModItems.wire_aluminium, 6));
 			list.add(new ItemStack(Items.dye, 4, 4));
 			break;
@@ -2587,7 +2599,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.sphere_steel, 1));
 			list.add(new ItemStack(ModItems.hull_big_steel, 2));
 			list.add(new ItemStack(ModItems.fins_big_steel, 1));
-			list.add(new ItemStack(ModItems.circuit_copper, 1));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier2, 2));
 			list.add(new ItemStack(ModItems.wire_copper, 6));
 			list.add(new ItemStack(Items.dye, 6, 11));
 			break;
@@ -2595,7 +2607,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.sphere_steel, 1));
 			list.add(new ItemStack(ModItems.hull_big_aluminium, 4));
 			list.add(new ItemStack(ModItems.cap_aluminium, 1));
-			list.add(new ItemStack(ModItems.circuit_gold, 4));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier4, 3));
 			list.add(new ItemStack(ModItems.wire_gold, 18));
 			list.add(new ItemStack(Items.dye, 12, 7));
 			break;
@@ -2604,7 +2616,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.hull_big_titanium, 6));
 			list.add(new ItemStack(ModItems.hull_small_steel, 2));
 			list.add(new ItemStack(ModItems.fins_tri_steel, 1));
-			list.add(new ItemStack(ModItems.circuit_gold, 6));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier4, 5));
 			list.add(new ItemStack(ModItems.wire_gold, 24));
 			list.add(new ItemStack(ModItems.wire_tungsten, 12));
 			list.add(new ItemStack(Items.dye, 6, 0));
@@ -2613,13 +2625,13 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.dysfunctional_reactor, 1));
 			list.add(new ItemStack(ModItems.hull_small_steel, 2));
 			list.add(new ItemStack(ModItems.ingot_euphemium, 3));
-			list.add(new ItemStack(ModItems.circuit_gold, 2));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier5, 1));
 			list.add(new ItemStack(ModItems.wire_gold, 16));
 			break;
 		case FLEIJA:
 			list.add(new ItemStack(ModItems.hull_small_aluminium, 1));
 			list.add(new ItemStack(ModItems.fins_quad_titanium, 1));
-			list.add(new ItemStack(ModItems.circuit_gold, 2));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier4, 2));
 			list.add(new ItemStack(ModItems.wire_gold, 8));
 			list.add(new ItemStack(Items.dye, 4, 15));
 			break;
@@ -2676,7 +2688,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.pipes_steel, 2));
 			list.add(new ItemStack(ModItems.ingot_red_copper, 2));
 			list.add(new ItemStack(ModItems.motor, 2));
-			list.add(new ItemStack(ModItems.circuit_red_copper, 2));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier2, 2));
 			break;
 		case TURRET_HEAVY:
 			list.add(new ItemStack(ModItems.ingot_steel, 8));
@@ -2685,7 +2697,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.hull_small_steel, 1));
 			list.add(new ItemStack(ModItems.ingot_red_copper, 4));
 			list.add(new ItemStack(ModItems.motor, 2));
-			list.add(new ItemStack(ModItems.circuit_red_copper, 3));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier2, 3));
 			break;
 		case TURRET_ROCKET:
 			list.add(new ItemStack(ModItems.ingot_steel, 12));
@@ -2693,7 +2705,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.hull_small_steel, 8));
 			list.add(new ItemStack(ModItems.ingot_red_copper, 6));
 			list.add(new ItemStack(ModItems.motor, 2));
-			list.add(new ItemStack(ModItems.circuit_gold, 2));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier3, 2));
 			break;
 		case TURRET_FLAMER:
 			list.add(new ItemStack(ModItems.ingot_steel, 8));
@@ -2702,7 +2714,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.tank_steel, 2));
 			list.add(new ItemStack(ModItems.ingot_red_copper, 4));
 			list.add(new ItemStack(ModItems.motor, 2));
-			list.add(new ItemStack(ModItems.circuit_red_copper, 2));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier3, 2));
 			break;
 		case TURRET_TAU:
 			list.add(new ItemStack(ModItems.ingot_steel, 16));
@@ -2711,7 +2723,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.redcoil_capacitor, 3));
 			list.add(new ItemStack(ModItems.ingot_red_copper, 12));
 			list.add(new ItemStack(ModItems.motor, 2));
-			list.add(new ItemStack(ModItems.circuit_gold, 4));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier4, 2));
 			break;
 		case TURRET_SPITFIRE:
 			list.add(new ItemStack(ModItems.ingot_steel, 6));
@@ -2721,7 +2733,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.hull_small_steel, 4));
 			list.add(new ItemStack(ModItems.pipes_steel, 2));
 			list.add(new ItemStack(ModItems.motor, 3));
-			list.add(new ItemStack(ModItems.circuit_red_copper, 4));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier3, 1));
 			break;
 		case TURRET_CIWS:
 			list.add(new ItemStack(ModItems.ingot_steel, 6));
@@ -2731,7 +2743,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.hull_small_aluminium, 2));
 			list.add(new ItemStack(ModItems.pipes_steel, 6));
 			list.add(new ItemStack(ModItems.motor, 4));
-			list.add(new ItemStack(ModItems.circuit_gold, 5));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier4, 2));
 			list.add(new ItemStack(ModItems.magnetron, 3));
 			break;
 		case TURRET_CHEAPO:
@@ -2739,7 +2751,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.plate_iron, 4));
 			list.add(new ItemStack(ModItems.pipes_steel, 3));
 			list.add(new ItemStack(ModItems.motor, 3));
-			list.add(new ItemStack(ModItems.circuit_red_copper, 3));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier1, 4));
 			break;
 		case HUNTER_CHOPPER:
 			list.add(new ItemStack(ModItems.chopper_blades, 5));
@@ -2754,24 +2766,28 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.fuel_tank_small, 1));
 			list.add(new ItemStack(ModItems.thruster_small, 1));
 			list.add(new ItemStack(ModItems.plate_titanium, 6));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier1, 1));
 			break;
 		case MISSILE_FIRE_1:
 			list.add(new ItemStack(ModItems.warhead_incendiary_small, 1));
 			list.add(new ItemStack(ModItems.fuel_tank_small, 1));
 			list.add(new ItemStack(ModItems.thruster_small, 1));
 			list.add(new ItemStack(ModItems.plate_titanium, 6));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier1, 1));
 			break;
 		case MISSILE_CLUSTER_1:
 			list.add(new ItemStack(ModItems.warhead_cluster_small, 1));
 			list.add(new ItemStack(ModItems.fuel_tank_small, 1));
 			list.add(new ItemStack(ModItems.thruster_small, 1));
 			list.add(new ItemStack(ModItems.plate_titanium, 6));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier1, 1));
 			break;
 		case MISSILE_BUSTER_1:
 			list.add(new ItemStack(ModItems.warhead_buster_small, 1));
 			list.add(new ItemStack(ModItems.fuel_tank_small, 1));
 			list.add(new ItemStack(ModItems.thruster_small, 1));
 			list.add(new ItemStack(ModItems.plate_titanium, 6));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier1, 1));
 			break;
 		case MISSILE_HE_2:
 			list.add(new ItemStack(ModItems.warhead_generic_medium, 1));
@@ -2779,6 +2795,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.thruster_medium, 1));
 			list.add(new ItemStack(ModItems.plate_titanium, 10));
 			list.add(new ItemStack(ModItems.plate_steel, 14));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier2, 1));
 			break;
 		case MISSILE_FIRE_2:
 			list.add(new ItemStack(ModItems.warhead_incendiary_medium, 1));
@@ -2786,6 +2803,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.thruster_medium, 1));
 			list.add(new ItemStack(ModItems.plate_titanium, 10));
 			list.add(new ItemStack(ModItems.plate_steel, 14));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier2, 1));
 			break;
 		case MISSILE_CLUSTER_2:
 			list.add(new ItemStack(ModItems.warhead_cluster_medium, 1));
@@ -2793,6 +2811,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.thruster_medium, 1));
 			list.add(new ItemStack(ModItems.plate_titanium, 10));
 			list.add(new ItemStack(ModItems.plate_steel, 14));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier2, 1));
 			break;
 		case MISSILE_BUSTER_2:
 			list.add(new ItemStack(ModItems.warhead_buster_medium, 1));
@@ -2800,6 +2819,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.thruster_medium, 1));
 			list.add(new ItemStack(ModItems.plate_titanium, 10));
 			list.add(new ItemStack(ModItems.plate_steel, 14));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier2, 1));
 			break;
 		case MISSILE_HE_3:
 			list.add(new ItemStack(ModItems.warhead_generic_large, 1));
@@ -2808,6 +2828,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.plate_titanium, 14));
 			list.add(new ItemStack(ModItems.plate_steel, 20));
 			list.add(new ItemStack(ModItems.plate_aluminium, 12));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier3, 1));
 			break;
 		case MISSILE_FIRE_3:
 			list.add(new ItemStack(ModItems.warhead_incendiary_large, 1));
@@ -2816,6 +2837,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.plate_titanium, 14));
 			list.add(new ItemStack(ModItems.plate_steel, 20));
 			list.add(new ItemStack(ModItems.plate_aluminium, 12));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier3, 1));
 			break;
 		case MISSILE_CLUSTER_3:
 			list.add(new ItemStack(ModItems.warhead_cluster_large, 1));
@@ -2824,6 +2846,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.plate_titanium, 14));
 			list.add(new ItemStack(ModItems.plate_steel, 20));
 			list.add(new ItemStack(ModItems.plate_aluminium, 12));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier3, 1));
 			break;
 		case MISSILE_BUSTER_3:
 			list.add(new ItemStack(ModItems.warhead_buster_large, 1));
@@ -2832,6 +2855,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.plate_titanium, 14));
 			list.add(new ItemStack(ModItems.plate_steel, 20));
 			list.add(new ItemStack(ModItems.plate_aluminium, 12));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier3, 1));
 			break;
 		case MISSILE_NUCLEAR:
 			list.add(new ItemStack(ModItems.warhead_nuclear, 1));
@@ -2840,6 +2864,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.plate_titanium, 20));
 			list.add(new ItemStack(ModItems.plate_steel, 24));
 			list.add(new ItemStack(ModItems.plate_aluminium, 16));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier4, 1));
 			break;
 		case MISSILE_MIRV:
 			list.add(new ItemStack(ModItems.warhead_mirv, 1));
@@ -2848,6 +2873,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.plate_titanium, 20));
 			list.add(new ItemStack(ModItems.plate_steel, 24));
 			list.add(new ItemStack(ModItems.plate_aluminium, 16));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier5, 1));
 			break;
 		case MISSILE_ENDO:
 			list.add(new ItemStack(ModItems.warhead_thermo_endo, 1));
@@ -2856,6 +2882,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.plate_titanium, 14));
 			list.add(new ItemStack(ModItems.plate_steel, 20));
 			list.add(new ItemStack(ModItems.plate_aluminium, 12));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier4, 1));
 			break;
 		case MISSILE_EXO:
 			list.add(new ItemStack(ModItems.warhead_thermo_exo, 1));
@@ -2864,6 +2891,7 @@ public class MachineRecipes {
 			list.add(new ItemStack(ModItems.plate_titanium, 14));
 			list.add(new ItemStack(ModItems.plate_steel, 20));
 			list.add(new ItemStack(ModItems.plate_aluminium, 12));
+			list.add(new ItemStack(ModItems.circuit_targeting_tier4, 1));
 			break;
 		case DEFAB:
 			list.add(new ItemStack(ModItems.ingot_steel, 2));

com/hbm/main/CraftingManager.java

@@ -243,6 +243,7 @@ public class CraftingManager {
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_neptunium, 1), new Object[] { ModItems.rod_empty, ModItems.nugget_neptunium, ModItems.nugget_neptunium, ModItems.nugget_neptunium, ModItems.nugget_neptunium, ModItems.nugget_neptunium, ModItems.nugget_neptunium });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_lead, 1), new Object[] { ModItems.rod_empty, ModItems.nugget_lead, ModItems.nugget_lead, ModItems.nugget_lead, ModItems.nugget_lead, ModItems.nugget_lead, ModItems.nugget_lead });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_schrabidium, 1), new Object[] { ModItems.rod_empty, ModItems.nugget_schrabidium, ModItems.nugget_schrabidium, ModItems.nugget_schrabidium, ModItems.nugget_schrabidium, ModItems.nugget_schrabidium, ModItems.nugget_schrabidium });
+		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_solinium, 1), new Object[] { ModItems.rod_empty, ModItems.nugget_solinium, ModItems.nugget_solinium, ModItems.nugget_solinium, ModItems.nugget_solinium, ModItems.nugget_solinium, ModItems.nugget_solinium });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_uranium_fuel, 1), new Object[] { ModItems.rod_empty, ModItems.nugget_uranium_fuel, ModItems.nugget_uranium_fuel, ModItems.nugget_uranium_fuel, ModItems.nugget_uranium_fuel, ModItems.nugget_uranium_fuel, ModItems.nugget_uranium_fuel });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_plutonium_fuel, 1), new Object[] { ModItems.rod_empty, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_mox_fuel, 1), new Object[] { ModItems.rod_empty, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel });
@@ -267,6 +268,7 @@ public class CraftingManager {
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_neptunium, 1), new Object[] { ModItems.rod_dual_empty, ModItems.ingot_neptunium, ModItems.nugget_neptunium, ModItems.nugget_neptunium, ModItems.nugget_neptunium });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_lead, 1), new Object[] { ModItems.rod_dual_empty, ModItems.ingot_lead, ModItems.nugget_lead, ModItems.nugget_lead, ModItems.nugget_lead });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_schrabidium, 1), new Object[] { ModItems.rod_dual_empty, ModItems.ingot_schrabidium, ModItems.nugget_schrabidium, ModItems.nugget_schrabidium, ModItems.nugget_schrabidium });
+		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_solinium, 1), new Object[] { ModItems.rod_dual_empty, ModItems.nugget_solinium, ModItems.nugget_solinium, ModItems.nugget_solinium, ModItems.nugget_solinium });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_uranium_fuel, 1), new Object[] { ModItems.rod_dual_empty, ModItems.ingot_uranium_fuel, ModItems.nugget_uranium_fuel, ModItems.nugget_uranium_fuel, ModItems.nugget_uranium_fuel });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_plutonium_fuel, 1), new Object[] { ModItems.rod_dual_empty, ModItems.ingot_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_dual_mox_fuel, 1), new Object[] { ModItems.rod_dual_empty, ModItems.ingot_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel });
@@ -292,6 +294,7 @@ public class CraftingManager {
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_quad_neptunium, 1), new Object[] { ModItems.rod_quad_empty, ModItems.ingot_neptunium, ModItems.ingot_neptunium, ModItems.nugget_neptunium, ModItems.nugget_neptunium, ModItems.nugget_neptunium, ModItems.nugget_neptunium, ModItems.nugget_neptunium, ModItems.nugget_neptunium });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_quad_lead, 1), new Object[] { ModItems.rod_quad_empty, ModItems.ingot_lead, ModItems.ingot_lead, ModItems.nugget_lead, ModItems.nugget_lead, ModItems.nugget_lead, ModItems.nugget_lead, ModItems.nugget_lead, ModItems.nugget_lead });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_quad_schrabidium, 1), new Object[] { ModItems.rod_quad_empty, ModItems.ingot_schrabidium, ModItems.ingot_schrabidium, ModItems.nugget_schrabidium, ModItems.nugget_schrabidium, ModItems.nugget_schrabidium, ModItems.nugget_schrabidium, ModItems.nugget_schrabidium, ModItems.nugget_schrabidium });
+		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_quad_solinium, 1), new Object[] { ModItems.rod_quad_empty, ModItems.nugget_solinium, ModItems.nugget_solinium, ModItems.nugget_solinium, ModItems.nugget_solinium, ModItems.nugget_solinium, ModItems.nugget_solinium, ModItems.nugget_solinium, ModItems.nugget_solinium });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_quad_uranium_fuel, 1), new Object[] { ModItems.rod_quad_empty, ModItems.ingot_uranium_fuel, ModItems.ingot_uranium_fuel, ModItems.nugget_uranium_fuel, ModItems.nugget_uranium_fuel, ModItems.nugget_uranium_fuel, ModItems.nugget_uranium_fuel, ModItems.nugget_uranium_fuel, ModItems.nugget_uranium_fuel });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_quad_plutonium_fuel, 1), new Object[] { ModItems.rod_quad_empty, ModItems.ingot_plutonium_fuel, ModItems.ingot_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel, ModItems.nugget_plutonium_fuel });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.rod_quad_mox_fuel, 1), new Object[] { ModItems.rod_quad_empty, ModItems.ingot_mox_fuel, ModItems.ingot_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel, ModItems.nugget_mox_fuel });
@@ -311,6 +314,7 @@ public class CraftingManager {
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_neptunium, 6), new Object[] { ModItems.rod_neptunium });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_lead, 6), new Object[] { ModItems.rod_lead });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium, 6), new Object[] { ModItems.rod_schrabidium });
+		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_solinium, 6), new Object[] { ModItems.rod_solinium });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_uranium_fuel, 6), new Object[] { ModItems.rod_uranium_fuel });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_plutonium_fuel, 6), new Object[] { ModItems.rod_plutonium_fuel });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_mox_fuel, 6), new Object[] { ModItems.rod_mox_fuel });
@@ -333,6 +337,7 @@ public class CraftingManager {
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_neptunium, 12), new Object[] { ModItems.rod_dual_neptunium });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_lead, 12), new Object[] { ModItems.rod_dual_lead });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium, 12), new Object[] { ModItems.rod_dual_schrabidium });
+		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_solinium, 12), new Object[] { ModItems.rod_dual_solinium });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_uranium_fuel, 12), new Object[] { ModItems.rod_dual_uranium_fuel });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_plutonium_fuel, 12), new Object[] { ModItems.rod_dual_plutonium_fuel });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_mox_fuel, 12), new Object[] { ModItems.rod_dual_mox_fuel });
@@ -348,6 +353,7 @@ public class CraftingManager {
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_neptunium, 24), new Object[] { ModItems.rod_quad_neptunium });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_lead, 24), new Object[] { ModItems.rod_quad_lead });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium, 24), new Object[] { ModItems.rod_quad_schrabidium });
+		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_solinium, 24), new Object[] { ModItems.rod_quad_solinium });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_uranium_fuel, 24), new Object[] { ModItems.rod_quad_uranium_fuel });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_plutonium_fuel, 24), new Object[] { ModItems.rod_quad_plutonium_fuel });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_mox_fuel, 24), new Object[] { ModItems.rod_quad_mox_fuel });

com/hbm/main/MainRegistry.java

@@ -383,6 +383,8 @@ public class MainRegistry
 	public static Achievement achImpossible;
 	public static Achievement achTOB;
 	public static Achievement achFreytag;
+	public static Achievement achSelenium;
+	public static Achievement achPotato;
 	
 	public static boolean enableDebugMode = true;
 	public static boolean enableMycelium = false;
@@ -900,12 +902,16 @@ public class MainRegistry
 		achImpossible = new Achievement("achievement.impossible", "impossible", 2, 0, ModItems.nothing, null).initIndependentStat().setSpecial().registerStat();
 		achTOB = new Achievement("achievement.tasteofblood", "tasteofblood", 0, 2, new ItemStack(ModItems.fluid_icon, 1, FluidType.ASCHRAB.getID()), null).initIndependentStat().setSpecial().registerStat();
 		achFreytag = new Achievement("achievement.freytag", "freytag", 0, -2, ModItems.gun_mp40, null).initIndependentStat().setSpecial().registerStat();
+		achSelenium = new Achievement("achievement.selenium", "selenium", -2, -2, ModItems.ingot_starmetal, null).initIndependentStat().setSpecial().registerStat();
+		achPotato = new Achievement("achievement.potato", "potato", -2, 0, ModItems.battery_potatos, null).initIndependentStat().setSpecial().registerStat();
 		
 		AchievementPage.registerAchievementPage(new AchievementPage("Nuclear Tech", new Achievement[]{ 
 				achSacrifice,
 				achImpossible,
 				achTOB,
-				achFreytag
+				achFreytag,
+				achSelenium,
+				achPotato
 		}));
 		
 		OreDictionary.registerOre("ingotUranium", ModItems.ingot_uranium);

com/hbm/main/ModEventHandler.java

@@ -87,6 +87,12 @@ public class ModEventHandler
 		if(item == ModItems.gun_mp40) {
 			e.player.addStat(MainRegistry.achFreytag, 1);
 		}
+		if(item == ModItems.piston_selenium) {
+			e.player.addStat(MainRegistry.achSelenium, 1);
+		}
+		if(item == ModItems.battery_potatos) {
+			e.player.addStat(MainRegistry.achPotato, 1);
+		}
 	}
 	
 	/*@SubscribeEvent

com/hbm/render/tileentity/RenderRadar.java

@@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.main.ResourceManager;
 import com.hbm.tileentity.machine.TileEntityMachineMiningDrill;
+import com.hbm.tileentity.machine.TileEntityMachineRadar;
 
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
@@ -36,7 +37,10 @@ public class RenderRadar extends TileEntitySpecialRenderer {
         GL11.glDisable(GL11.GL_CULL_FACE);
 		GL11.glRotatef(180, 0F, 1F, 0F);
 		
-		GL11.glRotatef((System.currentTimeMillis() / 10) % 360, 0F, 1F, 0F);
+		TileEntityMachineRadar radar = (TileEntityMachineRadar)tileEntity;
+		
+		if(radar.power > 0)
+			GL11.glRotatef((System.currentTimeMillis() / 10) % 360, 0F, 1F, 0F);
 
         bindTexture(ResourceManager.radar_head_tex);
         ResourceManager.radar_head.renderAll();

com/hbm/tileentity/machine/TileEntityDiFurnace.java

@@ -224,7 +224,7 @@ public class TileEntityDiFurnace extends TileEntity implements ISidedInventory {
 		{
 			return false;
 		}
-		ItemStack itemStack = MachineRecipes.getFurnaceProcessingResult(slots[0].getItem(), slots[1].getItem());
+		ItemStack itemStack = MachineRecipes.getFurnaceProcessingResult(slots[0], slots[1]);
 		if(itemStack == null)
 		{
 			return false;
@@ -248,7 +248,7 @@ public class TileEntityDiFurnace extends TileEntity implements ISidedInventory {
 	
 	private void processItem() {
 		if(canProcess()) {
-			ItemStack itemStack = MachineRecipes.getFurnaceProcessingResult(slots[0].getItem(), slots[1].getItem());
+			ItemStack itemStack = MachineRecipes.getFurnaceProcessingResult(slots[0], slots[1]);
 			
 			if(slots[3] == null)
 			{

com/hbm/tileentity/machine/TileEntityMachinePress.java

@@ -233,7 +233,7 @@ public class TileEntityMachinePress extends TileEntity implements ISidedInventor
 				int speed = power * 25 / maxPower;
 				
 				if(slots[1] != null && slots[2] != null) {
-					ItemStack stack = MachineRecipes.getPressResult(slots[2].getItem(), slots[1].getItem());
+					ItemStack stack = MachineRecipes.getPressResult(slots[2].copy(), slots[1].copy());
 					if(stack != null &&
 							(slots[3] == null ||
 							(slots[3].getItem() == stack.getItem() &&

com/hbm/tileentity/machine/TileEntityMachineRadar.java

@@ -26,6 +26,8 @@ public class TileEntityMachineRadar extends TileEntity implements IConsumer {
 
 	public static List<EntityMissileBaseAdvanced> allMissiles = new ArrayList();
 	public List<int[]> nearbyMissiles = new ArrayList();
+	int pingTimer = 0;
+	final static int maxTimer = 40;
 
 	public long power = 0;
 	public static final int maxPower = 100000;
@@ -69,6 +71,13 @@ public class TileEntityMachineRadar extends TileEntity implements IConsumer {
 		
 		if(!worldObj.isRemote)
 			PacketDispatcher.wrapper.sendToAll(new AuxElectricityPacket(xCoord, yCoord, zCoord, power));
+		
+		pingTimer++;
+		
+		if(power > 0 && pingTimer >= maxTimer) {
+			this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "hbm:block.sonarPing", 5.0F, 1.0F);
+			pingTimer = 0;
+		}
 	}
 	
 	private void allocateMissiles() {