Merge remote-tracking branch 'origin/master'

2018-11-17 13:04:39 -05:00
parent de6bca424f 03268a5575
commit 7d12e18b98
5 changed files with 789 additions and 782 deletions
--- a/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java
@@ -128,7 +128,7 @@ public class BlocksFragment extends Fragment{
            recipeTable.margin(4).top().left().marginRight(15);

            //add a new row here when needed
-            if(cati == secrows){
+            if(cati % secrows == 0){
                catTable = new Table();
                selectTable.row();
                selectTable.add(catTable).colspan(secrows).padTop(-5).growX();