aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/ISSUE_TEMPLATE/bug_report.yml1
-rw-r--r--.github/ISSUE_TEMPLATE/suggestion.yml1
-rw-r--r--BUILD.md4
-rw-r--r--CMakeLists.txt13
-rw-r--r--COPYING.md25
-rw-r--r--api/logic/BaseInstance.cpp23
-rw-r--r--api/logic/BaseInstance.h10
-rw-r--r--api/logic/CMakeLists.txt12
-rw-r--r--api/logic/InstanceImportTask.cpp11
-rw-r--r--api/logic/NullInstance.h4
-rw-r--r--api/logic/java/JavaUtils.cpp76
-rw-r--r--api/logic/java/JavaUtils.h2
-rw-r--r--api/logic/launch/steps/LookupServerAddress.cpp95
-rw-r--r--api/logic/launch/steps/LookupServerAddress.h49
-rw-r--r--api/logic/minecraft/MinecraftInstance.cpp79
-rw-r--r--api/logic/minecraft/MinecraftInstance.h9
-rw-r--r--api/logic/minecraft/VersionFilterData.cpp53
-rw-r--r--api/logic/minecraft/VersionFilterData.h5
-rw-r--r--api/logic/minecraft/launch/CreateGameFolders.cpp2
-rw-r--r--api/logic/minecraft/launch/DirectJavaLaunch.cpp21
-rw-r--r--api/logic/minecraft/launch/DirectJavaLaunch.h9
-rw-r--r--api/logic/minecraft/launch/ExtractNatives.cpp6
-rw-r--r--api/logic/minecraft/launch/LauncherPartLaunch.cpp19
-rw-r--r--api/logic/minecraft/launch/LauncherPartLaunch.h9
-rw-r--r--api/logic/minecraft/launch/MinecraftServerTarget.cpp66
-rw-r--r--api/logic/minecraft/launch/MinecraftServerTarget.h30
-rw-r--r--api/logic/minecraft/launch/PrintInstanceInfo.cpp2
-rw-r--r--api/logic/minecraft/launch/PrintInstanceInfo.h5
-rw-r--r--api/logic/minecraft/launch/VerifyJavaInstall.cpp34
-rw-r--r--api/logic/minecraft/launch/VerifyJavaInstall.h17
-rw-r--r--api/logic/minecraft/legacy/LegacyInstance.cpp2
-rw-r--r--api/logic/minecraft/legacy/LegacyInstance.h5
-rw-r--r--api/logic/minecraft/mod/LocalModParseTask.cpp171
-rw-r--r--api/logic/minecraft/mod/ResourcePackFolderModel.cpp23
-rw-r--r--api/logic/minecraft/mod/ResourcePackFolderModel.h13
-rw-r--r--api/logic/minecraft/mod/TexturePackFolderModel.cpp23
-rw-r--r--api/logic/minecraft/mod/TexturePackFolderModel.h13
-rw-r--r--api/logic/minecraft/update/FMLLibrariesTask.cpp2
-rw-r--r--api/logic/modplatform/atlauncher/ATLPackInstallTask.cpp112
-rw-r--r--api/logic/modplatform/atlauncher/ATLPackInstallTask.h26
-rw-r--r--api/logic/modplatform/atlauncher/ATLPackManifest.cpp58
-rw-r--r--api/logic/modplatform/atlauncher/ATLPackManifest.h19
-rw-r--r--api/logic/modplatform/legacy_ftb/PackInstallTask.h1
-rw-r--r--api/logic/modplatform/modpacksch/FTBPackInstallTask.cpp45
-rw-r--r--api/logic/modplatform/modpacksch/FTBPackInstallTask.h5
-rw-r--r--api/logic/modplatform/technic/SingleZipPackInstallTask.cpp12
-rw-r--r--api/logic/modplatform/technic/SingleZipPackInstallTask.h5
-rw-r--r--api/logic/modplatform/technic/SolderPackInstallTask.cpp12
-rw-r--r--api/logic/modplatform/technic/SolderPackInstallTask.h5
-rw-r--r--api/logic/net/Download.cpp3
-rw-r--r--api/logic/net/PasteUpload.cpp3
-rw-r--r--api/logic/screenshots/ImgurAlbumCreation.cpp4
-rw-r--r--api/logic/screenshots/ImgurUpload.cpp4
-rw-r--r--application/CMakeLists.txt5
-rw-r--r--application/InstancePageProvider.h2
-rw-r--r--application/LaunchController.cpp44
-rw-r--r--application/LaunchController.h7
-rw-r--r--application/MainWindow.cpp76
-rw-r--r--application/MainWindow.h2
-rw-r--r--application/MultiMC.cpp80
-rw-r--r--application/MultiMC.h10
-rw-r--r--application/dialogs/LoginDialog.ui14
-rw-r--r--application/dialogs/NewInstanceDialog.cpp8
-rw-r--r--application/dialogs/NewInstanceDialog.h1
-rw-r--r--application/package/rpm/MultiMC5.spec6
-rw-r--r--application/pages/global/JavaPage.cpp4
-rw-r--r--application/pages/global/JavaPage.ui6
-rw-r--r--application/pages/global/MinecraftPage.cpp7
-rw-r--r--application/pages/global/MinecraftPage.ui23
-rw-r--r--application/pages/instance/InstanceSettingsPage.cpp36
-rw-r--r--application/pages/instance/InstanceSettingsPage.ui95
-rw-r--r--application/pages/instance/LogPage.cpp6
-rw-r--r--application/pages/instance/ModFolderPage.cpp2
-rw-r--r--application/pages/instance/ResourcePackPage.h3
-rw-r--r--application/pages/instance/ServersPage.cpp11
-rw-r--r--application/pages/instance/ServersPage.h5
-rw-r--r--application/pages/instance/ServersPage.ui6
-rw-r--r--application/pages/instance/TexturePackPage.h2
-rw-r--r--application/pages/instance/VersionPage.cpp30
-rw-r--r--application/pages/instance/VersionPage.h4
-rw-r--r--application/pages/instance/VersionPage.ui18
-rw-r--r--application/pages/modplatform/ImportPage.cpp2
-rw-r--r--application/pages/modplatform/VanillaPage.cpp13
-rw-r--r--application/pages/modplatform/atlauncher/AtlOptionalModDialog.cpp209
-rw-r--r--application/pages/modplatform/atlauncher/AtlOptionalModDialog.h66
-rw-r--r--application/pages/modplatform/atlauncher/AtlOptionalModDialog.ui65
-rw-r--r--application/pages/modplatform/atlauncher/AtlPage.cpp67
-rw-r--r--application/pages/modplatform/atlauncher/AtlPage.h8
-rw-r--r--application/pages/modplatform/atlauncher/AtlPage.ui3
-rw-r--r--application/pages/modplatform/flame/FlamePage.cpp9
-rw-r--r--application/pages/modplatform/ftb/FtbPage.cpp38
-rw-r--r--application/pages/modplatform/ftb/FtbPage.ui9
-rw-r--r--application/pages/modplatform/legacy_ftb/Page.cpp79
-rw-r--r--application/pages/modplatform/legacy_ftb/Page.ui9
-rw-r--r--application/pages/modplatform/technic/TechnicModel.cpp15
-rw-r--r--application/pages/modplatform/technic/TechnicPage.cpp103
-rw-r--r--application/pages/modplatform/technic/TechnicPage.ui6
-rw-r--r--application/resources/MultiMC.icobin85182 -> 55224 bytes
-rw-r--r--application/resources/multimc/16x16/patreon.pngbin682 -> 840 bytes
-rw-r--r--application/resources/multimc/22x22/patreon.pngbin976 -> 939 bytes
-rw-r--r--application/resources/multimc/24x24/patreon.pngbin1034 -> 977 bytes
-rw-r--r--application/resources/multimc/32x32/instances/brick.pngbin713 -> 2388 bytes
-rw-r--r--application/resources/multimc/32x32/instances/diamond.pngbin708 -> 2444 bytes
-rw-r--r--application/resources/multimc/32x32/instances/gold.pngbin978 -> 2366 bytes
-rw-r--r--application/resources/multimc/32x32/instances/iron.pngbin532 -> 1772 bytes
-rw-r--r--application/resources/multimc/32x32/instances/planks.pngbin461 -> 2299 bytes
-rw-r--r--application/resources/multimc/32x32/instances/stone.pngbin438 -> 1866 bytes
-rw-r--r--application/resources/multimc/32x32/patreon.pngbin1450 -> 1086 bytes
-rw-r--r--application/resources/multimc/48x48/patreon.pngbin2317 -> 1390 bytes
-rw-r--r--application/resources/multimc/64x64/patreon.pngbin3212 -> 1667 bytes
-rw-r--r--application/widgets/JavaSettingsWidget.cpp2
-rw-r--r--buildconfig/BuildConfig.cpp.in5
-rw-r--r--buildconfig/BuildConfig.h17
-rw-r--r--libraries/README.md7
-rw-r--r--libraries/launcher/org/multimc/LegacyFrame.java18
-rw-r--r--libraries/launcher/org/multimc/onesix/OneSixLauncher.java16
-rw-r--r--libraries/systeminfo/include/sys.h2
-rw-r--r--libraries/systeminfo/src/sys_unix.cpp1
-rw-r--r--libraries/tomlc99/CMakeLists.txt10
-rw-r--r--libraries/tomlc99/LICENSE22
-rw-r--r--libraries/tomlc99/README.md194
-rw-r--r--libraries/tomlc99/include/toml.h175
-rw-r--r--libraries/tomlc99/src/toml.c2300
123 files changed, 4912 insertions, 329 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 7e894785..5b8d858e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/