merged in changes from OCD blocks

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

@@ -119,6 +119,7 @@ public class Chisel
         modsSupported.add("Twilight Forest");
         modsSupported.add("appliedenergistics2");
         modsSupported.add("Railcraft");
+        modsSupported.add("AWWayOfTime");
 
         File configFile = event.getSuggestedConfigurationFile();
         Configurations.configExists = configFile.exists();

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

@@ -92,8 +92,10 @@ public class Crafting {
 
         if (Configurations.chiselRecipe) {
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.chisel, 1), new Object[]{" YY", " YY", "X  ", 'X', Items.stick, 'Y', Items.iron_ingot}));
+            GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.diamondChisel, 1), new Object[]{" YY", " YY", "x  ", 'x', "stickWood", 'Y', "ingotIron"}));
         } else {
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.chisel, 1), new Object[]{" Y", "X ", 'X', Items.stick, 'Y', Items.iron_ingot}));
+            GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.diamondChisel, 1), new Object[]{"  y", "x  ", 'x', "stickWood", 'y', "ingotIron"}));
         }
 
         if (Configurations.featureEnabled("ballOfMoss"))

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

@@ -21,7 +21,7 @@ public class BlockCarvablePumpkin extends BlockPumpkin implements ICarvable{
     public BlockCarvablePumpkin(boolean isOn) {
         super(isOn);
         if(isOn)
-            setLightLevel(4.0F);
+            setLightLevel(10.0F);
         carverHelper = new CarvableHelper();
     }
 

src/main/java/com/cricketcraft/chisel/compat/MarbleCompatibility.java

@@ -108,6 +108,18 @@ public class MarbleCompatibility
             }
         };
 
+        new ClassCompat("shukaro.artifice.ArtificeBlocks")
+        {
+            @Override
+            void action() throws Exception
+            {
+                Block[] blocks = (Block[]) cl.getField("blockLimestones").get(null);
+
+                Carving.chisel.addVariation("limestone", blocks[0], 3, 99);
+                blocks[0].setHarvestLevel("chisel", 0, 3);
+            }
+        };
+
         new ClassBlockCompat("com.bluepowermod.init.BPBlocks", "marble")
         {
             @Override

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

@@ -96,6 +96,7 @@ public class ModBlocks {
     public static BlockCarvable arcane;
     public static BlockCarvable OCD;
     public static BlockCarvable OCD2;
+    public static BlockCarvable bloodRune;
 
     // 1.7
     public static BlockCarvableGlass[] stainedGlass = new BlockCarvableGlass[4];
@@ -1693,6 +1694,20 @@ public class ModBlocks {
             Carving.chisel.registerOre("arcane", "arcane");
         }
 
+        //Blood Magic
+        if(Configurations.featureEnabled("bloodRune") && Loader.isModLoaded("AWWayOfTime")){
+            bloodRune = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone);
+            Carving.chisel.addVariation("bloodRune", GameRegistry.findBlock("AWWayOfTime", "bloodRune.blank"), 0, 0);
+            bloodRune.carverHelper.addVariation(StatCollector.translateToLocal("tile.bloodRune.0.desc"), 0, "bloodMagic/bloodRuneArranged");
+            bloodRune.carverHelper.addVariation(StatCollector.translateToLocal("tile.bloodRune.1.desc"), 1, "bloodMagic/bloodRuneBricks");
+            bloodRune.carverHelper.addVariation(StatCollector.translateToLocal("tile.bloodRune.2.desc"), 2, "bloodMagic/bloodRuneCarved");
+            bloodRune.carverHelper.addVariation(StatCollector.translateToLocal("tile.bloodRune.3.desc"), 3, "bloodMagic/bloodRuneCarvedRadial");
+            bloodRune.carverHelper.addVariation(StatCollector.translateToLocal("tile.bloodRune.4.desc"), 4, "bloodMagic/bloodRuneClassicPanel");
+            bloodRune.carverHelper.addVariation(StatCollector.translateToLocal("tile.bloodRune.5.desc"), 5, "bloodMagic/bloodRuneTiles");
+            bloodRune.carverHelper.register(bloodRune, "bloodRune");
+            Carving.chisel.registerOre("bloodRune", "bloodRune");
+        }
+
 
         //Twilight Forest
 

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

@@ -3,6 +3,7 @@ package com.cricketcraft.chisel.init;
 import com.cricketcraft.chisel.Chisel;
 import cpw.mods.fml.common.Loader;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 
 public class ModTabs {
@@ -49,7 +50,7 @@ public class ModTabs {
             @Override
             public Item getTabIconItem()
             {
-            	return Item.getItemFromBlock(ModBlocks.planks[0]);
+            	return Item.getItemFromBlock(Blocks.bookshelf);
             }
         };