aboutsummaryrefslogtreecommitdiff
path: root/launcher
diff options
context:
space:
mode:
Diffstat (limited to 'launcher')
-rw-r--r--launcher/Application.cpp42
-rw-r--r--launcher/Application.h3
-rw-r--r--launcher/BaseInstaller.h5
-rw-r--r--launcher/BaseVersion.h5
-rw-r--r--launcher/BaseVersionList.cpp10
-rw-r--r--launcher/BaseVersionList.h8
-rw-r--r--launcher/CMakeLists.txt1
-rw-r--r--launcher/DesktopServices.cpp19
-rw-r--r--launcher/DesktopServices.h2
-rw-r--r--launcher/FileSystem.cpp37
-rw-r--r--launcher/GZip.cpp4
-rw-r--r--launcher/HoeDown.h2
-rw-r--r--launcher/java/JavaInstallList.cpp10
-rw-r--r--launcher/java/JavaInstallList.h6
-rw-r--r--launcher/java/JavaUtils.cpp12
-rw-r--r--launcher/main.cpp1
-rw-r--r--launcher/meta/Index.cpp16
-rw-r--r--launcher/meta/Index.h17
-rw-r--r--launcher/meta/JsonFormat.cpp18
-rw-r--r--launcher/meta/Version.cpp4
-rw-r--r--launcher/meta/Version.h11
-rw-r--r--launcher/meta/VersionList.cpp30
-rw-r--r--launcher/meta/VersionList.h32
-rw-r--r--launcher/minecraft/VanillaInstanceCreationTask.cpp2
-rw-r--r--launcher/minecraft/VanillaInstanceCreationTask.h8
-rw-r--r--launcher/minecraft/launch/VerifyJavaInstall.cpp2
-rw-r--r--launcher/modplatform/atlauncher/ATLPackInstallTask.cpp11
-rw-r--r--launcher/modplatform/atlauncher/ATLPackInstallTask.h8
-rw-r--r--launcher/modplatform/flame/FileResolvingTask.cpp33
-rw-r--r--launcher/modplatform/flame/FileResolvingTask.h3
-rw-r--r--launcher/modplatform/helpers/NetworkModAPI.cpp1
-rw-r--r--launcher/modplatform/modrinth/ModrinthPackIndex.cpp55
-rw-r--r--launcher/resources/OSX/OSX.qrc1
-rw-r--r--launcher/resources/OSX/scalable/launch.svg33
-rw-r--r--launcher/resources/OSX/scalable/launcher.svg14
-rw-r--r--launcher/resources/backgrounds/backgrounds.qrc12
-rw-r--r--launcher/resources/backgrounds/kitteh-bday.png (renamed from launcher/resources/backgrounds/cattiversary.png)bin99736 -> 99736 bytes
-rw-r--r--launcher/resources/backgrounds/kitteh-xmas.png (renamed from launcher/resources/backgrounds/catmas.png)bin72818 -> 72818 bytes
-rw-r--r--launcher/resources/backgrounds/kitteh.png (renamed from launcher/resources/backgrounds/catbgrnd2.png)bin62973 -> 62973 bytes
-rw-r--r--launcher/resources/backgrounds/rory-bday.pngbin0 -> 83235 bytes
-rw-r--r--launcher/resources/backgrounds/rory-flat-bday.pngbin0 -> 57713 bytes
-rw-r--r--launcher/resources/backgrounds/rory-flat-xmas.pngbin0 -> 59495 bytes
-rw-r--r--launcher/resources/backgrounds/rory-flat.pngbin0 -> 52337 bytes
-rw-r--r--launcher/resources/backgrounds/rory-xmas.pngbin0 -> 85543 bytes
-rw-r--r--launcher/resources/backgrounds/rory.pngbin0 -> 76448 bytes
-rw-r--r--launcher/resources/flat/flat.qrc1
-rw-r--r--launcher/resources/flat/scalable/launch.svg16
-rw-r--r--launcher/resources/flat/scalable/launcher.svg14
-rw-r--r--launcher/resources/flat_white/flat_white.qrc51
-rw-r--r--launcher/resources/flat_white/index.theme11
-rw-r--r--launcher/resources/flat_white/scalable/about.svg3
-rw-r--r--launcher/resources/flat_white/scalable/accounts.svg3
-rw-r--r--launcher/resources/flat_white/scalable/bug.svg3
-rw-r--r--launcher/resources/flat_white/scalable/cat.svg3
-rw-r--r--launcher/resources/flat_white/scalable/centralmods.svg3
-rw-r--r--launcher/resources/flat_white/scalable/checkupdate.svg3
-rw-r--r--launcher/resources/flat_white/scalable/copy.svg3
-rw-r--r--launcher/resources/flat_white/scalable/coremods.svg3
-rw-r--r--launcher/resources/flat_white/scalable/custom-commands.svg86
-rw-r--r--launcher/resources/flat_white/scalable/delete.svg5
-rw-r--r--launcher/resources/flat_white/scalable/discord.svg4
-rw-r--r--launcher/resources/flat_white/scalable/export.svg5
-rw-r--r--launcher/resources/flat_white/scalable/externaltools.svg3
-rw-r--r--launcher/resources/flat_white/scalable/help.svg17
-rw-r--r--launcher/resources/flat_white/scalable/instance-settings.svg3
-rw-r--r--launcher/resources/flat_white/scalable/jarmods.svg3
-rw-r--r--launcher/resources/flat_white/scalable/java.svg3
-rw-r--r--launcher/resources/flat_white/scalable/language.svg103
-rw-r--r--launcher/resources/flat_white/scalable/launch.svg16
-rw-r--r--launcher/resources/flat_white/scalable/launcher.svg2
-rw-r--r--launcher/resources/flat_white/scalable/loadermods.svg3
-rw-r--r--launcher/resources/flat_white/scalable/log.svg3
-rw-r--r--launcher/resources/flat_white/scalable/minecraft.svg3
-rw-r--r--launcher/resources/flat_white/scalable/multimc.svg3
-rw-r--r--launcher/resources/flat_white/scalable/new.svg3
-rw-r--r--launcher/resources/flat_white/scalable/news.svg3
-rw-r--r--launcher/resources/flat_white/scalable/notes.svg3
-rw-r--r--launcher/resources/flat_white/scalable/packages.svg3
-rw-r--r--launcher/resources/flat_white/scalable/patreon.svg3
-rw-r--r--launcher/resources/flat_white/scalable/proxy.svg3
-rw-r--r--launcher/resources/flat_white/scalable/quickmods.svg3
-rw-r--r--launcher/resources/flat_white/scalable/reddit-alien.svg3
-rw-r--r--launcher/resources/flat_white/scalable/refresh.svg3
-rw-r--r--launcher/resources/flat_white/scalable/rename.svg4
-rw-r--r--launcher/resources/flat_white/scalable/resourcepacks.svg3
-rw-r--r--launcher/resources/flat_white/scalable/screenshot-placeholder.svg3
-rw-r--r--launcher/resources/flat_white/scalable/screenshots.svg3
-rw-r--r--launcher/resources/flat_white/scalable/settings.svg3
-rw-r--r--launcher/resources/flat_white/scalable/shaderpacks.svg56
-rw-r--r--launcher/resources/flat_white/scalable/star.svg3
-rw-r--r--launcher/resources/flat_white/scalable/status-bad.svg3
-rw-r--r--launcher/resources/flat_white/scalable/status-good.svg3
-rw-r--r--launcher/resources/flat_white/scalable/status-running.svg3
-rw-r--r--launcher/resources/flat_white/scalable/status-yellow.svg3
-rw-r--r--launcher/resources/flat_white/scalable/tag.svg4
-rw-r--r--launcher/resources/flat_white/scalable/viewfolder.svg3
-rw-r--r--launcher/resources/flat_white/scalable/worlds.svg3
-rw-r--r--launcher/resources/iOS/iOS.qrc1
-rw-r--r--launcher/resources/iOS/scalable/launch.svg17
-rw-r--r--launcher/resources/iOS/scalable/launcher.svg14
-rw-r--r--launcher/resources/multimc/scalable/launcher.svg14
-rw-r--r--launcher/resources/pe_blue/pe_blue.qrc1
-rw-r--r--launcher/resources/pe_blue/scalable/launch.svg20
-rw-r--r--launcher/resources/pe_blue/scalable/launcher.svg14
-rw-r--r--launcher/resources/pe_colored/pe_colored.qrc1
-rw-r--r--launcher/resources/pe_colored/scalable/launch.svg23
-rw-r--r--launcher/resources/pe_colored/scalable/launcher.svg14
-rw-r--r--launcher/resources/pe_dark/pe_dark.qrc1
-rw-r--r--launcher/resources/pe_dark/scalable/launch.svg17
-rw-r--r--launcher/resources/pe_dark/scalable/launcher.svg14
-rw-r--r--launcher/resources/pe_light/pe_light.qrc1
-rw-r--r--launcher/resources/pe_light/scalable/launch.svg17
-rw-r--r--launcher/resources/pe_light/scalable/launcher.svg14
-rw-r--r--launcher/tasks/Task.cpp2
-rw-r--r--launcher/translations/TranslationsModel.cpp6
-rw-r--r--launcher/ui/MainWindow.cpp50
-rw-r--r--launcher/ui/dialogs/AboutDialog.cpp9
-rw-r--r--launcher/ui/dialogs/AboutDialog.ui13
-rw-r--r--launcher/ui/dialogs/ModUpdateDialog.cpp15
-rw-r--r--launcher/ui/dialogs/ProgressDialog.cpp2
-rw-r--r--launcher/ui/dialogs/VersionSelectDialog.cpp2
-rw-r--r--