Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2020-12-16 09:28:11 -05:00
+1 -1
View File
@@ -312,7 +312,7 @@ public class ContentParser{
} }
if(value.has("controller")){ if(value.has("controller")){
unit.defaultController = make(resolve(value.getString("controller"), "mindustry.ai.type")); unit.defaultController = make(resolve(value.getString("controller"), "mindustry.ai.types"));
} }
//read extra default waves //read extra default waves