Merge upstream and probably introduce a zillion errors

This commit is contained in:
Vincent Lee committed 2015-12-14 16:38:07 -06:00
commit 5211ed9149
164 files changed
+5198 -2141

No files matched your search

@@ -12,7 +12,6 @@ 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;
@@ -362,7 +361,7 @@ public final class ModBlocks {
shimmerwoodPlanks = new BlockShimmerwoodPlanks();
avatar = new BlockAvatar();
altGrass = new BlockAltGrass();
ModFluffBlocks.init();
for(int i = 0; i < 16; i++)