Merge remote-tracking branch 'origin/master'

2018-10-12 09:57:48 -04:00
parent 327edcd347 94cbf4cddf
commit 5feb212df7
2 changed files with 506 additions and 446 deletions
--- a/core/src/io/anuke/mindustry/maps/missions/CommandMission.java
+++ b/core/src/io/anuke/mindustry/maps/missions/CommandMission.java
@@ -24,6 +24,6 @@ public class CommandMission extends Mission{

    @Override
    public String displayString(){
-        return Bundles.format("text.mission.battle", command.localized());
+        return Bundles.format("text.mission.command", command.localized());
    }
 }