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

2014-04-06 01:55:36 -05:00
parent 5248eeeace 86c2ad49ee
commit 0036e050ca
2 changed files with 13 additions and 2 deletions
@@ -95,7 +95,8 @@ public class AppEng
 		if ( Platform.isClient() )
 		{
 			CreativeTab.init();
-			CreativeTabFacade.init();
+			if ( AEConfig.instance.isFeatureEnabled( AEFeature.Facades ) )
+				CreativeTabFacade.init();
 			CommonHelper.proxy.init();
 		}