Conflicts:
	core/localization/GuiText.java
	core/sync/AppEngPacketHandlerBase.java
This commit is contained in:
AlgorithmX2
2014-05-03 14:12:19 -05:00
50 changed files with 1652 additions and 148 deletions
+5
View File
@@ -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() )