+ Added recipe to craft the Activated Alkalus Disk.

+ Added recipe to craft Mystic Frame portal blocks.
% Tweaked Toxic Everglades Portal.
% Tweaked sludge textures.
$ Stopped Mining Explosive using CSPRNG.

7 files changed, 76 insertions, 25 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 536fa47cd7..3f1b0b16ba 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -63,9 +63,25 @@ public class RECIPES_GREGTECH {
 		advancedMixerRecipes();
 		sifterRecipes();
 		electroMagneticSeperatorRecipes();
+		extruderRecipes();
 		addFuels();
 	}
 
+	private static void extruderRecipes() {
+		//Osmium Credits
+		if (GT_Values.RA.addExtruderRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("blockOsmium", 4),
+				ItemList.Shape_Mold_Credit.get(0),
+				ItemList.Credit_Greg_Osmium.get(0),
+				(int) Math.max(Materials.Osmium.getMass() * 2L * 1, 1),
+				4 * Materials.Osmium.mDensityMultiplier)){
+			Logger.WARNING("Extruder Recipe: Osmium Credit - Success");
+		}
+		else {
+			Logger.WARNING("Extruder Recipe: Osmium Credit - Failed");
+		}
+	}
+
 	private static void blastSmelterRecipes() {
 
 		//Black Bronze
@@ -1166,7 +1182,7 @@ public class RECIPES_GREGTECH {
 	}
 
 	private static void electroMagneticSeperatorRecipes(){
-		//Bauxite
+		//Zirconium
 		GT_Values.RA.addElectromagneticSeparatorRecipe(
 				ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedBauxite", 1),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustBauxite", 1),
@@ -1174,17 +1190,15 @@ public class RECIPES_GREGTECH {
 				ItemUtils.getItemStackOfAmountFromOreDict("nuggetZirconium", 1),
 				new int[]{10000, 2500, 4000},
 				20*20,
-				24);
+				24);		
 
-		
-		
 		//Trinium
 		GT_Values.RA.addElectromagneticSeparatorRecipe(
 				ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedNaquadah", 1),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustNaquadah", 1),
-				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallEnrichedNaquadah", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallNaquadahEnriched", 1),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1),
-				new int[]{10000, 2500, 4000},
+				new int[]{10000, 2500, 5000},
 				20*20,
 				24);
 
@@ -1194,7 +1208,17 @@ public class RECIPES_GREGTECH {
 				ItemUtils.getItemStackOfAmountFromOreDict("dustIridium", 1),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallOsmium", 1),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1),
-				new int[]{10000, 2500, 4000},
+				new int[]{10000, 2500, 5000},
+				20*20,
+				24);
+
+		//Trinium
+		GT_Values.RA.addElectromagneticSeparatorRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedWulfenite", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustWulfenite", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1),
+				new int[]{10000, 3000, 3000},
 				20*20,
 				24);
 	}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index 6bbe28dd6e..4112be2687 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -14,6 +14,7 @@ import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.recipe.RecipeUtils;
+import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
 import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -103,8 +104,6 @@ public class RECIPES_General {
 			Logger.INFO("Added a recipe for Rainforest oak Saplings.");
 		}
 
