Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop

This commit is contained in:
Petr Mrázek 2014-01-05 16:53:51 +01:00
commit ced640f68c
10 changed files with 172 additions and 37 deletions

View file

@ -346,8 +346,10 @@ void MultiMC::initGlobalSettings()
{
m_settings.reset(new INISettingsObject("multimc.cfg", this));
// Updates
m_settings->registerSetting("UseDevBuilds", false);
m_settings->registerSetting("UpdateChannel", version().channel);
m_settings->registerSetting("AutoUpdate", true);
// Notifications
m_settings->registerSetting("ShownNotifications", QString());
// FTB