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

Conflicts:
	src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java
This commit is contained in:
Arcaratus 2015-11-02 21:35:23 -05:00
commit 4734f1207a
24 changed files with 549 additions and 96 deletions

View file

@ -5,9 +5,9 @@ import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
public class ItemBlockRitualHome extends ItemBlock {
public class ItemBlockRitualController extends ItemBlock {
public ItemBlockRitualHome(Block block) {
public ItemBlockRitualController(Block block) {
super(block);
setHasSubtypes(true);