fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Slowly working towards crafting.

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

Conflicts:
	client/gui/widgets/GuiImgButton.java
	core/localization/ButtonToolTips.java
This commit is contained in:
AlgorithmX2
2014-05-18 20:05:03 -05:00
parent b15d3af12b 440ac95dc4
commit 68993534d9
10 changed files with 312 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tile/crafting/TileCraftingTile.java
+6 -4
View File
@@ -92,12 +92,14 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock
int newmeta = (current & 3) | (formed ? 8 : 0) | (power ? 4 : 0);
if ( current != newmeta )
{
worldObj.setBlockMetadataWithNotify( xCoord, yCoord, zCoord, newmeta, 3 );
if ( isFormed() )
gridProxy.setValidSides( EnumSet.allOf( ForgeDirection.class ) );
else
gridProxy.setValidSides( EnumSet.noneOf( ForgeDirection.class ) );
if ( isFormed() )
gridProxy.setValidSides( EnumSet.allOf( ForgeDirection.class ) );
else
gridProxy.setValidSides( EnumSet.noneOf( ForgeDirection.class ) );
}
}
private void dropAndBreak()