Merge branch 'master' of https://github.com/Stiepen22/MultiMC5 into develop
Conflicts: AppSettings.cpp MultiMC.pro main.cpp
This commit is contained in:
@@ -194,6 +194,9 @@ void MultiMC::initGlobalSettings()
|
||||
|
||||
// The cat
|
||||
m_settings->registerSetting(new Setting("TheCat", false));
|
||||
|
||||
// Shall the main window hide on instance launch
|
||||
m_settings->registerSetting(new Setting("NoHide", false));
|
||||
}
|
||||
|
||||
void MultiMC::initHttpMetaCache()
|
||||
|
Reference in New Issue
Block a user