Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

2014-06-25 23:02:22 -05:00
parent 4ab4b335c3 c7692d1be6
commit 215c097506
13 changed files with 56 additions and 145 deletions
@@ -1,5 +1,7 @@
 package appeng.container.implementations;

+import invtweaks.api.container.IgnoreContainer;
+
 import java.io.IOException;
 import java.nio.BufferOverflowException;

@@ -46,6 +48,7 @@ import appeng.util.ConfigManager;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;

+@IgnoreContainer
 public class ContainerMEMonitorable extends AEBaseContainer implements IConfigManagerHost, IConfigureableObject, IMEMonitorHandlerReceiver<IAEItemStack>
 {