Merge upstream

This commit is contained in:
Vincent Lee committed 2015-11-20 01:00:31 -06:00
commit e3b22975cb
73 files changed
+363 -47

No files matched your search

@@ -12,6 +12,7 @@ package vazkii.botania.common.block;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDispenser;
import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -267,6 +268,7 @@ public final class ModBlocks {
public static Block shimmerrock;
public static Block shimmerwoodPlanks;
public static Block avatar;
public static Block altGrass;
public static void init() {
flower = new BlockModFlower();
@@ -358,7 +360,8 @@ public final class ModBlocks {
shimmerrock = new BlockShimmerrock();
shimmerwoodPlanks = new BlockShimmerwoodPlanks();
avatar = new BlockAvatar();
altGrass = new BlockAltGrass();
ModFluffBlocks.init();
for(int i = 0; i < 16; i++)