+ Added Rope & Net block.

+ Added English localization for the Staballoy Construct.
% Made the Xp Converter give of light as it cycles colours.
% Formatting.

8 files changed, 86 insertions, 7 deletions

diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java
index 770494c9f0..81d3a84dc9 100644
--- a/src/Java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java
@@ -4,6 +4,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
 import gtPlusPlus.core.block.base.BlockBaseOre;
 import gtPlusPlus.core.block.general.BlockCompressedObsidian;
+import gtPlusPlus.core.block.general.BlockNet;
 import gtPlusPlus.core.block.general.BlockTankXpConverter;
 import gtPlusPlus.core.block.general.FirePit;
 import gtPlusPlus.core.block.general.FluidTankInfinite;
@@ -62,6 +63,7 @@ public final class ModBlocks {
 	public static Block blockWitherGuard;
 	public static Block blockXpConverter;
 	public static Block blockCompressedObsidian;
+	public static Block blockNet;
 
 	public static void init() {
 		Utils.LOG_INFO("Initializing Blocks.");
@@ -94,6 +96,7 @@ public final class ModBlocks {
 		blockWitherGuard = new BlockWitherProof();
 		blockXpConverter = new BlockTankXpConverter();
 		blockCompressedObsidian = new BlockCompressedObsidian();
+		blockNet = new BlockNet();
 
 	}
 
diff --git a/src/Java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java b/src/Java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java
index 48ee7709ec..853abe3edf 100644
--- a/src/Java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java
+++ b/src/Java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java
@@ -26,6 +26,9 @@ public class BlockCompressedObsidian extends BlockObsidian {
 
 	public BlockCompressedObsidian() {
 		this.setBlockName("blockCompressedObsidian");
+		this.setHardness(50.0F);
+		this.setResistance(2000.0F);
+		this.setStepSound(soundTypePiston);
 		this.setCreativeTab(AddToCreativeTab.tabMachines);
 		GameRegistry.registerBlock(this, ItemBlockMeta.class, "blockCompressedObsidian");
 	}
diff --git a/src/Java/gtPlusPlus/core/block/general/BlockNet.java b/src/Java/gtPlusPlus/core/block/general/BlockNet.java
new file mode 100644
index 0000000000..26871662b2
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/general/BlockNet.java
@@ -0,0 +1,35 @@
+package gtPlusPlus.core.block.general;
+import java.util.Random;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.lib.CORE;
+import net.minecraft.block.BlockWeb;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.Item;
+
+public class BlockNet extends BlockWeb{
+
+	public BlockNet(){
+		this.setCreativeTab(AddToCreativeTab.tabBlock);
+		this.setLightOpacity(1);
+		this.setHardness(4.0F);
+		this.setBlockName("blockNet");
+		GameRegistry.registerBlock(this, "blockNet");
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(final IIconRegister iIcon){
+		this.blockIcon = iIcon.registerIcon(CORE.MODID + ":" + "net");
+	}
+
+	@Override
+	public Item getItemDropped(final int p_149650_1_, final Random p_149650_2_, final int p_149650_3_){
+		return ModItems.itemRope;
+	}
+
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java b/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
index 7e1ab75b84..ea55a9177d 100644
--- a/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
+++ b/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
@@ -119,11 +119,11 @@ public class BlockTankXpConverter extends BlockContainer {
 				if (tank != null) {
 					if (tank.tankEssence.getFluid() != null) {
 						PlayerUtils.messagePlayer(player, "This tank contains " + tank.tankEssence.getFluidAmount()
-								+ "L of " + tank.tankEssence.getFluid().getLocalizedName());
+						+ "L of " + tank.tankEssence.getFluid().getLocalizedName());
 					}
 					if (tank.tankLiquidXp.getFluid() != null) {
 						PlayerUtils.messagePlayer(player, "This tank contains " + tank.tankLiquidXp.getFluidAmount()
-								+ "L of " + tank.tankLiquidXp.getFluid().getLocalizedName());
+						+ "L of " + tank.tankLiquidXp.getFluid().getLocalizedName());
 					}
 					if ((tank.tankEssence.getFluid() != null) && (tank.tankLiquidXp.getFluid() != null)) {
 						PlayerUtils.messagePlayer(player, "This is worth "
@@ -209,7 +209,7 @@ public class BlockTankXpConverter extends BlockContainer {
 		if ((this.mRainbowTick < 0) || (this.mRainbowTick > this.mRainbowTickMax)) {
 			this.mRainbowTick = 0;
 		}
-		// Utils.LOG_INFO("x: "+this.mRainbowTick);
+		//Utils.LOG_INFO("x: "+this.mRainbowTick);
 		if (this.mRainbowTick <= this.mRainbowTickMax) {
 			Triplet<Integer, Integer, Integer> mT = this.mRainbowMap.get(this.mRainbowTick);
 			try {
@@ -246,4 +246,38 @@ public class BlockTankXpConverter extends BlockContainer {
 		return 20;
 	}
 
+	@Override
+	public int getLightValue() {
+		final int mTicker = this.mRainbowTick;
+		if ((mTicker == 0) || (mTicker == 17)){
+			return 1;
+		}
+		else if ((mTicker == 1) || (mTicker == 16)){
+			return 2;
+		}
+		else if ((mTicker == 2) || (mTicker == 15)){
+			return 3;
+		}
+		else if ((mTicker == 3) || (mTicker == 14)){
+			return 4;
+		}
+		else if ((mTicker == 4) || (mTicker == 13)){
+			return 6;
+		}
+		else if ((mTicker == 5) || (mTicker == 12)){
+			return 8;
+		}
+		else if ((mTicker == 6) || (mTicker == 11)){
+			return 10;
+		}
+		else if ((mTicker == 7) || (mTicker == 10)){
+			return 12;
+		}
+		else if ((mTicker == 8) || (mTicker == 9)){
+			return 14;
+		}
+		return 0;
+
+	}
+
 }
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index bd43da11fa..103639074f 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -268,6 +268,8 @@ public final class ModItems {
 
 	public static Item itemGrindleTablet;
 
+	public static Item itemRope;
+
 	public static final void init(){
 
 		//Default item used when recipes fail, handy for debugging.
@@ -290,20 +292,19 @@ public final class ModItems {
 		GT_OreDictUnificator.registerOre("ingotRubber", ItemUtils.getItemStack(CORE.MODID+":itemStickyRubber", 1));
 
 
-
-
-		//Register Hydrogen Blobs first, so we can replace old helium blobs.
 		itemCoalCoke = new BaseItemBurnable("itemCoalCoke", "Coking Coal", tabMisc, 64, 0, "Used for metallurgy.", "fuelCoke", 3200, 0).setTextureName(CORE.MODID + ":itemCoalCoke");
 
 		//Register Hydrogen Blobs first, so we can replace old helium blobs.
 		itemHydrogenBlob = new CoreItem("itemHydrogenBlob", "Mysterious Hydrogen Blob", tabMisc).setTextureName(CORE.MODID + ":itemHeliumBlob");
-		//GT_OreDictUnificator.registerOre("dustHydrogen", new ItemStack(ModItems.itemHydrogenBlob));
 		//Register Old Helium Blob, this will be replaced when held by a player.
 		itemHeliumBlob = new CoreItem("itemHeliumBlob", tabMisc, ItemUtils.getSimpleStack(itemHydrogenBlob)).setTextureName(CORE.MODID + ":itemHydrogenBlob");
 
 		//Register this neato device, for making some fires.
 		itemBasicFireMaker = new ItemBasicFirestarter();
 
+		//Register Rope
+		itemRope = new CoreItem("itemRope", "Rope", tabMisc);
+
 		//Make some backpacks
 		//Primary colours
 		backpack_Red = new BaseItemBackpack("backpackRed", Utils.rgbtoHexValue(200, 0, 0));
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index d81815e0d3..c10f904056 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -23,6 +23,9 @@ item.itemFuelRod_Thorium.name=Thorium Fuel Rod
 item.itemFuelRod_Uranium.name=Uranium Fuel Rod
 item.itemFuelRod_Plutonium.name=Plutonium Fuel Rod
 
+//Entities
+entity.miscutils.constructStaballoy.name=Staballoy Construct
+
 //Tile Entities
 tile.blockToolBuilder.name=GregTech Tool Constructor
 
diff --git a/src/resources/assets/miscutils/textures/blocks/net.png b/src/resources/assets/miscutils/textures/blocks/net.png
new file mode 100644
index 0000000000..e885ed12db
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/net.png
diff --git a/src/resources/assets/miscutils/textures/items/itemRope.png b/src/resources/assets/miscutils/textures/items/itemRope.png
new file mode 100644
index 0000000000..061938234d
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/itemRope.png