Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken 2018-10-12 09:57:48 -04:00
commit 5feb212df7
2 changed files with 506 additions and 446 deletions

File diff suppressed because it is too large Load diff

View file

@ -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());
}
}