Merge branch 'master' into formatting

This commit is contained in:
Anuken
2020-10-30 09:26:51 -04:00
committed by GitHub
44 changed files with 508 additions and 382 deletions

View File

@@ -463,7 +463,7 @@ load = Load
save = Save
fps = FPS: {0}
ping = Ping: {0}ms
language.restart = Please restart your game for the language settings to take effect.
language.restart = Restart your game for the language settings to take effect.
settings = Settings
tutorial = Tutorial
tutorial.retake = Re-Take Tutorial