Merge branch 'develop' into chore/add-compiler-warnings

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-13 20:05:16 -07:00
parent 8d7dcdfc5b 94d4d12ee0
commit 520594e529
69 changed files with 1569 additions and 761 deletions
--- a/launcher/ui/pages/instance/WorldListPage.cpp
+++ b/launcher/ui/pages/instance/WorldListPage.cpp
@ -339,6 +339,7 @@ void WorldListPage::mceditState(LoggedProcess::State state)
        {
            failed = true;
        }
+        /* fallthrough */
        case LoggedProcess::Running:
        case LoggedProcess::Finished:
        {