fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
AlgorithmX2
2014-07-07 23:11:04 -05:00
parent c97818072f 5c8327f040
commit 8b3bba96b3
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
container/implementations/ContainerMEMonitorable.java
-3
View File
@@ -1,7 +1,5 @@
package appeng.container.implementations; package appeng.container.implementations;
import invtweaks.api.container.IgnoreContainer;
import java.io.IOException; import java.io.IOException;
import java.nio.BufferOverflowException; import java.nio.BufferOverflowException;
@@ -47,7 +45,6 @@ import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost; import appeng.util.IConfigManagerHost;
import appeng.util.Platform; import appeng.util.Platform;
@IgnoreContainer
public class ContainerMEMonitorable extends AEBaseContainer implements IConfigManagerHost, IConfigureableObject, IMEMonitorHandlerReceiver<IAEItemStack> public class ContainerMEMonitorable extends AEBaseContainer implements IConfigManagerHost, IConfigureableObject, IMEMonitorHandlerReceiver<IAEItemStack>
{ {
me/Grid.java
+2 -2
View File
@@ -40,10 +40,10 @@ public class Grid implements IGrid
caches.put( c, new GridCacheWrapper( myCaches.get( c ) ) ); caches.put( c, new GridCacheWrapper( myCaches.get( c ) ) );
} }
postEvent( new MENetworkPostCacheConstruction() );
TickHandler.instance.addNetwork( this ); TickHandler.instance.addNetwork( this );
center.setGrid( this ); center.setGrid( this );
postEvent( new MENetworkPostCacheConstruction() );
} }
public Set<Class<? extends IGridHost>> getMachineClasses() public Set<Class<? extends IGridHost>> getMachineClasses()