Merge upstream final release

This commit is contained in:
Vincent Lee committed 2016-02-28 01:29:25 -06:00
commit 1580790398
26 files changed
+2841 -765

No files matched your search

@@ -27,6 +27,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import vazkii.botania.api.boss.IBotaniaBoss;
import vazkii.botania.api.corporea.IWrappedInventory;
import vazkii.botania.api.lexicon.LexiconPage;
import vazkii.botania.api.lexicon.multiblock.MultiblockSet;
import vazkii.botania.api.recipe.RecipeBrew;
@@ -227,4 +228,9 @@ public class DummyMethodHandler implements IInternalMethodHandler {
// NO-OP
}
@Override
public List<IWrappedInventory> wrapInventory(List<IInventory> inventories) {
return null;
}
}