aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore2
-rw-r--r--CMakeLists.txt61
-rw-r--r--MultiMC.cpp295
-rw-r--r--MultiMC.h14
-rw-r--r--MultiMC.manifest27
-rw-r--r--README.md10
-rw-r--r--cmake/MacOSXBundleInfo.plist.in40
-rw-r--r--depends/pack200/anti200.cpp43
-rw-r--r--depends/pack200/include/unpack200.h2
-rw-r--r--depends/pack200/src/unpack200.cpp13
-rw-r--r--depends/settings/CMakeLists.txt43
-rw-r--r--depends/settings/include/keyring.h97
-rw-r--r--depends/settings/inifile.cpp (renamed from depends/settings/src/inifile.cpp)2
-rw-r--r--depends/settings/inifile.h (renamed from depends/settings/include/inifile.h)0
-rw-r--r--depends/settings/inisettingsobject.cpp (renamed from depends/settings/src/inisettingsobject.cpp)34
-rw-r--r--depends/settings/inisettingsobject.h (renamed from depends/settings/include/inisettingsobject.h)0
-rw-r--r--depends/settings/libsettings_config.h (renamed from depends/settings/include/libsettings_config.h)1
-rw-r--r--depends/settings/overridesetting.cpp (renamed from depends/settings/src/overridesetting.cpp)6
-rw-r--r--depends/settings/overridesetting.h (renamed from depends/settings/include/overridesetting.h)5
-rw-r--r--depends/settings/setting.cpp (renamed from depends/settings/src/setting.cpp)10
-rw-r--r--depends/settings/setting.h (renamed from depends/settings/include/setting.h)36
-rw-r--r--depends/settings/settingsobject.cpp (renamed from depends/settings/src/settingsobject.cpp)90
-rw-r--r--depends/settings/settingsobject.h (renamed from depends/settings/include/settingsobject.h)82
-rw-r--r--depends/settings/src/keyring.cpp63
-rw-r--r--depends/settings/src/stubkeyring.cpp105
-rw-r--r--depends/settings/src/stubkeyring.h47
-rw-r--r--depends/util/src/pathutils.cpp5
-rw-r--r--gui/ConsoleWindow.cpp15
-rw-r--r--gui/ConsoleWindow.ui5
-rw-r--r--gui/MainWindow.cpp139
-rw-r--r--gui/MainWindow.h6
-rw-r--r--gui/dialogs/AboutDialog.ui79
-rw-r--r--gui/dialogs/AccountListDialog.cpp9
-rw-r--r--gui/dialogs/CopyInstanceDialog.cpp2
-rw-r--r--gui/dialogs/EditAccountDialog.cpp7
-rw-r--r--gui/dialogs/EditAccountDialog.h3
-rw-r--r--gui/dialogs/EditAccountDialog.ui6
-rw-r--r--gui/dialogs/IconPickerDialog.cpp4
-rw-r--r--gui/dialogs/InstanceSettings.cpp33
-rw-r--r--gui/dialogs/InstanceSettings.h1
-rw-r--r--gui/dialogs/InstanceSettings.ui26
-rw-r--r--gui/dialogs/NewInstanceDialog.cpp2
-rw-r--r--gui/dialogs/OneSixModEditDialog.cpp42
-rw-r--r--gui/dialogs/OneSixModEditDialog.h2
-rw-r--r--gui/dialogs/OneSixModEditDialog.ui21
-rw-r--r--gui/dialogs/SettingsDialog.cpp122
-rw-r--r--gui/dialogs/SettingsDialog.h14
-rw-r--r--gui/dialogs/SettingsDialog.ui216
-rw-r--r--gui/widgets/MCModInfoFrame.cpp2
-rw-r--r--gui/widgets/ModListView.cpp5
-rw-r--r--logger/QsLogDest.cpp14
-rw-r--r--logger/QsLogDest.h1
-rw-r--r--logic/BaseInstance.cpp73
-rw-r--r--logic/BaseInstance.h3
-rw-r--r--logic/InstanceFactory.cpp100
-rw-r--r--logic/InstanceFactory.h11
-rw-r--r--logic/JavaChecker.cpp2
-rw-r--r--logic/JavaUtils.cpp4
-rw-r--r--logic/LegacyFTBInstance.cpp16
-rw-r--r--logic/LegacyFTBInstance.h13
-rw-r--r--logic/LegacyInstance.cpp13
-rw-r--r--logic/LegacyUpdate.cpp23
-rw-r--r--logic/LiteLoaderInstaller.cpp102
-rw-r--r--logic/LiteLoaderInstaller.h (renamed from depends/settings/include/basicsettingsobject.h)33
-rw-r--r--logic/Mod.cpp141
-rw-r--r--logic/Mod.h32
-rw-r--r--logic/ModList.cpp225
-rw-r--r--logic/ModList.h18
-rw-r--r--logic/OneSixFTBInstance.cpp120
-rw-r--r--logic/OneSixFTBInstance.h20
-rw-r--r--logic/OneSixInstance.cpp4
-rw-r--r--logic/OneSixLibrary.h6
-rw-r--r--logic/OneSixUpdate.cpp14
-rw-r--r--logic/assets/AssetsMigrateTask.cpp143
-rw-r--r--logic/assets/AssetsMigrateTask.h18
-rw-r--r--logic/assets/AssetsUtils.cpp83
-rw-r--r--logic/assets/AssetsUtils.h2
-rw-r--r--logic/auth/MojangAccount.cpp26
-rw-r--r--logic/auth/MojangAccount.h2
-rw-r--r--logic/auth/YggdrasilTask.cpp36
-rw-r--r--logic/auth/YggdrasilTask.h2
-rw-r--r--logic/auth/flows/AuthenticateTask.cpp4
-rw-r--r--logic/auth/flows/RefreshTask.cpp4
-rw-r--r--logic/auth/flows/ValidateTask.cpp4
-rw-r--r--logic/icons/IconList.cpp351
-rw-r--r--logic/icons/IconList.h (renamed from logic/lists/IconList.h)33
-rw-r--r--logic/icons/MMCIcon.cpp89
-rw-r--r--logic/icons/MMCIcon.h (renamed from depends/settings/src/basicsettingsobject.cpp)54
-rw-r--r--logic/lists/ForgeVersionList.cpp205
-rw-r--r--logic/lists/ForgeVersionList.h14
-rw-r--r--logic/lists/IconList.cpp271
-rw-r--r--logic/lists/InstanceList.cpp226
-rw-r--r--logic/lists/InstanceList.h16
-rw-r--r--logic/lists/JavaVersionList.cpp13
-rw-r--r--logic/lists/JavaVersionList.h1
-rw-r--r--logic/lists/MinecraftVersionList.cpp2
-rw-r--r--logic/net/ForgeXzDownload.cpp44
-rw-r--r--logic/net/MD5EtagDownload.cpp38
-rw-r--r--logic/net/MD5EtagDownload.h8
-rw-r--r--logic/net/URLConstants.h2
-rw-r--r--logic/tasks/SequentialTask.cpp77
-rw-r--r--logic/tasks/SequentialTask.h32
-rw-r--r--logic/tasks/ThreadTask.cpp41
-rw-r--r--logic/tasks/ThreadTask.h25
-rw-r--r--logic/updater/DownloadUpdateTask.cpp436
-rw-r--r--logic/updater/DownloadUpdateTask.h49
-rw-r--r--logic/updater/UpdateChecker.cpp73
-rw-r--r--logic/updater/UpdateChecker.h11
-rw-r--r--main.cpp1
-rw-r--r--mmc_updater/CMakeLists.txt8
-rw-r--r--mmc_updater/src/FileUtils.cpp44
-rw-r--r--mmc_updater/src/Platform.h4
-rw-r--r--mmc_updater/src/UpdateDialogWin32.cpp4
-rw-r--r--mmc_updater/src/UpdateScript.h4
-rw-r--r--mmc_updater/src/UpdaterOptions.cpp3
-rw-r--r--mmc_updater/src/resources/updater.manifest27
-rw-r--r--mmc_updater/src/resources/updater.rc30
-rw-r--r--mmc_updater/src/tests/CMakeLists.txt47
-rw-r--r--mmc_updater/src/tests/TestFileUtils.cpp33
-rw-r--r--mmc_updater/src/tests/TestParseScript.cpp24
-rw-r--r--mmc_updater/src/tests/TestParseScript.h8
-rw-r--r--mmc_updater/src/tests/TestUpdateScript.cpp27
-rw-r--r--mmc_updater/src/tests/TestUpdateScript.h8
-rw-r--r--mmc_updater/src/tests/file_list.xml15
-rwxr-xr-xmmc_updater/src/tests/test-update.rb218
-rw-r--r--mmc_updater/src/tests/test.manifest27
-rw-r--r--mmc_updater/src/tests/test.rc28
-rw-r--r--mmc_updater/src/tests/v2_file_list.xml67
-rw-r--r--multimc.rc28
-rwxr-xr-xpackage/linux/MultiMC61
-rw-r--r--tests/CMakeLists.txt12
-rw-r--r--tests/TestUtil.h19
-rw-r--r--tests/data/.gitattributes2
-rw-r--r--tests/data/1.json43
-rw-r--r--tests/data/2.json31
-rw-r--r--tests/data/CMakeLists.txt4
-rw-r--r--tests/data/channels.json23
-rw-r--r--tests/data/errorChannels.json23
-rw-r--r--tests/data/fileOneA1
-rw-r--r--tests/data/fileOneB3
-rw-r--r--