Merge branch 'master' into emissive_microblocks

src/main/java/team/chisel/Features.java

@@ -47,6 +47,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import team.chisel.block.BlockAutoChisel;
 import team.chisel.block.BlockBeaconBase;
 import team.chisel.block.BlockCarvable;
+import team.chisel.block.BlockCarvableAntiBlock;
 import team.chisel.block.BlockCarvableBeacon;
 import team.chisel.block.BlockCarvableBookshelf;
 import team.chisel.block.BlockCarvableCarpet;
@@ -3028,8 +3029,8 @@ public enum Features {
         @Override
         void addRecipes() {
             GameRegistry.addShapelessRecipe(
-                new ItemStack(ChiselBlocks.jackolantern[meta]),
-                new ItemStack(ChiselBlocks.pumpkin[meta], 1),
+                new ItemStack(jackolantern[meta]),
+                new ItemStack(pumpkin[meta], 1),
                 new ItemStack(Item.getItemFromBlock(Blocks.torch), 1));
         }
 
@@ -3580,7 +3581,7 @@ public enum Features {
                 '*',
                 new ItemStack(Blocks.stone, 1),
                 'X',
-                new ItemStack(ChiselBlocks.andesite, 1));
+                new ItemStack(andesite, 1));
         }
     },
 

src/main/java/team/chisel/client/render/SubmapManagerSpecialMaterial.java

@@ -84,4 +84,9 @@ public class SubmapManagerSpecialMaterial extends SubmapManagerBase {
         renderBlocksFullbright.submapSmall = submapSmall;
         return renderBlocksFullbright;
     }
+
+    public static void clearRenderBlocksInstance() {
+        renderBlocksFullbright = null;
+    }
+
 }

src/main/java/team/chisel/item/chisel/ChiselController.java

@@ -11,6 +11,7 @@ import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.event.world.BlockEvent;
+import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.oredict.OreDictionary;
 
 import com.cricketcraft.chisel.api.IChiselItem;
@@ -25,6 +26,7 @@ import cpw.mods.fml.common.gameevent.TickEvent.Phase;
 import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent;
 import team.chisel.Chisel;
 import team.chisel.carving.Carving;
+import team.chisel.client.render.SubmapManagerSpecialMaterial;
 import team.chisel.utils.General;
 
 public final class ChiselController {
@@ -160,4 +162,12 @@ public final class ChiselController {
             }
         }
     }
+
+    @SubscribeEvent
+    public void onWorldUnload(WorldEvent.Unload event) {
+        if (event.world.isRemote) {
+            SubmapManagerSpecialMaterial.clearRenderBlocksInstance();
+        }
+    }
+
 }