Merge remote-tracking branch 'origin/master'

core/src/mindustry/core/Platform.java

@@ -130,4 +130,4 @@ public interface Platform{
     /** Stops forcing the app into landscape orientation.*/
     default void endForceLandscape(){
     }
-}
+}

core/src/mindustry/editor/MapEditor.java

@@ -337,4 +337,4 @@ public class MapEditor{
             world.endMapLoad();
         }
     }
-}
+}

core/src/mindustry/entities/type/BaseUnit.java

@@ -414,4 +414,4 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
     public void onSuperDeath(){
         super.onDeath();
     }
-}
+}

core/src/mindustry/entities/units/UnitCommand.java

@@ -15,4 +15,4 @@ public enum UnitCommand{
     public String localized(){
         return localized;
     }
-}
+}

core/src/mindustry/io/MapIO.java

@@ -176,4 +176,4 @@ public class MapIO{
     interface TileProvider{
         Tile get(int x, int y);
     }
-}
+}

core/src/mindustry/maps/Maps.java

@@ -501,4 +501,4 @@ public class Maps{
             return provider.next(previous);
         }
     }
-}
+}

core/src/mindustry/maps/filters/TerrainFilter.java

@@ -39,4 +39,4 @@ public class TerrainFilter extends GenerateFilter{
             in.block = Blocks.air;
         }
     }
-}
+}

core/src/mindustry/net/ArcNetProvider.java

@@ -418,4 +418,4 @@ public class ArcNetProvider implements NetProvider{
         }
     }
 
-}
+}

core/src/mindustry/net/Interpolator.java

@@ -65,4 +65,4 @@ public class Interpolator{
         }
 
     }
-}
+}

core/src/mindustry/ui/dialogs/CustomGameDialog.java

@@ -91,4 +91,4 @@ public class CustomGameDialog extends FloatingDialog{
 
         cont.add(pane).uniformX();
     }
-}
+}

core/src/mindustry/ui/layout/BranchTreeLayout.java

@@ -288,4 +288,4 @@ public class BranchTreeLayout implements TreeLayout{
     public enum TreeAlignment{
         center, towardsRoot, awayFromRoot
     }
-}
+}

core/src/mindustry/world/blocks/Floor.java

@@ -221,4 +221,4 @@ public class Floor extends Block{
         return block.edges()[x][2 - y];
     }
 
-}
+}

core/src/mindustry/world/blocks/distribution/Conveyor.java

@@ -379,4 +379,4 @@ public class Conveyor extends Block implements Autotiler{
             }
         }
     }
-}
+}

core/src/mindustry/world/meta/values/FloorValue.java

@@ -18,4 +18,4 @@ public class FloorValue implements StatValue{
         table.add(new Image(floor.icon(Cicon.small))).padRight(3);
         table.add(floor.localizedName).padRight(3);
     }
-}
+}