Also Cables no longer glow in the dark :P

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

Conflicts:
	core/localization/GuiText.java
This commit is contained in:
AlgorithmX2
2014-06-08 21:13:53 -05:00
24 changed files with 226 additions and 70 deletions
+13
View File
@@ -32,6 +32,18 @@ public class WrapperChainedInventory implements IInventory
setInventory( ilist );
}
public void cycleOrder()
{
if ( l.size() > 1 )
{
List<IInventory> newOrder = new ArrayList( l.size() );
newOrder.add( l.get( l.size() - 1 ) );
for (int x = 0; x < l.size() - 1; x++)
newOrder.add( l.get( x ) );
setInventory( newOrder );
}
}
public void calculateSizes()
{
offsets = new HashMap<Integer, WrapperChainedInventory.InvOffset>();
@@ -195,4 +207,5 @@ public class WrapperChainedInventory implements IInventory
}
return false;
}
}