Merge branch 'RemoveMJ' of https://github.com/CrazyPants/EnderIO into RemoveMJ

This commit is contained in:
CrazyPants committed 2014-09-23 05:10:23 +08:00
commit d5e26f43ff
11 files changed
+71 -11

No files matched your search

@@ -29,11 +29,11 @@ import crazypants.enderio.ClientProxy;
import crazypants.enderio.EnderIO;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.ModObject;
import crazypants.enderio.compat.waila.IWailaInfoProvider;
import crazypants.enderio.conduit.ConduitUtil;
import crazypants.enderio.config.Config;
import crazypants.enderio.gui.IResourceTooltipProvider;
import crazypants.enderio.network.PacketHandler;
import crazypants.enderio.waila.IWailaInfoProvider;
public abstract class AbstractMachineBlock<T extends AbstractMachineEntity> extends BlockContainer implements IGuiHandler, IResourceTooltipProvider, IWailaInfoProvider {