Merge branch '6.0' into crater

# Conflicts: # core/assets/icons/icons.properties # core/assets/sprites/block_colors.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites2.png # core/assets/sprites/sprites4.png # core/assets/sprites/sprites6.png
2020-04-16 22:38:51 +02:00
parent 1acc6461e6 280f3dd428
commit 32e32ecae2
19 changed files with 373 additions and 10 deletions
--- a/core/src/mindustry/entities/def/TileComp.java
+++ b/core/src/mindustry/entities/def/TileComp.java
@@ -1012,6 +1012,7 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc, QuadTree
        remove();
    }

+    @Final
    @Override
    public void update(){
        timeScaleDuration -= Time.delta();