aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2022-12-14 23:22:27 +0100
committerSefa Eyeoglu <contact@scrumplex.net>2022-12-14 23:22:27 +0100
commit849b92665e0762a38a7e17403015e2b037318aec (patch)
tree2fbeac111297727aa6613aacc08e80dcec5c3724
parentfdbd8d9d2b2e04cd68fd800882309b40c05aba2c (diff)
parentd193ed9eebb392b259edb88a227dce4cee773df6 (diff)
downloadPrismLauncher-849b92665e0762a38a7e17403015e2b037318aec.tar.gz
PrismLauncher-849b92665e0762a38a7e17403015e2b037318aec.tar.bz2
PrismLauncher-849b92665e0762a38a7e17403015e2b037318aec.zip
Merge branch 'develop' into remove-updater
-rw-r--r--.github/workflows/build.yml121
-rw-r--r--.github/workflows/trigger_builds.yml3
-rw-r--r--.github/workflows/trigger_release.yml31
-rw-r--r--CMakeLists.txt26
-rw-r--r--COPYING.md25
-rw-r--r--buildconfig/BuildConfig.h2
-rw-r--r--flake.nix4
-rw-r--r--launcher/Application.cpp26
-rw-r--r--launcher/CMakeLists.txt17
-rw-r--r--launcher/FileSystem.cpp187
-rw-r--r--launcher/FileSystem.h5
-rw-r--r--launcher/InstanceCopyTask.cpp6
-rw-r--r--launcher/InstanceCreationTask.cpp8
-rw-r--r--launcher/InstanceImportTask.cpp55
-rw-r--r--launcher/InstanceImportTask.h6
-rw-r--r--launcher/InstanceList.cpp17
-rw-r--r--launcher/InstanceList.h2
-rw-r--r--launcher/InstancePageProvider.h2
-rw-r--r--launcher/InstanceTask.cpp23
-rw-r--r--launcher/InstanceTask.h17
-rw-r--r--launcher/MMCTime.cpp6
-rw-r--r--launcher/MMCZip.cpp27
-rw-r--r--launcher/MMCZip.h4
-rw-r--r--launcher/MTPixmapCache.h95
-rw-r--r--launcher/MangoHud.cpp90
-rw-r--r--launcher/MangoHud.h27
-rw-r--r--launcher/icons/IconList.cpp19
-rw-r--r--launcher/icons/IconList.h1
-rw-r--r--launcher/minecraft/Agent.h2
-rw-r--r--launcher/minecraft/MinecraftInstance.cpp27
-rw-r--r--launcher/minecraft/PackProfile.cpp82
-rw-r--r--launcher/minecraft/PackProfile.h7
-rw-r--r--launcher/minecraft/mod/ResourcePack.cpp21
-rw-r--r--launcher/minecraft/mod/ResourcePack.h2
-rw-r--r--launcher/minecraft/mod/TexturePack.cpp5
-rw-r--r--launcher/minecraft/mod/TexturePack.h2
-rw-r--r--launcher/minecraft/mod/tasks/LocalResourcePackParseTask.cpp27
-rw-r--r--launcher/minecraft/mod/tasks/LocalResourcePackParseTask.h12
-rw-r--r--launcher/minecraft/mod/tasks/LocalTexturePackParseTask.cpp27
-rw-r--r--launcher/minecraft/mod/tasks/LocalTexturePackParseTask.h12
-rw-r--r--launcher/minecraft/update/LibrariesTask.cpp2
-rw-r--r--launcher/modplatform/flame/FileResolvingTask.cpp20
-rw-r--r--launcher/modplatform/flame/FlameInstanceCreationTask.cpp118
-rw-r--r--launcher/modplatform/flame/FlameInstanceCreationTask.h51
-rw-r--r--launcher/modplatform/modpacksch/FTBPackInstallTask.cpp18
-rw-r--r--launcher/modplatform/modpacksch/FTBPackInstallTask.h2
-rw-r--r--launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp60
-rw-r--r--launcher/modplatform/modrinth/ModrinthInstanceCreationTask.h16
-rw-r--r--launcher/modplatform/modrinth/ModrinthPackManifest.cpp1
-rw-r--r--launcher/modplatform/modrinth/ModrinthPackManifest.h1
-rw-r--r--launcher/resources/OSX/OSX.qrc1
-rw-r--r--launcher/resources/OSX/scalable/shortcut.svg14
-rw-r--r--launcher/resources/breeze_dark/breeze_dark.qrc3
-rw-r--r--launcher/resources/breeze_dark/scalable/discord.svg2
-rw-r--r--launcher/resources/breeze_dark/scalable/new.svg15
-rw-r--r--launcher/resources/breeze_dark/scalable/server.svg13
-rw-r--r--launcher/resources/breeze_dark/scalable/shortcut.svg18
-rw-r--r--launcher/resources/breeze_light/breeze_light.qrc3
-rw-r--r--launcher/resources/breeze_light/scalable/centralmods.svg2
-rw-r--r--launcher/resources/breeze_light/scalable/coremods.svg2
-rw-r--r--launcher/resources/breeze_light/scalable/discord.svg2
-rw-r--r--launcher/resources/breeze_light/scalable/jarmods.svg2
-rw-r--r--launcher/resources/breeze_light/scalable/new.svg15
-rw-r--r--launcher/resources/breeze_light/scalable/server.svg13
-rw-r--r--launcher/resources/breeze_light/scalable/shortcut.svg18
-rw-r--r--launcher/resources/flat/flat.qrc2
-rw-r--r--launcher/resources/flat/scalable/server.svg44
-rw-r--r--launcher/resources/flat/scalable/shortcut.svg3
-rw-r--r--launcher/resources/flat_white/flat_white.qrc2
-rw-r--r--launcher/resources/flat_white/scalable/about.svg4
-rw-r--r--launcher/resources/flat_white/scalable/accounts.svg4
-rw-r--r--launcher/resources/flat_white/scalable/bug.svg4
-rw-r--r--launcher/resources/flat_white/scalable/cat.svg4
-rw-r--r--launcher/resources/flat_white/scalable/centralmods.svg4
-rw-r--r--launcher/resources/flat_white/scalable/checkupdate.svg4
-rw-r--r--launcher/resources/flat_white/scalable/copy.svg4
-rw-r--r--launcher/resources/flat_white/scalable/coremods.svg4
-rw-r--r--launcher/resources/flat_white/scalable/custom-commands.svg2
-rw-r--r--launcher/resources/flat_white/scalable/delete.svg6
-rw-r--r--launcher/resources/flat_white/scalable/discord.svg4
-rw-r--r--launcher/resources/flat_white/scalable/export.svg4
-rw-r--r--launcher/resources/flat_white/scalable/externaltools.svg4
-rw-r--r--launcher/resources/flat_white/scalable/help.svg2
-rw-r--r--launcher/resources/flat_white/scalable/instance-settings.svg4
-rw-r--r--launcher/resources/flat_white/scalable/jarmods.svg4
-rw-r--r--launcher/resources/flat_white/scalable/java.svg4
-rw-r--r--launcher/resources/flat_white/scalable/language.svg2
-rw-r--r--launcher/resources/flat_white/scalable/launch.svg2
-rw-r--r--launcher/resources/flat_white/scalable/launcher.svg2
-rw-r--r--launcher/resources/flat_white/scalable/loadermods.svg4
-rw-r--r--launcher/resources/flat_white/scalable/log.svg4
-rw-r--r--launcher/resources/flat_white/scalable/minecraft.svg4
-rw-r--r--launcher/resources/flat_white/scalable/multimc.svg4
-rw-r--r--launcher/resources/flat_white/scalable/new.svg4
-rw-r--r--launcher/resources/flat_white/scalable/news.svg4
-rw-r--r--launcher/resources/flat_white/scalable/notes.svg4
-rw-r--r--launcher/resources/flat_white/scalable/packages.svg4
-rw-r--r--launcher/resources/flat_white/scalable/patreon.svg4
-rw-r--r--launcher/resources/flat_white/scalable/proxy.svg4
-rw-r--r--launcher/resources/flat_white/scalable/quickmods.svg4
-rw-r--r--launcher/resources/flat_white/scalable/reddit-alien.svg4
-rw-r--r--launcher/resources/flat_white/scalable/refresh.svg4
-rw-r--r--launcher/resources/flat_white/scalable/rename.svg4
-rw-r--r--launcher/resources/flat_white/scalable/resourcepacks.svg4
-rw-r--r--launcher/resources/flat_white/scalable/screenshot-placeholder.svg4
-rw-r--r--launcher/resources/flat_white/scalable/screenshots.svg4
-rw-r--r--launcher/resources/flat_white/scalable/server.svg1
-rw-r--r--launcher/resources/flat_white/scalable/settings.svg4
-rw-r--r--launcher/resources/flat_white/scalable/shaderpacks.svg8
-rw-r--r--launcher/resources/flat_white/scalable/shortcut.svg3
-rw-r--r--launcher/resources/flat_white/scalable/star.svg4
-rw-r--r--launcher/resources/flat_white/scalable/status-bad.svg4
-rw-r--r--launcher/resources/flat_white/scalable/status-good.svg4
-rw-r--r--launcher/resources/flat_white/scalable/status-running.svg4
-rw-r--r--launcher/resources/flat_white/scalable/status-yellow.svg4
-rw-r--r--launcher/resources/flat_white/scalable/tag.svg6
-rw-r--r--launcher/resources/flat_white/scalable/viewfolder.svg4
-rw-r--r--launcher/resources/flat_white/scalable/worlds.svg4
-rw-r--r--launcher/resources/iOS/iOS.qrc1
-rw-r--r--launcher/resources/iOS/scalable/shortcut.svg13
-rw-r--r--launcher/resources/multimc/128x128/instances/chicken_legacy.png (renamed from launcher/resources/multimc/128x128/instances/chicken.png)bin6369 -> 6369 bytes
-rw-r--r--launcher/resources/multimc/128x128/instances/creeper_legacy.png (renamed from launcher/resources/multimc/128x128/instances/creeper.png)bin9046 -> 9046 bytes
-rw-r--r--launcher/resources/multimc/128x128/instances/enderpearl_legacy.png (renamed from launcher/resources/multimc/128x128/instances/enderpearl.png)bin21425 -> 21425 bytes
-rw-r--r--launcher/resources/multimc/128x128/instances/flame_legacy.png (renamed from launcher/resources/multimc/128x128/instances/flame.png)bin6226 -> 6226 bytes
-rw-r--r--launcher/resources/multimc/128x128/instances/ftb_logo_legacy.png (renamed from launcher/resources/multimc/128x128/instances/ftb_logo.png)bin7883 -> 7883 bytes
-rw-r--r--launcher/resources/multimc/128x128/instances/gear_legacy.png (renamed from launcher/resources/multimc/128x128/instances/gear.png)bin18321 -> 18321 bytes
-rw-r--r--launcher/resources/multimc/128x128/instances/herobrine_legacy.png (renamed from launcher/resources/multimc/128x128/instances/herobrine.png)bin4937 -> 4937 bytes
-rw-r--r--launcher/resources/multimc/128x128/instances/infinity_legacy.png (renamed from launcher/resources/multimc/128x128/instances/infinity.png)bin8012 -> 8012 bytes
-rw-r--r--launcher/resources/multimc/128x128/instances/magitech_legacy.png (renamed from launcher/resources/multimc/128x128/instances/magitec