Merge remote-tracking branch 'origin/master'

.gitignore

@@ -30,6 +30,7 @@ asm
 config
 logs
 screenshots
+mods
 
 *.txt
 *.json

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

@@ -119,7 +119,7 @@ public class Chisel
         Configurations.refreshConfig();
 
         ModTabs.load();
-        ModBlocks.load();
+        ModBlocks.preInit();
         ModItems.load();
         proxy.preInit();
     }
@@ -127,6 +127,7 @@ public class Chisel
     @EventHandler
     public void init(FMLInitializationEvent event)
     {
+    	ModBlocks.init();
         Crafting.init();
 
         NetworkRegistry.INSTANCE.registerGuiHandler(this, new IGuiHandler() {

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

@@ -8,6 +8,8 @@ import com.cricketcraft.chisel.carving.CarvableVariation;
 import com.cricketcraft.chisel.carving.Carving;
 import com.cricketcraft.chisel.item.ItemCarvable;
 import com.cricketcraft.chisel.item.ItemMarbleSlab;
+
+import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -88,12 +90,13 @@ public class ModBlocks {
     public static BlockCarvable brickCustom;
     public static BlockCarvableTorch[] torch = new BlockCarvableTorch[16];
     public static BlockCarvable sign;
+    public static BlockCarvable arcane;
 
     // 1.7
     public static BlockCarvableGlass[] stainedGlass = new BlockCarvableGlass[4];
     public static BlockCarvablePane[] stainedGlassPane = new BlockCarvablePane[8];
 
-    public static void load()
+    public static void preInit()
     {
         if(Configurations.featureEnabled("autoChisel")){
             autoChisel = new BlockAutoChisel().setBlockTextureName("Chisel:autoChisel").setCreativeTab(ModTabs.tabChisel).setBlockName("autoChisel").setBlockTextureName(Chisel.MOD_ID + ":factory/circuit");
@@ -1552,6 +1555,19 @@ public class ModBlocks {
             sign.carverHelper.register(sign, "warningSign");
             Carving.chisel.registerOre("warningSign", "warningSign");
         }
-
+    }
+    public static void init()
+    {
+    	//Load AFTER Thaumcraft Blocks have loaded :P
+    	 if(Configurations.featureEnabled("arcane") && Loader.isModLoaded("Thaumcraft"))
+         {
+             arcane = (BlockCarvable) new BlockCarvable(Material.rock).setStepSound(Block.soundTypeStone);
+             Carving.chisel.addVariation("arcane", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 6, 0);
+             arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.1.desc"), 1, "arcane/largetile");
+             arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.2.desc"), 2, "arcane/moon");
+             arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.3.desc"), 3, "arcane/moon-thaumium");
+             arcane.carverHelper.register(arcane, "arcane");
+             Carving.chisel.registerOre("arcane", "arcane");
+         }
     }
 }

src/main/resources/assets/chisel/lang/en_US.lang

@@ -79,6 +79,12 @@ tile.voidstone2.7.desc=Beveled Voidstone
 tile.voidstonePillar2.name=Energised Voidstone Pillar
 tile.voidstonePillar2.0.desc=Striped Energised Voidstone Pillar
 
+#Arcane
+tile.arcane.name=Arcane Stone Block
+tile.arcane.1.desc=Large Tile Arcane Stone
+tile.arcane.2.desc=Arcane Stone with Engraved Moon
+tile.arcane.3.desc=Arcane Stone with Thaumium Engraved Moon
+
 #Waterstone
 tile.waterstone.name=Waterstone
 tile.waterstone.0.desc=Waterstone Bricks