Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
Conflicts: core/localization/GuiText.java core/sync/AppEngPacketHandlerBase.java
This commit is contained in:
@@ -65,6 +65,11 @@ public abstract class AEBaseContainer extends Container
|
||||
|
||||
int ticksSinceCheck = 900;
|
||||
|
||||
public BaseActionSource getSource()
|
||||
{
|
||||
return mySrc;
|
||||
}
|
||||
|
||||
public void verifyPermissions(SecurityPermissions security, boolean requirePower)
|
||||
{
|
||||
if ( Platform.isClient() )
|
||||
|
||||
Reference in New Issue
Block a user