Merge branches 'better-diagonals' and 'master' of https://github.com/Anuken/Mindustry

.github/workflows/gradle.yml

@@ -13,5 +13,5 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
-    - name: Run unit tests with gradle
-      run: ./gradlew test
+    #- name: Run unit tests with gradle
+    #  run: ./gradlew test

core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java

@@ -14,7 +14,7 @@ import io.anuke.mindustry.world.meta.values.*;
 
 import static io.anuke.mindustry.Vars.*;
 
-public abstract class LiquidTurret extends Turret{
+public class LiquidTurret extends Turret{
     protected ObjectMap<Liquid, BulletType> ammo = new ObjectMap<>();
 
     public LiquidTurret(String name){

server/src/io/anuke/mindustry/server/ServerControl.java

@@ -230,6 +230,7 @@ public class ServerControl implements ApplicationListener{
             }else{
                 Array<Map> maps = Vars.maps.customMaps().size == 0 ? Vars.maps.defaultMaps() : Vars.maps.customMaps();
                 result = maps.random();
+                info("Randomized next map to be {0}.", result.name());
             }
 
             Gamemode preset = Gamemode.survival;