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

Conflicts: core/localization/GuiText.java core/sync/AppEngPacketHandlerBase.java
2014-05-03 14:12:19 -05:00
parent f21bf3e9bc b9ef599e13
commit 3c510b6925
50 changed files with 1652 additions and 148 deletions
@@ -151,6 +151,9 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
 		if ( hasNEI )
 			rows--;

+		if ( rows < 3 )
+			rows = 3;
+
 		meSlots.clear();
 		for (int y = 0; y < rows; y++)
 		{