aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-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.txt24
-rw-r--r--flake.nix4
-rw-r--r--launcher/Application.cpp6
-rw-r--r--launcher/CMakeLists.txt3
-rw-r--r--launcher/FileSystem.cpp187
-rw-r--r--launcher/FileSystem.h5
-rw-r--r--launcher/InstanceCreationTask.cpp8
-rw-r--r--launcher/InstanceImportTask.cpp10
-rw-r--r--launcher/MMCZip.cpp27
-rw-r--r--launcher/MMCZip.h4
-rw-r--r--launcher/minecraft/Agent.h2
-rw-r--r--launcher/minecraft/MinecraftInstance.cpp6
-rw-r--r--launcher/minecraft/PackProfile.cpp82
-rw-r--r--launcher/minecraft/PackProfile.h7
-rw-r--r--launcher/minecraft/mod/ResourcePack.cpp7
-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/modplatform/flame/FileResolvingTask.cpp20
-rw-r--r--launcher/modplatform/flame/FlameInstanceCreationTask.cpp1
-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.qrc1
-rw-r--r--launcher/resources/breeze_dark/scalable/shortcut.svg18
-rw-r--r--launcher/resources/breeze_light/breeze_light.qrc1
-rw-r--r--launcher/resources/breeze_light/scalable/shortcut.svg18
-rw-r--r--launcher/resources/flat/flat.qrc1
-rw-r--r--launcher/resources/flat/scalable/shortcut.svg3
-rw-r--r--launcher/resources/flat_white/flat_white.qrc1
-rw-r--r--launcher/resources/flat_white/scalable/shortcut.svg3
-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/magitech.png)bin23097 -> 23097 bytes
-rw-r--r--launcher/resources/multimc/128x128/instances/meat_legacy.png (renamed from launcher/resources/multimc/128x128/instances/meat.png)bin10583 -> 10583 bytes
-rw-r--r--launcher/resources/multimc/128x128/instances/netherstar_legacy.png (renamed from launcher/resources/multimc/128x128/instances/netherstar.png)bin14062 -> 14062 bytes
-rw-r--r--launcher/resources/multimc/128x128/instances/skeleton_legacy.png (renamed from launcher/resources/multimc/128x128/instances/skeleton.png)bin3673 -> 3673 bytes
-rw-r--r--launcher/resources/multimc/128x128/instances/squarecreeper_legacy.png (renamed from launcher/resources/multimc/128x128/instances/squarecreeper.png)bin9136 -> 9136 bytes
-rw-r--r--launcher/resources/multimc/128x128/instances/steve_legacy.png (renamed from launcher/resources/multimc/128x128/instances/steve.png)bin4312 -> 4312 bytes
-rw-r--r--launcher/resources/multimc/32x32/instances/brick_legacy.png (renamed from launcher/resources/multimc/32x32/instances/brick.png)bin2388 -> 2388 bytes
-rw-r--r--launcher/resources/multimc/32x32/instances/chicken_legacy.png (renamed from launcher/resources/multimc/32x32/instances/chicken.png)bin1181 -> 1181 bytes
-rw-r--r--launcher/resources/multimc/32x32/instances/creeper_legacy.png (renamed from launcher/resources/multimc/32x32/instances/creeper.png)bin1524 -> 1524 bytes
-rw-r--r--launcher/resources/multimc/32x32/instances/diamond_legacy.png (renamed from launcher/resources/multimc/32x32/instances/diamond.png)bin2444 -> 2444 bytes
-rw-r--r--launcher/resources/multimc/32x32/instances/dirt_legacy.png (renamed from launcher/resources/multimc/32x32/instances/dirt.png)bin482 -> 482 bytes
-rw-r--r--launcher/resources/multimc/32x32/instances/enderpearl_legacy.png (renamed from launcher/resources/multimc/32x32/instances/enderpearl.png)bin2120 -> 2120 bytes
-rw-r--r--launcher/resources/multimc/32x32/instances/ftb_logo_legacy.png (renamed from launcher/resources/multimc/32x32/instances/ftb_logo.png)bin1607 -> 1607 bytes
-rw-r--r--launcher/resources/multimc/32x32/instances/gear_legacy.png (renamed from launcher/resources/multimc/32x32/instances/gear.png)bin2414 -> 2414 bytes
-rw-r--r--launcher/resources/multimc/32x32/instances/gold_legacy.png (renamed from launcher/resources/multimc/32x32/instances/gold.png)bin2366 -> 2366 bytes
-rw-r--r--launcher/resources/multimc/32x32/instances/grass_legacy.png (renamed from launcher/resources/multimc/32x32/instances/grass.png)bin618 -> 618 bytes
-rw-r--r--launcher/resources/multimc/32x32/instances/herobrine_legacy.png (renamed from launcher/resources/multimc/32x32/instances/herobrine.png)bin1034 -> 1034 bytes
-rw-r--r--launcher/resources/multimc/32x32/instances/infinity_legacy.png (renamed from launcher/resources/multimc/32x32/instances/infinity.png)bin1714 -> 1714 bytes
-rw-r--r--launcher/resources/multimc/32x32/instances/iron_legacy.png (renamed from launcher/resources/multimc/32x32/instances/iron.png)bin1772 -> 1772 bytes
-rw-r--r--launcher/resources/multimc/32x32/instances/magitech_legacy.png (renamed from launcher/resources/multimc/32x32/instances/magitech.png)bin2646 -> 2646 bytes
-rw-r--r--launcher/resources/multimc/32x32/instances/meat_legacy.png (renamed from launcher/resources/multimc/32x32/instances/meat.png)bin1514 -> 1514 bytes
-rw-r--r--launcher/resources/multimc/32x32/instances/netherstar_legacy.png (renamed from launcher/resources/multimc/32x32/instances/netherstar.png)bin1942 -> 1942 bytes
-rw-r--r--launcher/resources/multimc/32x32/instances/planks_legacy.png (renamed from launcher/resources/multimc/32x32/instances/planks.png)bin2299 -> 2299 bytes
-rw-r--r--launcher/resources/multimc/32x32/instances/skeleton_legacy.png (renamed from launcher/resources/multimc/32x32/instances/skeleton.png)bin696 -> 696 bytes
-rw-r--r--launcher/resources/multimc/32x32/instances/squarecreeper_legacy.png (renamed from launcher/resources/multimc/32x32/instances/squarecreeper.png)bin1623 -> 1623 bytes
-rw-r--r--launcher/resources/multimc/32x32/instances/steve_legacy.png (renamed from launcher/resources/multimc/32x32/instances/steve.png)bin969 -> 969 bytes
-rw-r--r--launcher/resources/multimc/32x32/instances/stone_legacy.png (renamed from launcher/resources/multimc/32x32/instances/stone.png)bin1866 -> 1866 bytes
-rw-r--r--launcher/resources/multimc/32x32/instances/tnt_legacy.png (renamed from launcher/resources/multimc/32x32/instances/tnt.png)bin378 -> 378 bytes
-rw-r--r--launcher/resources/multimc/50x50/instances/enderman_legacy.png (renamed from launcher/resources/multimc/50x50/instances/enderman.png)bin2429 -> 2429 bytes
-rw-r--r--launcher/resources/multimc/multimc.qrc114
-rw-r--r--launcher/resources/multimc/scalable/delete.svg282
-rw-r--r--launcher/resources/multimc/scalable/export.svg466
-rw-r--r--launcher/resources/multimc/scalable/instances/bee.svg289
-rw-r--r--launcher/resources/multimc/scalable/instances/bee_legacy.svg159
-rw-r--r--launcher/resources/multimc/scalable/instances/brick.svg67
-rw-r--r--launcher/resources/multimc/scalable/instances/chicken.svg130
-rw-r--r--launcher/resources/multimc/scalable/instances/creeper.svg68
-rw-r--r--launcher/resources/multimc/scalable/instances/diamond.svg62
-rw-r--r--launcher/resources/multimc/scalable/instances/dirt.svg52
-rw-r--r--launcher/resources/multimc/scalable/instances/enderman.svg96
-rw-r--r--launcher/resources/multimc/scalable/instances/enderpearl.svg95
-rw-r--r--launcher/resources/multimc/scalable/instances/flame.svg49
-rw-r--r--launcher/resources/multimc/scalable/instances/fox.svg435
-rw-r--r--launcher/resources/multimc/scalable/instances/fox_legacy.svg290
-rw-r--r--launcher/resources/multimc/scalable/instances/ftb_logo.svg82
-rw-r--r--launcher/resources/multimc/scalable/instances/gear.svg68
-rw-r--r--launcher/resources/multimc/scalable/instances/gold.svg63
-rw-r--r--launcher/resources/multimc/scalable/instances/grass.svg84
-rw-r--r--launcher/resources/multimc/scalable/instances/herobrine.svg111
-rw-r--r--launcher/resources/multimc/scalable/instances/iron.svg178
-rw-r--r--launcher/resources/multimc/scalable/instances/magitech.svg85
-rw-r--r--launcher/resources/multimc/scalable/instances/meat.svg121
-rw-r--r--launcher/resources/multimc/scalable/instances/modrinth.svg74
-rw-r--r--launcher/resources/multimc/scalable/instances/netherstar.svg81
-rw-r--r--launcher/resources/multimc/scalable/instances/planks.svg93
-rw-r--r--launcher/resources/multimc/scalable/instances/skeleton.svg134
-rw-r--r--launcher/resources/multimc/scalable/instances/squarecreeper.svg81
-rw-r--r--launcher/resources/multimc/scalable/instances/steve.svg154
-rw-r--r--launcher/resources/multimc/scalable/instances/stone.svg55
-rw-r--r--launcher/resources/multimc/scalable/instances/tnt.svg126
-rw-r--r--launcher/resources/multimc/scalable/launch.svg96
-rw-r--r--launcher/resources/multimc/scalable/rename.svg437
-rw-r--r--launcher/resources/multimc/scalable/shortcut.svg157
-rw-r--r--launcher/resources/multimc/scalable/tag.svg398
-rw-r--r--launcher/resources/pe_blue/pe_blue.qrc1
-rw-r--r--launcher/resources/pe_blue/scalable/shortcut.svg41
-rw-r--r--launcher/resources/pe_colored/pe_colored.qrc1
-rw-r--r--launcher/resources/pe_colored/scalable/shortcut.svg13
-rw-r--r--launcher/resources/pe_dark/pe_dark.qrc1
-rw-r--r--launcher/resources/pe_dark/scalable/shortcut.svg41
-rw-r--r--launcher/resources/pe_light/pe_light.qrc1
-rw-r--r--launcher/resources/pe_light/scalable/shortcut.svg41
-rw-r--r--launcher/ui/MainWindow.cpp187
-rw-r--r--launcher/ui/MainWindow.h2
-rw-r--r--launcher/ui/dialogs/ImportResourcePackDialog.cpp66
-rw-r--r--launcher/ui/dialogs/ImportResourcePackDialog.h27
-rw-r--r--launcher/ui/dialogs/ImportResourcePackDialog.ui74
-rw-r--r--launcher/ui/pages/global/JavaPage.cpp34
-rw-r--r--launcher/ui/pages/global/JavaPage.h3
-rw-r--r--launcher/ui/pages/global/JavaPage.ui82
-rw-r--r--launcher/ui/pages/instance/ExternalResourcesPage.cpp11
-rw-r--r--launcher/ui/pages/instance/ExternalResourcesPage.h1
-rw-r--r--launcher/ui/pages/instance/InstanceSettingsPage.cpp35
-rw-r--r--launcher/ui/pages/instance/InstanceSettingsPage.h3
-rw-r--r--launcher/ui/pages/instance/InstanceSettingsPage.ui67
-rw-r--r--launcher/ui/pages/instance/ModFolderPage.cpp2
-rw-r--r--launcher/ui/pages/instance/ModFolderPage.h2
-rw-r--r--launcher/ui/pages/instance/VersionPage.cpp16
-rw-r--r--launcher/ui/pages/instance/VersionPage.h4
-rw-r--r--launcher/ui/pages/instance/VersionPage.ui9