% Changed the name & ability of the Alkalus Disk.

+ Made Hellish Fire burn the Dark World Unstable Earth.
+ Made the .gitignore exclude the screenshots folder.

3 files changed, 37 insertions, 8 deletions

diff --git a/src/Java/gtPlusPlus/core/block/general/HellFire.java b/src/Java/gtPlusPlus/core/block/general/HellFire.java
index 240da54e48..2adab5d5e7 100644
--- a/src/Java/gtPlusPlus/core/block/general/HellFire.java
+++ b/src/Java/gtPlusPlus/core/block/general/HellFire.java
@@ -66,6 +66,12 @@ public class HellFire extends BlockFire {
 				this.setFireInfo(b, spread * 4, flamm * 4);
 			}
 		}
+		
+		//Special Case madness
+		this.setFireInfo(Blocks.brown_mushroom_block, 20, 100);
+		this.setFireInfo(Blocks.red_mushroom_block, 20, 100);
+		this.setFireInfo(Blocks.grass, 20, 100);
+		this.setFireInfo(Blocks.mycelium, 20, 100);
 
 	}
 
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java b/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java
index 7891b0c772..dd5e51b5ff 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java
@@ -56,6 +56,7 @@ public class Dimension_DarkWorld {
 		Item.itemRegistry.addObject(423, "dimensionDarkWorld_trigger", portalItem);
 		blockTopLayer = new blockDarkWorldGround();
 		GameRegistry.registerBlock(blockTopLayer, "blockDarkWorldGround");
+		Blocks.fire.setFireInfo(blockTopLayer, 30, 20);
 		blockPortalFrame = new blockDarkWorldPortalFrame();
 		GameRegistry.registerBlock(blockPortalFrame, "blockDarkWorldPortalFrame");
 	}
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/item/itemDarkWorldPortalTrigger.java b/src/Java/gtPlusPlus/core/world/darkworld/item/itemDarkWorldPortalTrigger.java
index 658f968fad..133bbb7663 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/item/itemDarkWorldPortalTrigger.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/item/itemDarkWorldPortalTrigger.java
@@ -2,6 +2,7 @@ package gtPlusPlus.core.world.darkworld.item;
 
 import java.util.List;
 
+import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
@@ -9,8 +10,7 @@ import net.minecraft.block.Block;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
+import net.minecraft.item.*;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 
@@ -22,16 +22,31 @@ public class itemDarkWorldPortalTrigger extends Item {
 		setCreativeTab(CreativeTabs.tabTools);
 		this.setTextureName(CORE.MODID + ":" + "itemAlkalusDisk");
 	}
-	
+
+	@Override
+	public Item setMaxStackSize(int int1) {
+		return super.setMaxStackSize(1);
+	}
+
+	@Override
+	public EnumRarity getRarity(ItemStack thisItem) {
+		return EnumRarity.epic;
+	}
+
+	@Override
+	public boolean hasEffect(ItemStack par1ItemStack, int pass) {
+		return true;
+	}
+
 	@Override
 	public String getItemStackDisplayName(final ItemStack p_77653_1_) {
-		return "Alkalus Disk [Activated]";
+		return EnumChatFormatting.GOLD+"Alkalus Disk ["+EnumChatFormatting.RED+"Activated"+EnumChatFormatting.GOLD+"]";
 	}
-	
+
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
 	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-		list.add(EnumChatFormatting.GRAY+"A key for entering the Dark World.");
+		list.add(EnumChatFormatting.GREEN+"A key for entering the Dark World.");
 		super.addInformation(stack, aPlayer, list, bool);
 	}
 
@@ -39,7 +54,7 @@ public class itemDarkWorldPortalTrigger extends Item {
 	public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) {
 		return Utils.rgbtoHexValue(255, 128, 0);
 	}
-	
+
 	@Override
 	public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7,
 			float par8, float par9, float par10) {
@@ -67,7 +82,14 @@ public class itemDarkWorldPortalTrigger extends Item {
 		Block i1 = par3World.getBlock(par4, par5, par6);
 		if (i1 == Blocks.air) {
 			par3World.playSoundEffect(par4 + 0.5D, par5 + 0.5D, par6 + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F);
-			Dimension_DarkWorld.portalBlock.tryToCreatePortal(par3World, par4, par5, par6);
+			if (Dimension_DarkWorld.portalBlock.tryToCreatePortal(par3World, par4, par5, par6)){
+				//Make a Portal
+			}
+			else {
+				if (!par3World.isRemote){
+					par3World.setBlock(par4, par5, par6, ModBlocks.blockHellfire, 0, 3);
+				}
+			}
 		}
 		par1ItemStack.damageItem(1, par2EntityPlayer);
 		return true;