tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

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

Browse source
This commit is contained in:
AlgorithmX2 2014-04-06 01:55:36 -05:00
commit 0036e050ca
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/AppEng.java
View file

@ -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();
}

12
integration/modules/BC.java
View file

@ -41,7 +41,8 @@ public class BC extends BaseModule implements IBC
@Override
public void addFacade(ItemStack item)
{
FMLInterModComms.sendMessage( "BuildCraft|Transport", "add-facade", item );
if ( item != null )
FMLInterModComms.sendMessage( "BuildCraft|Transport", "add-facade", item );
}
@Override
@ -188,6 +189,15 @@ public class BC extends BaseModule implements IBC
addFacade( b.blockQuartz.stack( 1 ) );
addFacade( b.blockQuartzChiseled.stack( 1 ) );
addFacade( b.blockQuartzPiller.stack( 1 ) );
Block skyStone = b.blockSkyStone.block();
if ( skyStone != null )
{
addFacade( new ItemStack( skyStone, 1, 0 ) );
addFacade( new ItemStack( skyStone, 1, 1 ) );
addFacade( new ItemStack( skyStone, 1, 2 ) );
addFacade( new ItemStack( skyStone, 1, 3 ) );
}
}
@Override