dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/Stiepen22/MultiMC5 into develop

Browse source 
Conflicts:
	AppSettings.cpp
	MultiMC.pro
	main.cpp
This commit is contained in:
Petr Mrázek 2013-09-08 16:21:49 +02:00
commit 499ee1e365
8 changed files with 119 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
MultiMC.cpp
View file

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