Merge branch '1.11' into feature-3808

This commit is contained in:
Aidan authored and GitHub committed 2017-07-22 20:53:20 -07:00
commit 8d3f9a2297
287 files changed
+222 -9394

No files matched your search

@@ -1428,11 +1428,21 @@ public class Mekanism
public void onBlacklistUpdate(BoxBlacklistEvent event)
{
MekanismAPI.addBoxBlacklist(MekanismBlocks.CardboardBox, OreDictionary.WILDCARD_VALUE);
// Mekanism multiblock structures
MekanismAPI.addBoxBlacklist(MekanismBlocks.BoundingBlock, OreDictionary.WILDCARD_VALUE);
MekanismAPI.addBoxBlacklist(MekanismBlocks.BasicBlock2, 9); // Security Desk
MekanismAPI.addBoxBlacklist(MekanismBlocks.MachineBlock, 4); // Digital Miner
MekanismAPI.addBoxBlacklist(MekanismBlocks.MachineBlock2, 9); // Seismic Vibrator
MekanismAPI.addBoxBlacklist(MekanismBlocks.MachineBlock3, 1); // Solar Neutron Activator
// Minecraft unobtainable
MekanismAPI.addBoxBlacklist(Blocks.BEDROCK, 0);
MekanismAPI.addBoxBlacklist(Blocks.PORTAL, OreDictionary.WILDCARD_VALUE);
MekanismAPI.addBoxBlacklist(Blocks.END_PORTAL, OreDictionary.WILDCARD_VALUE);
MekanismAPI.addBoxBlacklist(Blocks.END_PORTAL_FRAME, OreDictionary.WILDCARD_VALUE);
// Minecraft multiblock structures
MekanismAPI.addBoxBlacklist(Blocks.BED, OreDictionary.WILDCARD_VALUE);
MekanismAPI.addBoxBlacklist(Blocks.OAK_DOOR, OreDictionary.WILDCARD_VALUE);
MekanismAPI.addBoxBlacklist(Blocks.SPRUCE_DOOR, OreDictionary.WILDCARD_VALUE);