lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '1.8-Rewrite' of https://github.com/WayofTime/BloodMagic into 1.8-Rewrite

Browse source
This commit is contained in:
WayofTime 2016-02-04 21:12:58 -05:00
commit fd671f2902
16 changed files with 33 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java
View file

@ -59,7 +59,7 @@ public class ModBlocks
public static Block ritualController;
public static Block ritualStone;
public static Block bloodLight;
public static Block testSpellBlock;
// public static Block testSpellBlock;
public static Block pedestal;
public static Block teleposer;
public static Block alchemyArray;
@ -89,7 +89,6 @@ public class ModBlocks
ritualController = registerBlock(new BlockRitualController(), ItemBlockRitualController.class);
ritualStone = registerBlock(new BlockRitualStone(), ItemBlockRitualStone.class);
bloodLight = registerBlock(new BlockBloodLight());
testSpellBlock = registerBlock(new BlockTestSpellBlock());
pedestal = registerBlock(new BlockPedestal(), ItemBlockPedestal.class);
teleposer = registerBlock(new BlockTeleposer());
alchemyArray = registerBlock(new BlockAlchemyArray());
@ -105,6 +104,8 @@ public class ModBlocks
incenseAltar = registerBlock(new BlockIncenseAltar());
pathBlock = registerBlock(new BlockPath(), ItemBlockPath.class);
// testSpellBlock = registerBlock(new BlockTestSpellBlock());
BloodMagicAPI.addToTeleposerBlacklist(inputRoutingNode);
BloodMagicAPI.addToTeleposerBlacklist(outputRoutingNode);
BloodMagicAPI.addToTeleposerBlacklist(itemRoutingNode);