Merge branch 'dev' of https://github.com/TheCricket/Chisel-2 into dev

src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIcePillar.java

@@ -8,14 +8,4 @@ public class BlockCarvablePackedIcePillar extends BlockCarvablePillar {
 		super(m);
 		this.slipperiness = 0.98F;
 	}
-	
-	@Override
-	public boolean isOpaqueCube() {
-		return false;
-	}
-	
-	@Override
-	public int getRenderBlockPass() {
-		return 1;
-	}
 }

src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java

@@ -1,6 +1,8 @@
 package com.cricketcraft.chisel.init;
 
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
@@ -47,11 +49,21 @@ public class ChiselTabs {
 
 	public static void postInit() {
 
+		if(Features.CHISEL.enabled())
 		tabChisel.setTabIconItemStack(new ItemStack(ChiselItems.chisel));
+		else tabChisel.setTabIconItemStack(new ItemStack(Items.stick));
+		if(Features.HOLYSTONE.enabled())
 		tabStoneChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.holystone));
+		else tabStoneChiselBlocks.setTabIconItemStack(new ItemStack(Blocks.stonebrick));
+		if(Features.WOOD.enabled())
 		tabWoodChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.planks[0], 1, 1));
+		else tabWoodChiselBlocks.setTabIconItemStack(new ItemStack(Blocks.planks));
+		if(Features.TECHNICAL.enabled())
 		tabMetalChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.technical));
+		else tabMetalChiselBlocks.setTabIconItemStack(new ItemStack(Blocks.iron_block));
+		if(Features.JACKOLANTERN.enabled())
 		tabOtherChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.jackolantern[0]));
+		else tabOtherChiselBlocks.setTabIconItemStack(new ItemStack(Blocks.lit_pumpkin));
 
 		if (atLeastOneModIsLoaded) {
 			if (Features.ARCANE.enabled()) {
@@ -59,7 +71,9 @@ public class ChiselTabs {
 			} else if (Features.BLOOD_RUNE.enabled()) {
 				tabModdedChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.bloodRune));
 			} else {
+				if(ChiselBlocks.voidstone != null)
 				tabModdedChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.voidstone));
+				else tabModdedChiselBlocks.setTabIconItemStack(new ItemStack(Blocks.obsidian));
 			}
 		}
 	}