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

Conflicts: items/tools/powered/ToolMassCannon.java
2014-06-16 00:51:51 -05:00
parent 472d5cb1c0 730200ed8d
commit 1632d2d72e
13 changed files with 72 additions and 44 deletions
@@ -111,13 +111,12 @@ public class AppEng

 		AELog.info( "Starting ( PreInit )" );

+		CreativeTab.init();		
+		if ( AEConfig.instance.isFeatureEnabled( AEFeature.Facades ) )
+			CreativeTabFacade.init();
+
 		if ( Platform.isClient() )
-		{
-			CreativeTab.init();
-			if ( AEConfig.instance.isFeatureEnabled( AEFeature.Facades ) )
-				CreativeTabFacade.init();
 			CommonHelper.proxy.init();
-		}

 		Registration.instance.PreInit( event );