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

src/main/java/com/cricketcraft/chisel/Features.java

@@ -2645,6 +2645,16 @@ public enum Features {
 
 			voidstone2.carverHelper.registerAll(voidstone2, "voidstone2");
 			Carving.chisel.registerOre("voidstone2", "voidstone2");
+
+			BlockCarvable voidstoneRunic = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(5.0F).setResistance(10.0F);
+			voidstoneRunic.carverHelper.setChiselBlockName("Voidstone Runic");
+
+			for (int i = 1; i < 16; i++)
+				voidstoneRunic.carverHelper.addVariation("tile.voidstoneRunic." + i + ".desc", i, "voidstone/runes/rune" + sGNames[i].replaceAll(" ", ""));
+			voidstoneRunic.carverHelper.registerAll(voidstoneRunic, "voidstoneRunic");
+			voidstoneRunic.carverHelper.registerVariations("voidstone", voidstoneRunic);
+
+			Carving.chisel.registerOre("voidstoneRunic", "voidstoneRunic");
 		}
 
 		@Override

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

@@ -1,6 +1,8 @@
 package com.cricketcraft.chisel.block;
 
 import net.minecraft.block.material.Material;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.world.IBlockAccess;
 
 import com.cricketcraft.chisel.Chisel;
 import com.cricketcraft.chisel.api.ICarvable;
@@ -26,4 +28,8 @@ public class BlockCarvableAntiBlock extends BlockCarvableColor implements ICarva
 		return false;
 	}
 	*/
+	@Override
+	public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) {
+	    return false;
+	}
 }

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

@@ -31,7 +31,12 @@ public class BlockCarvablePillar extends BlockCarvable {
 	}
 
 	public IIcon getCtmIcon(int index, int metadata) {
-		CarvableVariation var = carverHelper.variations.get(metadata);
+		//Workaround to prevent crash with invalid meta
+		CarvableVariation var = null;
+		if(metadata <= carverHelper.variations.size())
+			var = carverHelper.variations.get(metadata);
+		else
+			var = carverHelper.variations.get(0);
 
 		if (index >= 4)
 			return var.iconTop;