+ Enabled generation of most missing elements, in some form or another.

% Further defined the generation method for radioactive materials, making plates a boolean switch.
- Removed the booze segment of Growthcraft for the moment.

5 files changed, 34 insertions, 7 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index adb3c12421..043a6d61a1 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -254,10 +254,35 @@ public final class ModItems {
 		try{
 
 			//Elements generate first so they can be used in compounds.
-			
-			//Zirconium - Because Greg himself never added it.
+			//Missing Elements
+			MaterialGenerator.generate(ELEMENT.getInstance().SELENIUM);
+			MaterialGenerator.generate(ELEMENT.getInstance().BROMINE);
 			MaterialGenerator.generate(ELEMENT.getInstance().ZIRCONIUM);
+			MaterialGenerator.generate(ELEMENT.getInstance().RUTHENIUM);
+			MaterialGenerator.generate(ELEMENT.getInstance().IODINE);
+			MaterialGenerator.generate(ELEMENT.getInstance().HAFNIUM);
+			MaterialGenerator.generate(ELEMENT.getInstance().DYSPROSIUM);
+			MaterialGenerator.generate(ELEMENT.getInstance().TELLURIUM);
+			MaterialGenerator.generate(ELEMENT.getInstance().RHODIUM);
+			MaterialGenerator.generate(ELEMENT.getInstance().RHENIUM);
+			MaterialGenerator.generate(ELEMENT.getInstance().THALLIUM);
 			
+			//RADIOACTIVE ELEMENTS
+			MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().TECHNETIUM, false);
+			MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().POLONIUM, false);
+			MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().ASTATINE, false);
+			MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().RADON, false);
+			MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().FRANCIUM, false);
+			MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().RADIUM, false);
+			MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PROMETHIUM, false);
+			MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().ACTINIUM, false);
+			MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PROTACTINIUM, false);
+			MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().NEPTUNIUM, false);
+			MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().CURIUM, false);
+			MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().BERKELIUM, false);
+			MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().CALIFORNIUM, false);
+			MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().EINSTEINIUM, false);
+			MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().FERMIUM, false);
 			
 			
 			
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 223fd2fa29..66c881763a 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -27,7 +27,7 @@ public class CORE {
 
 	public static final String name = "GT++";	
 	public static final String MODID = "miscutils";
-	public static final String VERSION = "1.4.9.22-alpha";
+	public static final String VERSION = "1.4.9.35-alpha";
 	public static final String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase();
 	public static boolean isModUpToDate = Utils.isModUpToDate();
 	public static boolean DEBUG = false;	
diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
index 84c46a36e8..eab0a301d8 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -108,8 +108,11 @@ public class MaterialGenerator {
 		RecipeGen_ShapedCrafting.generateRecipes(matInfo);
 
 	}
-
 	public static void generateNuclearMaterial(final Material matInfo){	
+		generateNuclearMaterial(matInfo, true);
+	}
+	
+	public static void generateNuclearMaterial(final Material matInfo, boolean generatePlates){	
 		String unlocalizedName = matInfo.getUnlocalizedName();
 		String materialName = matInfo.getLocalizedName();
 		short[] C = matInfo.getRGBA();
diff --git a/src/Java/gtPlusPlus/xmod/growthcraft/HANDLER_GC.java b/src/Java/gtPlusPlus/xmod/growthcraft/HANDLER_GC.java
index 2428f0a943..7ad28677a9 100644
--- a/src/Java/gtPlusPlus/xmod/growthcraft/HANDLER_GC.java
+++ b/src/Java/gtPlusPlus/xmod/growthcraft/HANDLER_GC.java
@@ -1,7 +1,6 @@
 package gtPlusPlus.xmod.growthcraft;
 
 import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.xmod.growthcraft.booze.Register_Booze;
 import gtPlusPlus.xmod.growthcraft.fishtrap.FishTrapHandler;
 
 public class HANDLER_GC {
@@ -10,7 +9,7 @@ public class HANDLER_GC {
 	//Run me during Pre-Init
 	public static void preInit(){
 		if (LoadedMods.Growthcraft){
-			Register_Booze.preInit();			
+			//Register_Booze.preInit();			
 		}
 	}
 
diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info
index 00ad9a741c..a8133a81c6 100644
--- a/src/resources/mcmod.info
+++ b/src/resources/mcmod.info
@@ -5,7 +5,7 @@
   "description": "Adds a few various Multiblocks, Machines, etc to Gregtech and a plethora of other mods (Nearly 30!)",
   "credits": "",
   "logoFile": "",
-  "version": "1.4.9.22-alpha",
+  "version": "1.4.9.35-alpha",
   "mcversion": "1.7.10",
   "url": "https://github.com/draknyte1/GTplusplus/wiki",
   "updateUrl": "https://github.com/draknyte1/GTplusplus/releases/latest",