Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

 Conflicts:

	core/assets/logicids.dat

	core/src/mindustry/content/Blocks.java

	gradle.properties

tools/build.gradle

@@ -17,7 +17,7 @@ def doAntialias = !project.hasProperty("disableAntialias")
 def colorMap = new IntMap<List<Color>>(), colorIndexMap = new IntIntMap()
 //on my machine, I have a native Nim AA implementation that is ~10x faster
 //it's not compiled for other platforms so they don't get it
-def useFastAA = System.getProperty("user.name") == "anuke"
+def useFastAA = project.hasProperty("fastAA") || System.getProperty("user.name") == "anuke"
 
 def transformColors = { List<List<String>> list ->
     list.each{ colors ->
@@ -282,4 +282,4 @@ task updateScripts(dependsOn: classes, type: JavaExec){
     classpath = sourceSets.main.runtimeClasspath
     standardInput = System.in
     workingDir = "../"
-}
+}