-
-
 		//Iron bars
 		final ItemStack ironBars;
 		if (CORE.GTNH) {
@@ -132,6 +131,21 @@ public class RECIPES_General {
 		}
 
 
+		//Set Shards
+		ItemStack shardAer = ItemUtils.getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Air Shard", 0, 1);
+		ItemStack shardIgnis = ItemUtils.getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Fire Shard", 1, 1);
+		ItemStack shardAqua = ItemUtils.getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Warer Shard", 2, 1);
+		ItemStack shardTerra = ItemUtils.getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Earth Shard", 3, 1);
+		
+		//Mystic Frame
+		if (RecipeUtils.recipeBuilder(
+				shardAer, shardIgnis, shardAqua,
+				shardTerra, "gemRuby", shardTerra,
+				shardAqua, shardIgnis, shardAer,
+				ItemUtils.getSimpleStack(Dimension_DarkWorld.blockPortalFrame))){
+			Logger.INFO("Added a recipe for the Toxic Everglades Portal frame");
+		}
+		
 		//Alkalus Coin
 		if (RecipeUtils.recipeBuilder(
 				"gemExquisiteRuby", "gemFlawlessDiamond", "gemExquisiteDiamond",
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
index 889af1753d..e76e517808 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
@@ -5,8 +5,10 @@ import gregtech.api.interfaces.IOreRecipeRegistrator;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraft.item.ItemStack;
 
@@ -120,6 +122,11 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator {
 
 
 		}
+		
+	 else if (aOreDictName.equals(OreDictNames.craftingLensOrange.toString())) {
+		 GT_Values.RA.addLaserEngraverRecipe(ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemUtils.getSimpleStack(Dimension_DarkWorld.portalItem), 360*60*20, 4096);
+	 }
+	 
 
 
 	}
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java
index 7e84bf1a8c..e89838e182 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java
@@ -5,6 +5,7 @@ import java.util.Random;
 import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
 import gtPlusPlus.core.world.darkworld.world.TeleporterDimensionMod;
@@ -17,6 +18,7 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
@@ -31,7 +33,7 @@ public class blockDarkWorldPortal extends BlockBreakable {
 		this.setLightLevel(0.75F);
 		this.setCreativeTab(CreativeTabs.tabBlock);
 		this.setBlockName("blockDarkWorldPortal");
-		LanguageRegistry.addName(this, "Portal to the Dark World");
+		LanguageRegistry.addName(this, "A Glimpse of the Toxic Everglades");
 		
 	}
 
@@ -302,27 +304,27 @@ public class blockDarkWorldPortal extends BlockBreakable {
 	 * A randomly called display update to be able to add particles or other items for display
 	 */
 	public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) {
-		if (par5Random.nextInt(100) == 0) {
+		if (CORE.RANDOM.nextInt(100) == 0) {
 			par1World.playSound(par2 + 0.5D, par3 + 0.5D, par4 + 0.5D, "portal.portal", 0.5F,
-					par5Random.nextFloat() * 0.4F + 0.8F, false);
+					CORE.RANDOM.nextFloat() * 0.4F + 0.8F, false);
 		}
 		for (int l = 0; l < 4; ++l) {
-			double d0 = par2 + par5Random.nextFloat();
-			double d1 = par3 + par5Random.nextFloat();
-			double d2 = par4 + par5Random.nextFloat();
+			double d0 = par2 + CORE.RANDOM.nextFloat();
+			double d1 = par3 + CORE.RANDOM.nextFloat();
+			double d2 = par4 + CORE.RANDOM.nextFloat();
 			double d3 = 0.0D;
 			double d4 = 0.0D;
 			double d5 = 0.0D;
-			int i1 = par5Random.nextInt(2) * 2 - 1;
-			d3 = (par5Random.nextFloat() - 0.5D) * 0.5D;
-			d4 = (par5Random.nextFloat() - 0.5D) * 0.5D;
-			d5 = (par5Random.nextFloat() - 0.5D) * 0.5D;
+			int i1 = CORE.RANDOM.nextInt(2) * 2 - 1;
+			d3 = (CORE.RANDOM.nextFloat() - 0.5D) * 0.5D;
+			d4 = (CORE.RANDOM.nextFloat() - 0.5D) * 0.5D;
+			d5 = (CORE.RANDOM.nextFloat() - 0.5D) * 0.5D;
 			if (par1World.getBlock(par2 - 1, par3, par4) != this && par1World.getBlock(par2 + 1, par3, par4) != this) {
 				d0 = par2 + 0.5D + 0.25D * i1;
-				d3 = par5Random.nextFloat() * 2.0F * i1;
+				d3 = CORE.RANDOM.nextFloat() * 2.0F * i1;
 			} else {
 				d2 = par4 + 0.5D + 0.25D * i1;
-				d5 = par5Random.nextFloat() * 2.0F * i1;
+				d5 = CORE.RANDOM.nextFloat() * 2.0F * i1;
 			}
 			par1World.spawnParticle("reddust", d0+0.1D, d1, d2, d3, d4, d5);
 			par1World.spawnParticle("smoke", d0, d1+0.1D, d2, 0, 0, 0);
@@ -348,12 +350,17 @@ public class blockDarkWorldPortal extends BlockBreakable {
 	
 	@Override
 	public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3, final int par4){
-		return Utils.rgbtoHexValue(255, 255, 0);
+		return Utils.rgbtoHexValue(0, 255, 0);
 	}
 
 	@Override
 	public int getRenderColor(final int aMeta) {
-		return Utils.rgbtoHexValue(255, 255, 0);
+		return Utils.rgbtoHexValue(0, 255, 0);
+	}
+
+	@Override
+	public String getLocalizedName() {
+		return EnumChatFormatting.OBFUSCATED+super.getLocalizedName();
 	}
 }
 
diff --git a/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java b/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java
index 1daa69bc5a..50fa08f55f 100644
--- a/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java
+++ b/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java
@@ -2,7 +2,6 @@ package gtPlusPlus.core.world.explosions;
 
 import java.util.*;
 
-import gtPlusPlus.api.objects.CSPRNG_DO_NOT_USE;
 import gtPlusPlus.api.objects.XSTR;
 import gtPlusPlus.core.entity.EntityPrimedMiningExplosive;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -22,7 +21,7 @@ public class MiningExplosion extends Explosion {
 	/** whether or not this explosion spawns smoke particles */
 	public boolean isSmoking = true;
 	private final int field_77289_h = 16;
-	private final Random explosionRNG = CSPRNG_DO_NOT_USE.generate(new XSTR());
+	private final Random explosionRNG = new XSTR();
 	private final World worldObj;
 	public double explosionX;
 	public double explosionY;
diff --git a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Flow.png b/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Flow.png
index 620646075d..8d360e7b82 100644
--- a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Flow.png
+++ b/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Flow.png
diff --git a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Still.png b/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Still.png
index b0c6449d4e..8587a08a7c 100644
--- a/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Still.png
+++ b/src/resources/assets/miscutils/textures/blocks/fluid/Fluid_Sludge_Still.png