+ Added temp recipes for the Cyclotron and it's casings.

+ Added a config option for the Cyclotron.
- Reduced output chance and quantity of AM241 pellets.
$ Fixed localization for all sizes of dusts.

7 files changed, 57 insertions, 16 deletions

diff --git a/src/Java/gtPlusPlus/core/config/ConfigHandler.java b/src/Java/gtPlusPlus/core/config/ConfigHandler.java
index e41698844f..200e5a6bf4 100644
--- a/src/Java/gtPlusPlus/core/config/ConfigHandler.java
+++ b/src/Java/gtPlusPlus/core/config/ConfigHandler.java
@@ -151,6 +151,8 @@ public class ConfigHandler {
 				"gregtech", true, "Very fast and efficient Extruding Machine.");		
 		enableMultiblock_IndustrialMultiMachine = config.getBoolean("enableMultiblock_IndustrialMultiMachine",
 				"gregtech", true, "Can run recipes for 9 different types of machines.");
+		enableMultiblock_Cyclotron = config.getBoolean("enableMultiblock_Cyclotron",
+				"gregtech", true, "COMET - Scientific Cyclotron."); 
 	
 		// Options
 		rfPerEU = config.getInt("rfUsedPerEUForUniversalBatteries", "configurables", 4, 1, 1000,
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 1205d8ac43..788dfde18d 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -34,9 +34,7 @@ import gtPlusPlus.core.item.effects.RarityUncommon;
 import gtPlusPlus.core.item.general.*;
 import gtPlusPlus.core.item.general.books.ItemBaseBook;
 import gtPlusPlus.core.item.general.capture.ItemEntityCatcher;
-import gtPlusPlus.core.item.general.chassis.ItemBoilerChassis;
-import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoil;
-import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoilWire;
+import gtPlusPlus.core.item.general.chassis.*;
 import gtPlusPlus.core.item.general.throwables.ItemHydrofluoricAcidPotion;
 import gtPlusPlus.core.item.general.throwables.ItemSulfuricAcidPotion;
 import gtPlusPlus.core.item.init.ItemsFoods;
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
index 0b6193253a..59d97c306d 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
@@ -100,7 +100,15 @@ public class BaseItemDust extends Item{
 	@Override
 	public String getItemStackDisplayName(final ItemStack iStack) {
 
-		if (this.getUnlocalizedName().contains("DustTiny")){
+		String unlocal = super.getItemStackDisplayName(iStack);
+		if (!unlocal.toLowerCase().contains(".name")) {
+			return unlocal;
+		}
+		else {
+			return unlocal;
+		}
+		
+		/*if (this.getUnlocalizedName().contains("DustTiny")){
 			this.name = "Tiny Pile of "+this.materialName + " Dust";
 		}
 		else if (this.getUnlocalizedName().contains("DustSmall")){
@@ -109,7 +117,7 @@ public class BaseItemDust extends Item{
 		else {
 			this.name = this.materialName + " Dust";
 		}
-		return this.name;
+		return this.name;*/
 	}
 
 	protected final int sRadiation;
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java b/src/Java/gtPlusPlus/core/item/general/chassis/ItemHalfCompleteCasings.java
index 86073c9e11..0501f616c9 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java
+++ b/src/Java/gtPlusPlus/core/item/general/chassis/ItemHalfCompleteCasings.java
@@ -1,4 +1,4 @@
-package gtPlusPlus.core.item.general;
+package gtPlusPlus.core.item.general.chassis;
 
 import java.util.List;
 
@@ -30,25 +30,24 @@ public class ItemHalfCompleteCasings extends BaseItemColourable{
 		}
 	}
 	
-	/*@Override
+	@Override
 	public String getItemStackDisplayName(final ItemStack tItem) {
-		String prefix = "Half Complete Casing ";
+		String prefix = super.getItemStackDisplayName(tItem);
 		String casingType = "";
 		if (tItem.getItemDamage() == 0){
-			casingType = "I";
+			casingType = " I";
 		}
 		else if (tItem.getItemDamage() == 1){
-			casingType = "II";
+			casingType = " II";
 		}
 		else if (tItem.getItemDamage() == 2){
-			casingType = "III";
+			casingType = " III";
 		}
 		else if (tItem.getItemDamage() == 3){
-			casingType = "IV";
+			casingType = " IV";
 		}
-		return (prefix+casingType);
-		
-	}*/
+		return (prefix+casingType);		
+	}
 
 	@Override
 	public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) {
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index d5d1e467a7..fe291d1c68 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -215,6 +215,7 @@ public class CORE {
 		public static boolean enableMultiblock_IndustrialFishingPort = true;
 		public static boolean enableMultiblock_IndustrialExtrudingMachine = true;
 		public static boolean enableMultiblock_IndustrialMultiMachine = true;
+		public static boolean enableMultiblock_Cyclotron = true;
 
 		//Visuals
 		public static boolean enableTreeFarmerParticles = true;
@@ -226,6 +227,7 @@ public class CORE {
 
 
 
+
 	}
 
 	public static class Everglades{
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 814925a5ce..201235cc55 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -1245,7 +1245,7 @@ public class RECIPES_GREGTECH {
 
 		//Americium
 		CORE.RA.addCyclotronRecipe(CI.getNumberedCircuit(0), FluidUtils.getFluidStack("molten.americium", 1),
-				new ItemStack[] { GregtechItemList.Pellet_RTG_AM241.get(8) }, null, new int[] { 7500 }, 20 * 300, 1020,
+				new ItemStack[] { GregtechItemList.Pellet_RTG_AM241.get(4) }, null, new int[] { 2500 }, 20 * 300, 1020,
 				500 * 20); //PO Special Value
 		
 		//Strontium u235
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index e600ac81a1..64df3ca43f 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -84,6 +84,11 @@ public class RECIPES_Machines {
 	public static ItemStack RECIPE_LFTRController;
 	public static ItemStack RECIPE_LFTROuterCasing;
 	public static ItemStack RECIPE_LFTRInnerCasing;
+	
+	//Cyclotron
+	public static ItemStack RECIPE_CyclotronController;
+	public static ItemStack RECIPE_CyclotronOuterCasing;
+	public static ItemStack RECIPE_CyclotronInnerCoil;
 
 
 	//Buffer Cores
@@ -1023,6 +1028,33 @@ public class RECIPES_Machines {
 
 
 			}
+			
+
+			//Cyclotron			
+			if (CORE.ConfigSwitches.enableMultiblock_Cyclotron){
+				RECIPE_CyclotronController = GregtechItemList.COMET_Cyclotron.get(1);
+				RECIPE_CyclotronOuterCasing = GregtechItemList.Casing_Cyclotron_External.get(Casing_Amount);
+				RECIPE_CyclotronInnerCoil = GregtechItemList.Casing_Cyclotron_Coil.get(1);
+
+				RecipeUtils.recipeBuilder(
+						"plateIncoloyMA956", "plateIncoloyMA956", "plateIncoloyMA956",
+						"plateIncoloyMA956", "frameGtIncoloy020", "plateIncoloyMA956",
+						"plateIncoloyMA956", "plateIncoloyMA956", "plateIncoloyMA956",
+						RECIPE_CyclotronOuterCasing);
+				
+				RecipeUtils.recipeBuilder(
+						"plateIncoloy020", "plateIncoloy020", "plateIncoloy020",
+						"plateIncoloy020", "frameGtIncoloyMA956", "plateIncoloy020",
+						"plateIncoloy020", "plateIncoloy020", "plateIncoloy020",
+						RECIPE_CyclotronInnerCoil);
+
+				
+				RecipeUtils.recipeBuilder(
+						"plateIncoloy020", CI.getTieredCircuit(6), "plateIncoloy020",
+						RECIPE_CyclotronInnerCoil, CI.machineHull_IV, RECIPE_CyclotronInnerCoil,
+						"plateIncoloy020", "gearIncoloyMA956", "plateIncoloy020",
+						RECIPE_CyclotronController);
+			}
 
 			if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation){
 				RecipeUtils.recipeBuilder(