aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/ISSUE_TEMPLATE/bug_report.yml4
-rw-r--r--.gitignore5
-rw-r--r--.gitmodules2
-rw-r--r--BUILD.md6
-rw-r--r--CMakeLists.txt165
-rw-r--r--README.md32
-rw-r--r--buildconfig/BuildConfig.cpp.in53
-rw-r--r--buildconfig/BuildConfig.h16
-rw-r--r--changelog.md6
-rw-r--r--cmake/UnitTest/TestUtil.h4
-rw-r--r--cmake/UnitTest/test.manifest4
-rw-r--r--cmake/UnitTest/test.rc2
-rw-r--r--doc/multimc.1.txt4
-rw-r--r--launcher/BaseInstance.cpp3
-rw-r--r--launcher/BaseInstance.h4
-rw-r--r--launcher/CMakeLists.txt91
-rw-r--r--launcher/ColorCache.h2
-rw-r--r--launcher/Env.h2
-rw-r--r--launcher/FileSystem_test.cpp2
-rw-r--r--launcher/GuiUtil.cpp4
-rw-r--r--launcher/InstanceList.cpp6
-rw-r--r--launcher/InstanceProxyModel.cpp6
-rw-r--r--launcher/InstanceWindow.cpp18
-rw-r--r--launcher/LaunchController.cpp18
-rw-r--r--launcher/Launcher.cpp (renamed from launcher/MultiMC.cpp)181
-rw-r--r--launcher/Launcher.h (renamed from launcher/MultiMC.h)16
-rwxr-xr-xlauncher/Launcher.in (renamed from launcher/package/linux/MultiMC)37
-rw-r--r--launcher/LoggedProcess.cpp6
-rw-r--r--launcher/MainWindow.cpp273
-rw-r--r--launcher/MessageLevel.cpp4
-rw-r--r--launcher/MessageLevel.h2
-rw-r--r--launcher/UpdateController.cpp26
-rw-r--r--launcher/VersionProxyModel.cpp8
-rw-r--r--launcher/dialogs/AboutDialog.cpp19
-rw-r--r--launcher/dialogs/AboutDialog.ui72
-rw-r--r--launcher/dialogs/CopyInstanceDialog.cpp10
-rw-r--r--launcher/dialogs/CopyInstanceDialog.ui2
-rw-r--r--launcher/dialogs/ExportInstanceDialog.cpp4
-rw-r--r--launcher/dialogs/IconPickerDialog.cpp12
-rw-r--r--launcher/dialogs/NewComponentDialog.cpp4
-rw-r--r--launcher/dialogs/NewInstanceDialog.cpp24
-rw-r--r--launcher/dialogs/ProfileSelectDialog.cpp4
-rw-r--r--launcher/dialogs/UpdateDialog.cpp20
-rw-r--r--launcher/dialogs/VersionSelectDialog.cpp2
-rw-r--r--launcher/icons/IconList.cpp4
-rw-r--r--launcher/java/launch/CheckJava.cpp10
-rw-r--r--launcher/launch/LaunchTask.h4
-rw-r--r--launcher/launch/steps/LookupServerAddress.cpp4
-rw-r--r--launcher/launch/steps/PostLaunchCommand.cpp4
-rw-r--r--launcher/launch/steps/PreLaunchCommand.cpp4
-rw-r--r--launcher/main.cpp14
-rw-r--r--launcher/minecraft/MinecraftInstance.cpp2
-rw-r--r--launcher/minecraft/MojangVersionFormat.cpp7
-rw-r--r--launcher/minecraft/OneSixVersionFormat.cpp18
-rw-r--r--launcher/minecraft/auth/flows/Yggdrasil.cpp17
-rw-r--r--launcher/minecraft/launch/DirectJavaLaunch.cpp6
-rw-r--r--launcher/minecraft/launch/LauncherPartLaunch.cpp6
-rw-r--r--launcher/minecraft/launch/PrintInstanceInfo.cpp4
-rw-r--r--launcher/net/PasteUpload.cpp2
-rwxr-xr-xlauncher/package/linux/multimc.desktop11
-rw-r--r--launcher/package/ubuntu/multimc/usr/share/metainfo/multimc.metainfo.xml4
-rw-r--r--launcher/pagedialog/PageDialog.cpp6
-rw-r--r--launcher/pages/global/AccountListPage.cpp4
-rw-r--r--launcher/pages/global/AccountListPage.h6
-rw-r--r--launcher/pages/global/CustomCommandsPage.cpp4
-rw-r--r--launcher/pages/global/CustomCommandsPage.h4
-rw-r--r--launcher/pages/global/ExternalToolsPage.cpp18
-rw-r--r--launcher/pages/global/ExternalToolsPage.h6
-rw-r--r--launcher/pages/global/JavaPage.cpp8
-rw-r--r--launcher/pages/global/JavaPage.h4
-rw-r--r--launcher/pages/global/LanguagePage.cpp2
-rw-r--r--launcher/pages/global/LanguagePage.h4
-rw-r--r--launcher/pages/global/LauncherPage.cpp (renamed from launcher/pages/global/MultiMCPage.cpp)58
-rw-r--r--launcher/pages/global/LauncherPage.h (renamed from launcher/pages/global/MultiMCPage.h)20
-rw-r--r--launcher/pages/global/LauncherPage.ui (renamed from launcher/pages/global/MultiMCPage.ui)14
-rw-r--r--launcher/pages/global/MinecraftPage.cpp6
-rw-r--r--launcher/pages/global/MinecraftPage.h4
-rw-r--r--launcher/pages/global/PasteEEPage.cpp6
-rw-r--r--launcher/pages/global/PasteEEPage.h4
-rw-r--r--launcher/pages/global/ProxyPage.cpp6
-rw-r--r--launcher/pages/global/ProxyPage.h4
-rw-r--r--launcher/pages/global/ProxyPage.ui4
-rw-r--r--launcher/pages/instance/GameOptionsPage.h4
-rw-r--r--launcher/pages/instance/InstanceSettingsPage.cpp14
-rw-r--r--launcher/pages/instance/InstanceSettingsPage.h4
-rw-r--r--launcher/pages/instance/LegacyUpgradePage.cpp6
-rw-r--r--launcher/pages/instance/LegacyUpgradePage.h4
-rw-r--r--launcher/pages/instance/LegacyUpgradePage.ui2
-rw-r--r--launcher/pages/instance/LogPage.cpp30
-rw-r--r--launcher/pages/instance/LogPage.h4
-rw-r--r--launcher/pages/instance/ModFolderPage.cpp4
-rw-r--r--launcher/pages/instance/ModFolderPage.h4
-rw-r--r--launcher/pages/instance/NotesPage.h6
-rw-r--r--launcher/pages/instance/OtherLogsPage.cpp4
-rw-r--r--launcher/pages/instance/OtherLogsPage.h4
-rw-r--r--launcher/pages/instance/ScreenshotsPage.cpp4
-rw-r--r--launcher/pages/instance/ScreenshotsPage.h4
-rw-r--r--launcher/pages/instance/ServersPage.cpp4
-rw-r--r--launcher/pages/instance/ServersPage.h4
-rw-r--r--launcher/pages/instance/VersionPage.cpp18
-rw-r--r--launcher/pages/instance/WorldListPage.cpp8
-rw-r--r--launcher/pages/instance/WorldListPage.h4
-rw-r--r--launcher/pages/modplatform/ImportPage.cpp2
-rw-r--r--launcher/pages/modplatform/ImportPage.h4
-rw-r--r--launcher/pages/modplatform/VanillaPage.cpp2
-rw-r--r--launcher/pages/modplatform/VanillaPage.h4
-rw-r--r--launcher/pages/modplatform/atlauncher/AtlListModel.cpp4
-rw-r--r--launcher/pages/modplatform/atlauncher/AtlPage.cpp2
-rw-r--r--launcher/pages/modplatform/atlauncher/AtlPage.h4
-rw-r--r--launcher/pages/modplatform/flame/FlameModel.cpp4
-rw-r--r--launcher/pages/modplatform/flame/FlamePage.cpp2
-rw-r--r--launcher/pages/modplatform/flame/FlamePage.h4
-rw-r--r--launcher/pages/modplatform/ftb/FtbListModel.cpp4
-rw-r--r--launcher/pages/modplatform/ftb/FtbPage.h4
-rw-r--r--launcher/pages/modplatform/legacy_ftb/ListModel.cpp4
-rw-r--r--launcher/pages/modplatform/legacy_ftb/Page.cpp2
-rw-r--r--launcher/pages/modplatform/legacy_ftb/Page.h4
-rw-r--r--launcher/pages/modplatform/technic/TechnicModel.cpp4
-rw-r--r--launcher/pages/modplatform/technic/TechnicPage.cpp2
-rw-r--r--launcher/pages/modplatform/technic/TechnicPage.h4
-rw-r--r--launcher/resources/MultiMC.icnsbin782703 -> 0 bytes
-rw-r--r--launcher/resources/MultiMC.icobin55224 -> 0 bytes
-rw-r--r--launcher/resources/OSX/OSX.qrc3
-rw-r--r--