+ Add Gadolinium, Samarium, Ytterbium & Lanthanum if they do not exist.

+ Added new recipe for production of Fluorite.
% Some Alloys now use Phosphor instead of Phosphorus.
% Changed Ore Block unlocalized name.
$ Fixed ore itemblock not showing Chemical Formula.
$ Greatly improved radiation handler.
$ Fixed old fluorite ore not generating properly.

2 files changed, 33 insertions, 2 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 09b7dc3b21..3a4f4d5137 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -346,6 +346,27 @@ public final class ModItems {
 
 
 		try{
+			
+			/**
+			 * Try generate dusts for missing rare earth materials if they don't exist
+			 */
+
+			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGadolinium", 1) == null){
+		    	ItemUtils.generateSpecialUseDusts("Gadolinium", "Gadolinium", Utils.rgbtoHexValue(Materials.Gadolinium.mRGBa[0], Materials.Gadolinium.mRGBa[1], Materials.Gadolinium.mRGBa[2]));
+			}
+			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dystYtterbium", 1) == null){
+		    	ItemUtils.generateSpecialUseDusts("Ytterbium", "Ytterbium", Utils.rgbtoHexValue(Materials.Ytterbium.mRGBa[0], Materials.Ytterbium.mRGBa[1], Materials.Ytterbium.mRGBa[2]));
+			}
+			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustSamarium", 1) == null){
+		    	ItemUtils.generateSpecialUseDusts("Samarium", "Samarium", Utils.rgbtoHexValue(Materials.Samarium.mRGBa[0], Materials.Samarium.mRGBa[1], Materials.Samarium.mRGBa[2]));
+			}
+			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustLanthanum", 1) == null){
+		    	ItemUtils.generateSpecialUseDusts("Lanthanum", "Lanthanum", Utils.rgbtoHexValue(Materials.Lanthanum.mRGBa[0], Materials.Lanthanum.mRGBa[1], Materials.Lanthanum.mRGBa[2]));
+			}
+			/*if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGadolinium", 1) == null){
+		    	ItemUtils.generateSpecialUseDusts("Gadolinium", "Gadolinium", Utils.rgbtoHexValue(Materials.Gadolinium.mRGBa[0], Materials.Gadolinium.mRGBa[1], Materials.Gadolinium.mRGBa[2]));
+			}*/
+			
 
 			//Elements generate first so they can be used in compounds.
 			//Missing Elements
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java
index cb3455f0c5..8a72b4d629 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java
@@ -45,6 +45,10 @@ public class ItemBlockOre extends ItemBlock{
 
 	@Override
 	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+		if (this.mThisMaterial != null){
+			list.add(this.mThisMaterial.vChemicalFormula);			
+		}	
+
 		//Radioactive?
 		if (this.mThisRadiation > 0){
 			list.add(CORE.GT_Tooltip_Radioactive);
@@ -64,8 +68,14 @@ public class ItemBlockOre extends ItemBlock{
 
 	@Override
 	public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) {
-		if (this.mThisRadiation > 0){
-			EntityUtils.applyRadiationDamageToEntity(iStack.stackSize, this.mThisRadiation, world, entityHolding);
+		if (this.mThisMaterial != null){
+			if (this.mThisRadiation > 0){
+				if (entityHolding instanceof EntityPlayer){
+					if (!((EntityPlayer) entityHolding).capabilities.isCreativeMode){
+						EntityUtils.applyRadiationDamageToEntity(iStack.stackSize, this.mThisMaterial.vRadiationLevel, world, entityHolding);	
+					}
+				}
+			}
 		}
 	}