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/sprites3.png # core/assets/sprites/sprites5.png # core/src/mindustry/content/Blocks.java # core/src/mindustry/ui/fragments/PlayerListFragment.java # core/src/mindustry/world/BlockStorage.java
2020-04-16 12:39:52 +02:00
parent 424e58ff7d 8a01b87c99
commit 5c28985ee6
610 changed files with 27167 additions and 25697 deletions
@@ -0,0 +1,8 @@
+{
+  duplicatePadding: true,
+  combineSubdirectories: true,
+  flattenPaths: true,
+  maxWidth: 2048,
+  maxHeight: 2048,
+  fast: true
+}