Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0

# Conflicts: # core/assets/sprites/sprites.atlas # core/assets/version.properties
2018-03-09 20:58:21 -05:00
parent 89ca9ad213 0310614392
commit 9c05ddbd7d
15 changed files with 2205 additions and 2237 deletions
--- a/core/assets-raw/sprites/pack.json
+++ b/core/assets-raw/sprites/pack.json
@@ -1,4 +1,5 @@
 {
 	duplicatePadding: true,
-	combineSubdirectories: true
+	combineSubdirectories: true,
+	flattenPaths: true
 }