Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0

# Conflicts: # 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/io/anuke/mindustry/graphics/Shaders.java # gradle.properties
2019-12-01 17:42:56 -05:00
parent 0c0573a7b1 5a9957c578
commit 78f146fbcf
178 changed files with 4412 additions and 1699 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=640a9a5546f742c272c6117ea4ad886c80cd84ef
+archash=58bfbdbe4446ca80d133a87cdffee249070ab32d