Fix conflict

This commit is contained in:
Sebastian-byte
2021-10-24 17:15:27 -05:00
27 changed files with 232 additions and 146 deletions

View File

@@ -646,6 +646,7 @@ Launcher::Launcher(int &argc, char **argv) : QApplication(argc, argv)
// Game time
m_settings->registerSetting("ShowGameTime", true);
m_settings->registerSetting("ShowGlobalGameTime", true);
m_settings->registerSetting("RecordGameTime", true);
// Minecraft launch method