Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework

# 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/world/blocks/defense/MendProjector.java # gradle.properties
2019-12-02 22:45:05 -05:00
parent e6647484bd 5c30f4bc9c
commit 9e3870acbe
217 changed files with 7797 additions and 4613 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=e7c8ed2176c3b35dec8c26b51aa174f553a1ca7f
+archash=680d8dfc055a1336c06b32d7d4429661e6c6fddd