-
Notifications
You must be signed in to change notification settings - Fork 26
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge changes from Prism Launcher 9.1 #38
Conversation
Signed-off-by: Trial97 <[email protected]>
Signed-off-by: Trial97 <[email protected]>
Signed-off-by: Trial97 <[email protected]>
into feature/java-downloader Signed-off-by: Trial97 <[email protected]>
Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5e0ca22929f3342b19569b21b2f3462f053e497b?narHash=sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI%3D' (2024-08-09) → 'github:NixOS/nixpkgs/c3aa7b8938b17aebd2deecf7be0636000d62a2b9?narHash=sha256-med8%2B5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c%3D' (2024-08-14) • Updated input 'pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/c7012d0c18567c889b948781bc74a501e92275d1?narHash=sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q%3D' (2024-08-09) → 'github:cachix/pre-commit-hooks.nix/bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba?narHash=sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc%3D' (2024-08-16)
refactor MinecraftUpdate Task
replaced currentTextChanged with currentIndexChanged
Signed-off-by: Trial97 <[email protected]>
validate metadata on instance launch
Signed-off-by: Trial97 <[email protected]>
Signed-off-by: Trial97 <[email protected]>
Signed-off-by: Trial97 <[email protected]>
chore(nix): update lockfile
Signed-off-by: seth <[email protected]>
Signed-off-by: seth <[email protected]>
Signed-off-by: seth <[email protected]>
Signed-off-by: seth <[email protected]>
this allows to implictly pass `prismlauncher-unwrapped` it won't have an effect on our package set as directly inheriting from the scope we create filters out the extra attributes usually introduced with a scope Signed-off-by: seth <[email protected]>
The primary goals here include making the flake easier to contribute to by having it follow the standard boilerplate, while also limiting the size of our flake.lock to lower the chance of duplicate inputs for users Signed-off-by: seth <[email protected]>
Signed-off-by: seth <[email protected]>
overlays can cause issues we don't run into upstream, especially when used on stable channels for example. preferring the pure `packages` output also encourages the use of our binary cache by users, who probably don't like building the launcher all too much Signed-off-by: seth <[email protected]>
This reverts commit 8312713. See nix#9428. Path coercion like `"${./.}"` in flakes causes the path to be copied to the store twice; using the `self` argument works around this. However, as `lib.fileset` doesn't support using `self`, so we need to go back to `nix-filter` Signed-off-by: seth <[email protected]>
as we now create outputs for each system in `lib.systems.flakeExposed`, we should ensure garnix only builds the systems we officially support dev shells are also no longer built as they really don't need to be "built" on the developer's machine in any case; everything should be cached Signed-off-by: seth <[email protected]>
Signed-off-by: Trial97 <[email protected]>
Support for this is blocked by #37, which we can get to after the 9.0 release.
The add mojang button from the current version of fjord is also missing, is this intentional? |
Mojang accounts do not exist anymore, so yes |
Yet the previous version of Fjord still has the option there, and microsoft accounts haven't existed for over a year. |
Removing the Mojang account button was intentional, no reason to keep it around any longer. I might as well go ahead and rip out more of the Mojang account logic while I'm at it, like Prism already has. I'll look into that search bar. |
Not sure where those search bars came from :) I think everything is good to go, I will merge soon unless something else is found. |
Presuming the removal of the PollyMC contributors credit in the about section was intentional, I haven't come across any issues since! |
Yeah, that was a (old) change from upstream. |
Polly with two Ls, not the one under Lenny but understood! |
Oh whoops, no that was a mistake, I'll add that back. |
I think this should be reverted |
It was reverted. |
commit d2d6320e44674159ea2d89e675306ceaa3fb2d59 Author: Evan Goode <[email protected]> Date: Sun Jan 12 04:02:16 2025 +0000 README: Don't mention fjordlauncher-bin MPR package prismlauncher-bin [1] is out of date and so fjordlauncher-bin also hasn't been updated in a while. Not sure whether -bin packages are dangerous on MPR as they are on AUR, so we'll just omit it from the install instructions for now. [1] https://mpr.makedeb.org/packages/prismlauncher-bin commit 8cd807c2d6f4f98b8de5b48ed6595a33edce8ce8 Author: Evan Goode <[email protected]> Date: Sat Jan 11 19:37:53 2025 -0500 Fix FetchFlameAPIKey compile error commit ccc886b51fec06980a324188391b588d57e9ff79 Author: Evan Goode <[email protected]> Date: Sat Jan 11 19:19:36 2025 -0500 Re-enable built-in updater commit 594fa981ea8977c6f5fade037094cf0c4d0eb7da Merge: 936252e44 fdfdf2eef Author: Evan Goode <[email protected]> Date: Sat Jan 11 19:05:25 2025 -0500 Merge remote-tracking branch 'prismlauncher/release-9.x' into develop commit 936252e4455ab7179f21f2c765805e7e6689d10a Author: Evan Goode <[email protected]> Date: Tue Dec 31 11:28:38 2024 -0500 Not yet in nixpkgs Resolves #46 commit fdfdf2eef1f4ff4b91e0a2b3ac0001321729cdf0 Merge: 43dc330e5 bbfa5a5ed Author: Alexandru Ionut Tripon <[email protected]> Date: Thu Dec 19 10:34:01 2024 +0200 Merge pull request #3224 from Trial97/backport_fix_auto_mod_provider [backport]Fix automatically choose mod provider option commit bbfa5a5ed151d5d7966160f044de89a82550a264 Author: Trial97 <[email protected]> Date: Mon Dec 16 14:51:59 2024 +0200 Fix automatically choose mod provider option Signed-off-by: Trial97 <[email protected]> commit 43dc330e55e9cd4604e09e0fa2d2b54e6d0f9453 Merge: ca0dd583b 0c962dff5 Author: Alexandru Ionut Tripon <[email protected]> Date: Wed Dec 18 23:30:10 2024 +0200 Merge pull request #3223 from Trial97/backport_fix_flame_loader_match [backport]fix the flame loaders match commit 0c962dff599fda5818161d08e65ca7ff06cc7eb2 Author: Trial97 <[email protected]> Date: Fri Nov 1 13:44:06 2024 +0200 fix the flame loaders match Signed-off-by: Trial97 <[email protected]> commit ca0dd583bab6b0f64259bd301fabe27082b75d91 Merge: f8d3d8399 7bb686c85 Author: timoreo <[email protected]> Date: Wed Dec 18 19:53:32 2024 +0100 Merge pull request #3222 from PrismLauncher/backport-3197-to-release-9.x [Backport release-9.x] Do not fail curseforge import if modrinth file check fails commit 7bb686c85bab381fd8a2b4a8dc18e958f22c134d Author: Trial97 <[email protected]> Date: Thu Dec 12 17:29:46 2024 +0200 Do not fail curseforge import if modrinth file check fails Signed-off-by: Trial97 <[email protected]> (cherry picked from commit a1c1c0b769d77eb8c44cef3dc0966e7184b2ce78) commit f8d3d8399dfe8cba3ef2705217fd11bf69951c60 Merge: 072c495ec 9cb2a3ab2 Author: timoreo <[email protected]> Date: Wed Dec 18 19:42:58 2024 +0100 Merge pull request #3221 from PrismLauncher/backport-3214-to-release-9.x [Backport release-9.x] Correct symbolic link destination on manifest (Mojang) Java download commit 9cb2a3ab2d0aa89a081ce65f9a9c84f7c20493a5 Author: Kenneth Chew <[email protected]> Date: Mon Dec 16 02:27:26 2024 -0500 Correct symbolic link destination on manifest Java download Signed-off-by: Kenneth Chew <[email protected]> (cherry picked from commit 8d53242952ceeed11bd1a57c9ac43344d854ac8c) commit 072c495ec6395de3b8fc2ef018862cca6c58f61a Merge: ebeff36da 335941fb4 Author: Alexandru Ionut Tripon <[email protected]> Date: Sat Dec 14 18:39:04 2024 +0200 Merge pull request #3206 from PrismLauncher/backport-3202-to-release-9.x [Backport release-9.x] [macOS] Update Sparkle to v2.6.4 commit 335941fb46c8be4d6043bd882bb8c555ce648984 Author: Kenneth Chew <[email protected]> Date: Sat Dec 14 00:42:08 2024 -0500 Update Sparkle to v2.6.4 Signed-off-by: Kenneth Chew <[email protected]> (cherry picked from commit b6cd46ad27e8046962dcb7b3b43a973ff08564eb) commit ebeff36da57c81b9d76877dc734415dcbe3557c3 Merge: 87dc1bb6a 1d29f63be Author: Alexandru Ionut Tripon <[email protected]> Date: Sat Dec 14 18:34:38 2024 +0200 Merge pull request #3205 from PrismLauncher/backport-3199-to-release-9.x [Backport release-9.x] Fix tab order in launcher settings commit 1d29f63bec66f0dca653e4f1b75924172a6e25e5 Author: Kenneth Chew <[email protected]> Date: Thu Dec 12 14:53:39 2024 -0500 Fix tab order in launcher settings Signed-off-by: Kenneth Chew <[email protected]> (cherry picked from commit c3712ba6483f6386e2930ec0ed059d8c94f671b6) commit 87dc1bb6a6bc129dfbfefe38b18bd195dc2bd13e Merge: a85720b8d 4c28a94de Author: Alexandru Ionut Tripon <[email protected]> Date: Sat Dec 14 18:19:20 2024 +0200 Merge pull request #3204 from PrismLauncher/backport-3198-to-release-9.x [Backport release-9.x] [macOS] Add local network usage description commit a85720b8d6197bc3db8eb737384a2c1c59389cbd Merge: 577999bd3 344ae87f2 Author: Alexandru Ionut Tripon <[email protected]> Date: Sat Dec 14 18:19:09 2024 +0200 Merge pull request #3203 from PrismLauncher/backport-3181-to-release-9.x [Backport release-9.x] fix crash with invalid mrpack format commit 4c28a94de1ce8a64fa16c187379c4cb59b2bbf8b Author: Kenneth Chew <[email protected]> Date: Thu Dec 12 14:43:28 2024 -0500 Add local network usage description Signed-off-by: Kenneth Chew <[email protected]> (cherry picked from commit c3e44554abccfd16ff7f84740932848e59d28474) commit 344ae87f257f2d3bc706d7ebad56e405b2330165 Author: Trial97 <[email protected]> Date: Sun Dec 8 22:04:16 2024 +0200 fix crash with invalid mrpack format Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 1dd0728a58159bc835b2e7724a707776ae0b93ce) commit 577999bd356595c8c0f9923f1cfffa1e7cecf80f Merge: 7865b8128 887db29f3 Author: Alexandru Ionut Tripon <[email protected]> Date: Mon Dec 9 09:15:53 2024 +0200 Merge pull request #3183 from PrismLauncher/backport-3170-to-release-9.x [Backport release-9.x] [Linux] Don't use fallback icon search paths commit 887db29f35f7037994fbbdb8db3f5ebfcefe03bd Author: leia uwu <[email protected]> Date: Fri Dec 6 16:40:07 2024 -0300 fix icon theme search paths using fallback search paths breaks qadwaitadecorations Signed-off-by: leia uwu <[email protected]> (cherry picked from commit 614574f15c507f884fc2ceff74db8c919674a0f1) commit 7865b8128e1f44d4a52cc09b21ef501a0134673b Merge: d1a05d312 a58f12553 Author: Alexandru Ionut Tripon <[email protected]> Date: Fri Dec 6 08:47:51 2024 +0200 Merge pull request #3169 from PrismLauncher/backport-3166-to-release-9.x [Backport release-9.x] chore(deps): update actions/cache action to v4.2.0 commit a58f125535e45fea0bf9b955f9babba6afc524d9 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Thu Dec 5 20:29:11 2024 +0000 chore(deps): update actions/cache action to v4.2.0 (cherry picked from commit 94c893bd865ceba286dffc1d6392df07d47c11d9) commit d1a05d312d7fce8b9dd8f5dd6abc0c1570fb8c60 Merge: 189878e7e bbf21e582 Author: Alexandru Ionut Tripon <[email protected]> Date: Mon Dec 2 17:30:57 2024 +0200 Merge pull request #3158 from PrismLauncher/backport-3119-to-release-9.x [Backport release-9.x] Sync Flatpak manifest with Flathub's commit bbf21e5824a4e271e071c72aa3604b0ef1b012d3 Author: guihkx <[email protected]> Date: Tue Nov 26 13:51:09 2024 -0300 ci(flatpak): update build artifact name Just aligning the name of the Flatpak package with other build artifacts. Signed-off-by: guihkx <[email protected]> (cherry picked from commit e0faee7f262fda898ceb8ea5ab40249dbd6c52ea) commit 73b4223b6136898a76c12e4531f651aa0c529e16 Author: guihkx <[email protected]> Date: Tue Nov 26 13:51:09 2024 -0300 flatpak: update KDE runtime to 6.8 This also switches to the Docker image provided and maintained by Flathub collaborators through the 'flathub-infra' organization on GitHub, because it looks better maintained at the moment. Signed-off-by: guihkx <[email protected]> (cherry picked from commit f6770a847a8419ef0b1acab30144077f745a48ee) commit 686e0b7b189dd0dfa5852fe0e8c47ce439fdd577 Author: guihkx <[email protected]> Date: Tue Nov 26 13:51:09 2024 -0300 flatpak: update xrandr to 1.5.3 Signed-off-by: guihkx <[email protected]> (cherry picked from commit 4a50e949672461b5b69b039ff240ced6dad9bdd5) commit 189878e7e321b38898150e88a900dcadbd000dad Merge: cdfd0b100 af74d5f41 Author: Alexandru Ionut Tripon <[email protected]> Date: Mon Dec 2 16:25:06 2024 +0200 Merge pull request #3157 from PrismLauncher/backport-3135-to-release-9.x [Backport release-9.x] Make FTB Import note italic to match others commit af74d5f41012847ee3116bf38d3b40cc7996bee8 Author: Trial97 <[email protected]> Date: Sun Nov 24 20:29:07 2024 +0200 Make FTB Import note italic to match others Signed-off-by: Trial97 <[email protected]> (cherry picked from commit a09af619cee3265710097724f539d9457695658d) commit cdfd0b10027680346ea453dc4dc3171ba0951a9b Merge: e0c323a19 9791c306d Author: Tayou <[email protected]> Date: Mon Dec 2 15:02:21 2024 +0100 Merge pull request #3156 from PrismLauncher/backport-3152-to-release-9.x [Backport release-9.x] Fix system icons on Linux commit 9791c306dcd0ba4b33335c649fe56cc08e394193 Author: leia uwu <[email protected]> Date: Sat Nov 30 12:50:57 2024 -0300 fix: icon search paths memory leak Signed-off-by: leia uwu <[email protected]> (cherry picked from commit 3f67ef968bb9be3b1cdfdfa68e2d38ddf8e1a3cf) commit e7e9265c40a1621e5a7f7c08db47bc77dc859896 Author: leia uwu <[email protected]> Date: Sat Nov 30 11:30:25 2024 -0300 fix: fix system icons This sets the fallback icon theme to the current(system default) icon theme before launcher specific themes are applied And removes `Inherits` line of multimc/legacy icon theme because it can end up making it inherit a default theme set from /usr/share/icons/default/index.theme instead of the user configured theme (probably a qt bug?) Signed-off-by: leia uwu <[email protected]> (cherry picked from commit fd9c80db62436b1a364cb8342ba45a059c53f899) commit 687934433423b9d7c1014867f66f2bc73bd57c91 Author: Evan Goode <[email protected]> Date: Sat Nov 30 17:29:26 2024 -0500 chore(nix): nixfmt commit a5bca15d46ef5820340bed387003541777120da9 Author: Evan Goode <[email protected]> Date: Sat Nov 30 17:24:43 2024 -0500 chore(nix): sync with upstream Prism Launcher commit 7b5a2baa36a814bc332efc3469650e729502af07 Merge: 7516b3c70 70e662ca7 Author: Evan Goode <[email protected]> Date: Sat Nov 30 16:20:14 2024 -0500 Merge pull request #42 from ryze312/nix Nix: Update lock file and switch to addDriverRunpath commit 70e662ca7dafc30c9c00f0a6c4eccb4d2c5782f0 Author: Ryze <[email protected]> Date: Sat Nov 30 11:38:48 2024 +0300 nix: update lock file and switch to addDriverRunpath Signed-off-by: Ryze <[email protected]> commit 7516b3c70cf9910831ca3d2d119c6db78f88adfb Merge: e2de54b6b 8f44b6513 Author: Evan Goode <[email protected]> Date: Wed Nov 27 13:34:10 2024 -0500 Merge pull request #41 from unmojang/evan-goode/select-profile Add dialog to select profile if multiple availableProfiles commit 8f44b6513fefd228296f816010641c2198a21148 Author: Evan Goode <[email protected]> Date: Mon Nov 25 17:42:38 2024 -0500 Add dialog to select profile if multiple availableProfiles Resolves https://github.com/unmojang/FjordLauncher/issues/29 and obsoletes https://github.com/unmojang/FjordLauncher/pull/34. This implementation follows the authlib-injector specification: https://github.com/yushijinhun/authlib-injector/wiki/%E5%90%AF%E5%8A%A8%E5%99%A8%E6%8A%80%E6%9C%AF%E8%A7%84%E8%8C%83#%E8%B4%A6%E6%88%B7%E7%9A%84%E6%B7%BB%E5%8A%A0 ([Google translate to English](https://github-com.translate.goog/yushijinhun/authlib-injector/wiki/%E5%90%AF%E5%8A%A8%E5%99%A8%E6%8A%80%E6%9C%AF%E8%A7%84%E8%8C%83?_x_tr_sl=auto&_x_tr_tl=en&_x_tr_hl=en-US)) commit e0c323a190e1173ef41756f287b5585fe8423f85 Merge: d453240a9 a91474741 Author: Alexandru Ionut Tripon <[email protected]> Date: Mon Nov 25 12:09:01 2024 +0200 Merge pull request #3138 from PrismLauncher/backport-3130-to-release-9.x [Backport release-9.x] Improve MANIFEST.MF parsing commit a9147474169bdad603c139b5b8bad4e1912563d4 Author: Kationor <[email protected]> Date: Sun Nov 24 19:30:59 2024 +0100 Improve MANIFEST.MF parsing Previously, we would only properly parse LF-encoded manifests, and even those only if they used the recommended casing. This commit allows the parser to recognise CR and CRLF newlines, and also makes the name comparison case insensitive to align with the specification. (Though not completely: we still don't support multiline values) Signed-off-by: Kationor <[email protected]> (cherry picked from commit b40a1973bfe590fb21b486419a8d223b2c6aae7f) commit e2de54b6b3fdab5bbfa1ed2c7d05b4ee694628f6 Author: Evan Goode <[email protected]> Date: Sat Nov 23 16:32:40 2024 -0500 Add Spaceship and Phoebe catpack commit d453240a949c90a732f3203216ca4b2e2296a611 Merge: 2a4c4ed8e 4c4017d7c Author: Alexandru Ionut Tripon <[email protected]> Date: Fri Nov 15 10:35:25 2024 +0200 Merge pull request #3105 from Trial97/backport_3019 [Backport release-9.x] fixed double deletion for tasks commit 4c4017d7ca84162ff8c508d4b9f22a979d6c223e Author: Trial97 <[email protected]> Date: Mon Oct 28 19:13:14 2024 +0200 remove task parent from constuctor Signed-off-by: Trial97 <[email protected]> commit 2a4c4ed8ea001900210eb1853e792dc07c863109 Merge: 947fbf7d6 1c94a3e3e Author: Alexandru Ionut Tripon <[email protected]> Date: Fri Nov 15 08:55:46 2024 +0200 Merge pull request #3103 from PrismLauncher/backport-3024-to-release-9.x [Backport release-9.x] fix leak on resource search commit 947fbf7d644281b647b667b6841576be7eaf8c95 Merge: 6c6a4625a eefeb5799 Author: Alexandru Ionut Tripon <[email protected]> Date: Fri Nov 15 08:55:17 2024 +0200 Merge pull request #3102 from PrismLauncher/backport-3070-to-release-9.x [Backport release-9.x] Add scrollbar to Settings -> Launcher -> Features commit 1c94a3e3e5e6273216987041c926652c8bf6f34c Author: Trial97 <[email protected]> Date: Tue Oct 29 00:40:13 2024 +0200 fix leak on resource search Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 8e7d84d05beffac492522f4b2c0d9e638b15146b) commit eefeb5799df51ef7a1d634c84596553a2107555d Author: TheKodeToad <[email protected]> Date: Wed Nov 6 23:57:24 2024 +0000 Add scrollbar to Settings -> Launcher -> Features Signed-off-by: TheKodeToad <[email protected]> (cherry picked from commit 71e55f88294976577ad0b2f8c21b635cf8fc9735) commit 6c6a4625ab81ec7aeb47d56d8f527a979a84365c Merge: 6d2a96f6a ea9029d7b Author: timoreo <[email protected]> Date: Fri Nov 15 06:15:22 2024 +0100 Merge pull request #3101 from PrismLauncher/backport-3096-to-release-9.x [Backport release-9.x] Fix file remaingin open after program closure commit 6d2a96f6a757071680028855b852d22ec7a4f971 Merge: 509f8c730 76602391f Author: timoreo <[email protected]> Date: Fri Nov 15 06:15:06 2024 +0100 Merge pull request #3098 from Trial97/resource_backport Fix crash caused by invalid resource pointer commit ea9029d7b62a729206a8f137d58065e574540b7b Author: Trial97 <[email protected]> Date: Thu Nov 14 13:17:52 2024 +0200 Fix file remaingin open after program closure Signed-off-by: Trial97 <[email protected]> (cherry picked from commit ce61ed2f86d313f63c999d012d768425ea3793c3) commit 76602391f4079b303f31143cf60b4823e2a2b2b2 Author: Trial97 <[email protected]> Date: Thu Nov 14 16:26:21 2024 +0200 Fix crash caused by invalid resource pointer Signed-off-by: Trial97 <[email protected]> commit 509f8c730765140b0d9f7c972e1563ab42bfe886 Merge: 04e1a97d5 984daa450 Author: Alexandru Ionut Tripon <[email protected]> Date: Thu Nov 7 23:48:40 2024 +0200 Merge pull request #3079 from PrismLauncher/backport-3074-to-release-9.x [Backport release-9.x] Close the window using the invokeMethod to not block commit 984daa450bbc53cec83b183472d83e022efc3739 Author: Trial97 <[email protected]> Date: Thu Nov 7 14:45:14 2024 +0200 Close the window using the invokeMethod to not block Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 9601fbf2d5b36d3609cce6b1a3b458db0d170531) commit 04e1a97d596614af675e932793e596ac7a5cd9c3 Merge: 87d5b9676 1dce1360b Author: Tayou <[email protected]> Date: Thu Nov 7 17:31:15 2024 +0100 Merge pull request #3077 from PrismLauncher/backport-3036-to-release-9.x [Backport release-9.x] Fix installed typo commit 1dce1360bdea93e5c8450585e1154cead29463aa Author: Trial97 <[email protected]> Date: Thu Oct 31 14:51:18 2024 +0200 Fix installed typo Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 670c932f32753fd67979f95810b052d7a62a0006) commit 87d5b96760709b6d6a60b2c6aec45fa79c8588de Merge: 53bc20f13 7f074ca7b Author: timoreo <[email protected]> Date: Tue Nov 5 11:26:18 2024 +0100 Merge pull request #3061 from PrismLauncher/backport-3060-to-release-9.x [Backport release-9.x] ci: bump linux qt version commit 7f074ca7b94d56a8700752ede95c7474291ee307 Author: Rachel Powers <[email protected]> Date: Tue Nov 5 01:30:55 2024 -0700 ci: libxcb-curcsor_dev ? Signed-off-by: Rachel Powers <[email protected]> (cherry picked from commit ba6743d134589294ac3ba754e6ad83c2e59d4ffd) commit c0394c52b7e944c7e5d14e8da5128b5f92e19ace Author: Rachel Powers <[email protected]> Date: Tue Nov 5 01:10:38 2024 -0700 ci: bump linux qt version Signed-off-by: Rachel Powers <[email protected]> (cherry picked from commit d63a3364111a99337c2096c807550f3d7c62b47a) commit 53bc20f13fc62e3ffc758c008ccd3cc462402558 Merge: 3977918c5 40af3cf3d Author: Alexandru Ionut Tripon <[email protected]> Date: Sun Nov 3 11:56:20 2024 +0200 Merge pull request #3052 from PrismLauncher/backport-3042-to-release-9.x [Backport release-9.x] use isPortable to determine if the MSAStep should check for url handler commit 40af3cf3d2fbf0c931eb9e137e6a69f6e8831a86 Author: Trial97 <[email protected]> Date: Fri Nov 1 11:03:47 2024 +0200 use isPortable to determine if the MSAStep should check for url handler Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 99cfb6237030f03c148e531da78b8da8f7d4c2f1) commit 3977918c5b30366459dc0f01a72578b637ac161d Merge: 0f5eb0383 484d90899 Author: Alexandru Ionut Tripon <[email protected]> Date: Sun Nov 3 11:56:07 2024 +0200 Merge pull request #3051 from PrismLauncher/backport-3045-to-release-9.x [Backport release-9.x] disable retry for modrinth currentVersions API commit 484d90899f293121558a5a6da984bd7eb5a1c508 Author: Trial97 <[email protected]> Date: Fri Nov 1 17:34:29 2024 +0200 disable retry for modrinth currentVersions API Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 6f2f3c2d3bf6a170060523ad47fe69fef57bd9b4) commit 0f5eb03839a18b61567ad0374770ab4815b40325 Merge: 52a321b93 d21cda188 Author: Tayou <[email protected]> Date: Wed Oct 30 21:57:18 2024 +0100 Merge pull request #3034 from PrismLauncher/backport-3010-to-release-9.x commit d21cda188061778ab678cc69bfaa004b7bf99b59 Author: Trial97 <[email protected]> Date: Sun Oct 27 12:36:14 2024 +0200 lock m_instanceExtras Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 11d4d948aa1a1ba67cee59193eb98a7fdad2d909) commit 52a321b93b11affc8ff0aee2e9f760b661c5a2f8 Merge: 23d6f8aae dd8dec8be Author: Alexandru Ionut Tripon <[email protected]> Date: Wed Oct 30 21:21:49 2024 +0200 Merge pull request #3033 from PrismLauncher/backport-3030-to-release-9.x [Backport release-9.x] Fix system detection for Intel Macs commit dd8dec8be8c9c12f659c89a13746e4e52d0d0aa7 Author: Trial97 <[email protected]> Date: Wed Oct 30 17:15:42 2024 +0200 fix macos system detection Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 14c95b9d376975144faddc33e7154cca86621804) commit 390af2df4572390715336f2b13c43fbea81826ad Author: Evan Goode <[email protected]> Date: Tue Oct 29 21:30:04 2024 -0400 Add back "PollyMC Contributors", it was deleted by mistake commit 4e154d2b47b7447158049b0702bca77c5411df38 Merge: 441d471a9 0f33e1292 Author: Evan Goode <[email protected]> Date: Tue Oct 29 20:54:09 2024 -0400 Merge pull request #38 from unmojang/evan-goode/merge-9.0 Merge changes from Prism Launcher 9.1 commit 23d6f8aaed3588fc875e0b5896fa01a8142d4984 Merge: 1129b4160 d105d76f2 Author: Tayou <[email protected]> Date: Tue Oct 29 23:15:22 2024 +0100 Merge pull request #3028 from PrismLauncher/backport-3027-to-release-9.x commit d105d76f2af754d71104f0d05c4911b57b71fc00 Author: Ben Westover <[email protected]> Date: Tue Oct 29 18:24:19 2024 +0000 Fix some typos Signed-off-by: Ben Westover <[email protected]> (cherry picked from commit f6511c601e1fd63a864f1681beef0f85adfe6f7e) commit 698a838b56d47a6be806eb92107e2ae617583d9f Author: Ben Westover <[email protected]> Date: Tue Oct 29 18:20:00 2024 +0000 Shorten metainfo.xml app summary Signed-off-by: Ben Westover <[email protected]> (cherry picked from commit fd109c47401c755e35da9c2884e9b38532bed56c) commit 0f33e129226bcfa138013be69a8d3a7c88b4bf69 Author: Evan Goode <[email protected]> Date: Mon Oct 28 22:12:48 2024 -0400 Remove extra search bars in FtbAppImport and Modrinth pages commit 04703d83eeae113bdfb8cf7508edb9bedb92a377 Author: Evan Goode <[email protected]> Date: Mon Oct 28 22:07:15 2024 -0400 Delete remaining Mojang cruft commit 1129b4160c0be6ec5bb9d7411d56a98a316e0f15 Merge: 42190819a 63a6f823f Author: Alexandru Ionut Tripon <[email protected]> Date: Mon Oct 28 23:00:19 2024 +0200 Merge pull request #3022 from PrismLauncher/backport-2989-to-release-9.x [Backport release-9.x] add extra protection against empty download link commit 63a6f823fd9a35c749f061b26f53d5b0623f50cf Author: Trial97 <[email protected]> Date: Mon Oct 28 22:27:40 2024 +0200 add qassert Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 94f65f8727bfd12cc50eb8b62d52bca308cef9b5) commit db32b2ad992a534b8824d905339ba15d3bf371f8 Author: Trial97 <[email protected]> Date: Mon Oct 28 19:19:06 2024 +0200 remove message box Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 9cdda4377b0090a035e286a86fd78f126f995356) commit c3cf5d31da70ed980ebab0cbf0a2216156dc835c Author: Trial97 <[email protected]> Date: Mon Oct 28 12:54:21 2024 +0200 replace currentData with itemData on QComboBox::currentIndexChanged slots Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 0cafac84ac6328fefb8992de2c6a2385b1c0053c) commit 1e696328bb89ce363e36d3c460b9ec05709b8644 Author: Trial97 <[email protected]> Date: Sun Oct 27 03:05:56 2024 +0200 fix #3001 Signed-off-by: Trial97 <[email protected]> (cherry picked from commit b593ff09e9c4b5fa30ca082eea4cd69f12a286e5) commit 1d9c97803a51ac1a4d44fe23adf129388688dde9 Author: Trial97 <[email protected]> Date: Sun Oct 27 03:05:30 2024 +0200 rename snake_case to camelCase Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 44894a29b1784cfa8a04807c17d21169230ff922) commit 3d55236fdf14cbe0c39b922ed7ef21e831a3688e Author: Trial97 <[email protected]> Date: Fri Oct 25 01:05:58 2024 +0300 add extra protection against empty download link Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 8daa1219a508ddb37070c01046c78b731a277887) commit 42190819ae0fc92813b9ec01a8bd18e3b0cdf76c Merge: bf57d7707 130714a9a Author: Alexandru Ionut Tripon <[email protected]> Date: Mon Oct 28 22:36:29 2024 +0200 Merge pull request #3020 from PrismLauncher/backport-2837-to-release-9.x [Backport release-9.x] translate standard buttons commit 130714a9ab24ce45ad935d7e2ab2a9440b2708fd Author: Trial97 <[email protected]> Date: Wed Sep 18 21:01:34 2024 +0300 translate standard buttons Signed-off-by: Trial97 <[email protected]> (cherry picked from commit bd82737efbb99dfc488d6d073046e5fe62693a9e) commit bf57d77075c944a16257e23eb79597a62be243c6 Merge: 0722dba82 98fe03544 Author: Tayou <[email protected]> Date: Mon Oct 28 14:24:25 2024 +0100 Merge pull request #3017 from PrismLauncher/backport-3002-to-release-9.x commit 98fe035442edc0efa9b58e9b4924ca05da864f8b Author: Trial97 <[email protected]> Date: Mon Oct 28 12:39:26 2024 +0200 replace unzipping with unpacking Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 9eb1ce3ad7dde0b2ca551b0b281081724e6fd58e) commit 8e4994590bd59bcabca2c0b27e4b064f49d00c31 Author: Trial97 <[email protected]> Date: Sun Oct 27 03:02:13 2024 +0300 fix unzipping typo Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 685d3c79ac78d7e41ab257de82dc743020189a33) commit 0722dba820837ec2ee29e339c6478bc8e16871c3 Merge: 4d89512ca 9560447c9 Author: Tayou <[email protected]> Date: Mon Oct 28 14:04:52 2024 +0100 Merge pull request #3016 from PrismLauncher/backport-3009-to-release-9.x commit 9560447c92a5d5c794f9a890134de38839eda81e Author: Trial97 <[email protected]> Date: Sun Oct 27 12:06:45 2024 +0200 swap search with filter button for modpacks Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 61448a61ea400eebd91f97aa07e9419cc2f35823) commit 4d89512ca1782092d6a8a418a4aa2217a4b75ee5 Merge: d85408708 42a6bd115 Author: Alexandru Ionut Tripon <[email protected]> Date: Sun Oct 27 22:30:02 2024 +0200 Merge pull request #3013 from PrismLauncher/backport-3008-to-release-9.x [Backport release-9.x] change contributors name commit 42a6bd11515e9dd7fd51d79c015e9a62ea99f925 Author: Trial97 <[email protected]> Date: Sun Oct 27 13:17:58 2024 +0200 change ZekeZ name Signed-off-by: Trial97 <[email protected]> (cherry picked from commit c4cd7cf6c173b7052f31614b4641d2172defa91a) commit f06505b1381a13826a04adfe42acbc6369f6e012 Author: Trial97 <[email protected]> Date: Sun Oct 27 11:58:34 2024 +0200 change contributors name Signed-off-by: Trial97 <[email protected]> (cherry picked from commit f373a5cea0e816158cdabca3423107989aed0a85) commit 5c8bdf99cdc04d984ed0d10a2a920a5265c30b98 Author: Evan Goode <[email protected]> Date: Sun Oct 27 13:19:33 2024 -0400 Gray out "Manage Skins" button for authlib-injector accounts Support for this is blocked by https://github.com/unmojang/FjordLauncher/issues/37, which we can get to after the 9.0 release. commit fab399c0943f7af42c313a1fcc1323a65a37585b Author: Evan Goode <[email protected]> Date: Sat Oct 26 19:36:26 2024 -0400 Remove extra code comment commit e177117a8f7ff30a6fae49a6dc272a7a6d0b1571 Author: Evan Goode <[email protected]> Date: Sat Oct 26 19:08:36 2024 -0400 Fix FTB import goof commit 9a0f9a9f67b6ee4401d73f146bb205fd08c5fe90 Author: Evan Goode <[email protected]> Date: Sat Oct 26 18:30:16 2024 -0400 Fix Windows build commit 95af313f4971b74ad7435971a4ec7b7b4b39c9cd Merge: da9c085a0 07addf244 Author: Evan Goode <[email protected]> Date: Sat Oct 26 17:54:34 2024 -0400 Merge tag '9.1' into evan-goode/merge-9.0 commit da9c085a0643c48984c84aecb7def950ade1f329 Author: Evan Goode <[email protected]> Date: Sat Oct 26 17:24:52 2024 -0400 Clean up some lingering differences from upstream commit b4963162413e5a89782cdecd4578c0ceeb187b6d Author: Evan Goode <[email protected]> Date: Sat Oct 26 16:45:14 2024 -0400 Change a few occurrences of "prism" to "fjord" commit c15afbda4af9473ebfd80f20de5d700aa460ccfc Author: Evan Goode <[email protected]> Date: Sat Oct 26 15:25:27 2024 -0400 Fix build? commit 7f52d57454539880704d5422b595e43e1de5116a Author: Evan Goode <[email protected]> Date: Sat Oct 26 14:56:55 2024 -0400 Fix MSA login commit d40b6d8eb346f8b25fa82a0755acab776b5b5de5 Author: Evan Goode <[email protected]> Date: Sat Oct 26 13:40:09 2024 -0400 Error handling for Yggdrasil accounts commit c32aaf244dc8db2771643b1671c456abe7d613b9 Author: Evan Goode <[email protected]> Date: Sat Oct 26 00:17:24 2024 -0400 It compiles, Yggdrasil login working except error handling commit d854087089b4eea2f12d9105a10d46cbf19cf565 Merge: dde5fc47d 31031ec92 Author: seth <[email protected]> Date: Fri Oct 25 21:20:31 2024 -0400 Merge pull request #2997 from PrismLauncher/backport-2992-to-release-9.x [Backport release-9.x] Sync Flake with Nixpkgs commit 31031ec92311c1ccba385ce4cb10553f8172a2ed Author: seth <[email protected]> Date: Fri Oct 25 02:34:15 2024 -0400 chore(nix): use `self` for version Signed-off-by: seth <[email protected]> (cherry picked from commit 63b10738b2a1065d55077e729fcada6e7f64d10a) commit 5f06517b62745219183fd364e2557f23dcc04d66 Author: seth <[email protected]> Date: Fri Oct 25 02:33:29 2024 -0400 chore(nix): sync with nixpkgs Signed-off-by: seth <[email protected]> (cherry picked from commit a5c554cf6ee32afa41c5a2af1ea8e8feb0087a49) commit 7dbaa896a6f1e414ead53de6b0a5f0d960b995ea Merge: 441d471a9 e8c9722a5 Author: Evan Goode <[email protected]> Date: Fri Oct 25 15:34:57 2024 -0400 Merge tag '9.0' into develop This is an intermediate/halfway commit, more refactoring is needed to get this to build. commit dde5fc47d32c9b2580f77db47eba1e873ba89add Merge: 76d5f632d a839258c0 Author: Tayou <[email protected]> Date: Fri Oct 25 09:53:49 2024 +0200 Merge pull request #2987 from Trial97/bump_9.2 commit 76d5f632dc7323a66a61039bd5f6b6d7f3ed4526 Merge: e2f5fb27a 27c6596bc Author: Alexandru Ionut Tripon <[email protected]> Date: Fri Oct 25 09:46:30 2024 +0300 Merge pull request #2993 from PrismLauncher/backport-2982-to-release-9.x [Backport release-9.x] Use Launcher log level in AutoInstallJava commit 27c6596bcbfd079c404d99a08688d1a9e72a498c Author: TheKodeToad <[email protected]> Date: Thu Oct 24 01:33:01 2024 +0100 Use Launcher log level in AutoInstallJava Signed-off-by: TheKodeToad <[email protected]> (cherry picked from commit d8702e1357d36423a0d40b916d49fd937284a204) commit e2f5fb27a64b2e349491052f136786103f21846f Merge: 2dde2c4be 98819a0d0 Author: Alexandru Ionut Tripon <[email protected]> Date: Fri Oct 25 09:33:52 2024 +0300 Merge pull request #2991 from PrismLauncher/backport-2963-to-release-9.x [Backport release-9.x] chore(deps): update actions/cache action to v4.1.2 commit 98819a0d02499514590809049ed46feafbb7501a Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Tue Oct 22 13:48:29 2024 +0000 chore(deps): update actions/cache action to v4.1.2 (cherry picked from commit 210d0d8aa25578cbbf8250797504ae1652544600) commit 2dde2c4becce3325112c7b29ec92aee8ef8586f2 Merge: 89041531e 008d69e5e Author: seth <[email protected]> Date: Fri Oct 25 02:20:10 2024 -0400 Merge pull request #2990 from PrismLauncher/backport-2980-to-release-9.x [Backport release-9.x] Sync with Flathub manifest commit 008d69e5e5fc7e0b05125a464dcd23fd95c9fcb5 Author: Arcitec <[email protected]> Date: Thu Oct 24 09:52:40 2024 +0200 fix: bring back Flathub manifest improvements to the repo - Brings back all manifest improvements, such as the incredibly important Mojang Java Downloader (without it, the Flatpak doesn't work), and important fixes for Wayland. Signed-off-by: Arcitec <[email protected]> (cherry picked from commit 4ce025c0a209a4eec20f7f1b9a7777bbe886be8c) commit a839258c07d1faf7958c9c9b0246faacefaabedc Author: Trial97 <[email protected]> Date: Fri Oct 25 00:19:06 2024 +0300 bump develop to 9.2 Signed-off-by: Trial97 <[email protected]> commit 07addf24494933943631245f586d880f432b021d Author: TheKodeToad <[email protected]> Date: Thu Oct 24 13:32:23 2024 +0100 Bump version to 9.1 commit eea119d9c9180b44e3991c98e8eadbe15003efac Merge: e8c9722a5 78e24962f Author: TheKodeToad <[email protected]> Date: Thu Oct 24 13:31:21 2024 +0100 Merge remote-tracking branch 'TheKodeToad/vc-redist-norestart' into 9.1-hotfix commit 89041531e13c550153405ea5ccb1a43592e87d32 Merge: 80d675d2e 729cec5f4 Author: Alexandru Ionut Tripon <[email protected]> Date: Thu Oct 24 15:09:19 2024 +0300 Merge pull request #2981 from PrismLauncher/backport-2975-to-release-9.x [Backport release-9.x] fix: don't hang the ui for a full version load commit 729cec5f45468e9647027ea75155fc1fb6d7c0f1 Author: Rachel Powers <[email protected]> Date: Wed Oct 23 16:23:10 2024 -0700 fix don't hang the ui for a full version load Signed-off-by: Rachel Powers <[email protected]> (cherry picked from commit 7bd04ae928527b065174021fba98dc78d0d119a3) commit 80d675d2e6fd19d634affc69764a35773a1c621c Merge: 877ab62c2 fb7d19941 Author: TheKodeToad <[email protected]> Date: Wed Oct 23 22:39:58 2024 +0100 Merge pull request #2974 from PrismLauncher/backport-2972-to-release-9.x [Backport release-9.x] Fix launching Minecraft in portable Linux commit fb7d19941f7f7e314df1c776fde8cafb3fb248ad Author: TheKodeToad <[email protected]> Date: Wed Oct 23 13:44:39 2024 +0100 Fix CleanEnviroment()'s usage of stripVariableEntries Signed-off-by: TheKodeToad <[email protected]> (cherry picked from commit e7cd8fe078e3a68bd3179816020a9ed08f1b2847) commit 877ab62c2f9dab7a333d5b7a7ae6f04f05c60130 Merge: 25eaa4eba b983ae0fb Author: Alexandru Ionut Tripon <[email protected]> Date: Tue Oct 22 17:41:45 2024 +0300 Merge pull request #2964 from PrismLauncher/backport-2958-to-release-9.x [Backport release-9.x] skip parsing open QSaveFile temprary files as resources commit b983ae0fb000b0a413115f4b8bd64f8447cca80b Author: Trial97 <[email protected]> Date: Tue Oct 22 13:43:16 2024 +0300 fix small leak Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 836aebc0d91fe8658052b8c4a5a4ab31da4a4b15) commit 85422427b9794a3bb6765e9947c03844862035e4 Author: Trial97 <[email protected]> Date: Tue Oct 22 09:41:00 2024 +0300 Replaced QSet with QHash Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 73d33f93b30f658f9671358ac52bf4e03afeaefd) commit 51a71d04715bfc47c1688bd7606b3c4f043cd3d8 Author: Trial97 <[email protected]> Date: Mon Oct 21 23:53:23 2024 +0300 skip QSaveFile temprary files Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 562c3013269dbb9cad411f58ded333dee1aea158) commit 25eaa4eba6663d4237e02b3c49a7ac1f2f18622f Merge: 740db2db0 6da14d66b Author: Alexandru Ionut Tripon <[email protected]> Date: Tue Oct 22 00:15:10 2024 +0300 Merge pull request #2959 from PrismLauncher/backport-2954-to-release-9.x [Backport release-9.x] do not try to import skin if path is empty commit 6da14d66bb80cbd6818582347b49bc6eb3a4c1f2 Author: Alexandru Ionut Tripon <[email protected]> Date: Mon Oct 21 22:59:51 2024 +0300 Update launcher/ui/dialogs/skins/SkinManageDialog.cpp Co-authored-by: TheKodeToad <[email protected]> Signed-off-by: Alexandru Ionut Tripon <[email protected]> (cherry picked from commit 69028969f1a6c42b698b900256ad2e6d9ee208eb) commit 199c5497d327f35d0bc70aa7949be397ed583aa7 Author: Trial97 <[email protected]> Date: Mon Oct 21 19:28:34 2024 +0300 do not try to import skin if path is empty Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 9a5b773e69e7198cc37413ab7d69ba6d0a66f854) commit 740db2db022b333e762b15f7440ad9a5f478ca49 Merge: c5e7bb90c 577f8074e Author: Alexandru Ionut Tripon <[email protected]> Date: Mon Oct 21 22:46:49 2024 +0300 Merge pull request #2956 from PrismLauncher/backport-2953-to-release-9.x [Backport release-9.x] Fix removing portable.txt on Linux portable build commit 577f8074e1ec203e119b50b1588d2b789eb40425 Author: TheKodeToad <[email protected]> Date: Mon Oct 21 16:30:08 2024 +0100 Fix removing portable.txt on Linux portable build Signed-off-by: TheKodeToad <[email protected]> (cherry picked from commit f3f4c446206647b69b9c19e63617b163b99c6164) commit c5e7bb90c5b03cd6434cad40b42595cf59254dbd Merge: 3bf4fbf8f 1cf91fa5d Author: Alexandru Ionut Tripon <[email protected]> Date: Mon Oct 21 18:04:53 2024 +0300 Merge pull request #2952 from PrismLauncher/backport-2947-to-release-9.x [Backport release-9.x] do not require java if auto-download is enabled commit 1cf91fa5d93aa2a4b2caab10a20b65ca4b95869a Author: Trial97 <[email protected]> Date: Mon Oct 21 16:17:48 2024 +0300 do not require java if auto-download is enabled Signed-off-by: Trial97 <[email protected]> (cherry picked from commit fcadbbb739076096a9057ec340f7f6d39bc4b72f) commit 3bf4fbf8f44357829038ea8cf0898f94c033c08b Merge: e8c9722a5 ff97affa7 Author: Tayou <[email protected]> Date: Mon Oct 21 16:55:28 2024 +0200 Merge pull request #2951 from PrismLauncher/backport-2948-to-release-9.x commit ff97affa7210524a506a7ae25d8d17c41ca6f0ae Author: TheKodeToad <[email protected]> Date: Mon Oct 21 14:41:48 2024 +0100 Fix /norestart Signed-off-by: TheKodeToad <[email protected]> (cherry picked from commit 78e24962f93b5cc2350d04bebd7e5231d1bc4819) commit 78e24962f93b5cc2350d04bebd7e5231d1bc4819 Author: TheKodeToad <[email protected]> Date: Mon Oct 21 14:41:48 2024 +0100 Fix /norestart Signed-off-by: TheKodeToad <[email protected]> commit e8c9722a53b9cc1eaceb6da23257dfad5b70081d Merge: 3ac080806 9a810dfa6 Author: Alexandru Ionut Tripon <[email protected]> Date: Mon Oct 21 00:08:40 2024 +0300 Merge pull request #2939 from PrismLauncher/backport-2938-to-release-9.x [Backport release-9.x] fix sparkle signature commit 9a810dfa6e609d736511fb166efa403eaf9506b3 Author: Trial97 <[email protected]> Date: Sun Oct 20 23:14:05 2024 +0300 fix sparkle signature Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 0586d38e03de6890bf5697c7e1a965aac9bd36fb) commit a8c3a49cb9d12c41cbdaab85e09d38a071bb7560 Merge: 3ac080806 0586d38e0 Author: Alexandru Ionut Tripon <[email protected]> Date: Mon Oct 21 00:05:57 2024 +0300 Merge pull request #2938 from Trial97/fix_sparkle fix sparkle signature commit 0586d38e03de6890bf5697c7e1a965aac9bd36fb Author: Trial97 <[email protected]> Date: Sun Oct 20 23:14:05 2024 +0300 fix sparkle signature Signed-off-by: Trial97 <[email protected]> commit 3ac080806de6f4ec47b7fa889d7daa57096f3ffb Merge: 38e0e0cb7 b676a67b3 Author: ZekeZ <[email protected]> Date: Mon Oct 21 00:14:36 2024 +1000 Merge pull request #2831 from Trial97/fix_login split the auth loading screen commit 38e0e0cb73a0ea07d4545a0fbd17512cb1865a13 Merge: 417bb3564 0501c1e17 Author: seth <[email protected]> Date: Sun Oct 20 02:11:26 2024 -0400 Merge pull request #2935 from PrismLauncher/update_flake_lock_action chore(nix): update lockfile commit 0501c1e17a75172b8c3b8c15da27a86cf64c420b Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Date: Sun Oct 20 00:25:22 2024 +0000 chore(nix): update lockfile Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7?narHash=sha256-9UTxR8eukdg%2BXZeHgxW5hQA9fIKHsKCdOIUycTryeVw%3D' (2024-10-09) → 'github:NixOS/nixpkgs/4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0?narHash=sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c%2BcHUJwA%3D' (2024-10-18) commit 417bb3564d11247dbf02e0d31bee1729670f4977 Merge: e43836a27 01721b593 Author: Alexandru Ionut Tripon <[email protected]> Date: Sat Oct 19 22:33:05 2024 +0300 Merge pull request #2933 from getchoo-contrib/flatpak/jdks Don't bundle JREs in Flatpak commit e43836a271ac496fc5d0213f31dfb0de962600db Merge: 9a161a033 522d105db Author: Alexandru Ionut Tripon <[email protected]> Date: Sat Oct 19 22:32:59 2024 +0300 Merge pull request #2932 from getchoo-contrib/nix/enable-tests Enable checks in Nix package commit 9a161a03350b6486e4e71f5096d11019f573b24f Merge: 464c7c1d4 2d234b127 Author: Alexandru Ionut Tripon <[email protected]> Date: Sat Oct 19 22:32:51 2024 +0300 Merge pull request #2930 from Trial97/fixes Fix tests segfault commit 2d234b127b1561fcedd0beae5bd242d1012c7426 Author: Trial97 <[email protected]> Date: Sat Oct 19 22:07:31 2024 +0300 make sure that tests are only disabled fro cmark Signed-off-by: Trial97 <[email protected]> commit 464c7c1d4d11b8d96f8b168d72acae24dc9cfdb6 Merge: f60d6e4d4 7519c63f2 Author: Rachel Powers <[email protected]> Date: Sat Oct 19 12:00:52 2024 -0700 Merge pull request #2929 from Trial97/https Replace http with https on skins commit 2030041fcc14aa9d56f59e0a61c8a26ba6522a0f Author: Trial97 <[email protected]> Date: Sat Oct 19 01:10:04 2024 +0300 Fix tests segfault Signed-off-by: Trial97 <[email protected]> commit 01721b593b16bbbf9cd15c4f262176d0345681f8 Author: seth <[email protected]> Date: Sat Oct 19 12:38:17 2024 -0400 fix(flatpak): run tests for launcher Signed-off-by: seth <[email protected]> commit 0bae14999f8e4997be96a8fadb4e4ed14dfd5b40 Author: seth <[email protected]> Date: Sat Oct 19 12:33:40 2024 -0400 chore(flatpak): don't bundle JREs After https://github.com/PrismLauncher/PrismLauncher/pull/2069, JREs can be managed at runtime. This is great for the Flatpak, as previously *all* JREs had to be installed and could not be updated independently of the launcher's Flatpak. It also makes using unsupported Java versions easier as the launcher can download any version in the sandbox We don't need to include these anymore Signed-off-by: seth <[email protected]> commit 522d105dbe50d6392e1d74dd9f1dec2a3ef7a357 Author: seth <[email protected]> Date: Sat Oct 19 11:59:32 2024 -0400 fix(nix): enable checks Signed-off-by: seth <[email protected]> commit 7519c63f2e8a5ebc9480a470a1e7702436178c51 Author: Trial97 <[email protected]> Date: Sat Oct 19 01:11:27 2024 +0300 Replace http with https on skins Signed-off-by: Trial97 <[email protected]> commit f60d6e4d4868d9e3ac48ea1d31c676deb83af0bb Merge: 43eb27b69 ac13579b9 Author: timoreo <[email protected]> Date: Fri Oct 18 12:09:24 2024 +0200 Merge pull request #2917 from Trial97/asan_log fix heap-use-after-free in modrinth creation task commit 43eb27b695f7a375a4b1736389b155d50bd0e728 Merge: f239f4c17 a108b5b42 Author: Alexandru Ionut Tripon <[email protected]> Date: Tue Oct 15 08:59:12 2024 +0300 Merge pull request #2916 from Ryex/fix/progress_dialog_use_after_free fix: ensure all connections to the ProgressDialogs's Task the dialog made are disconnected commit ac13579b9963a312b909e712c372cb115f21f0db Author: Trial97 <[email protected]> Date: Mon Oct 14 11:10:54 2024 +0300 fix heap-use-after-free in modrinth creation task Signed-off-by: Trial97 <[email protected]> commit a108b5b420b7d2785c9850d4a0bcb9c628d073a4 Author: Rachel Powers <[email protected]> Date: Mon Oct 14 00:32:12 2024 -0700 fix: ensure all connections to the ProgressDialogs's Task the dialog made are dissconnected Signed-off-by: Rachel Powers <[email protected]> commit f239f4c17c80e88aa12635e142f7829688f122c3 Merge: 5685bc340 3c836ece7 Author: Alexandru Ionut Tripon <[email protected]> Date: Sun Oct 13 22:46:00 2024 +0300 Merge pull request #2914 from PrismLauncher/update_flake_lock_action chore(nix): update lockfile commit 5685bc340774da9026bbd6338593a2ec04ce7527 Merge: bd01c47dc 3a1c06de0 Author: Alexandru Ionut Tripon <[email protected]> Date: Sun Oct 13 09:49:13 2024 +0300 Merge pull request #2913 from archessmn/fix/custom-command-tab-order Fix tab order on custom command inputs commit bd01c47dc9539656dde229344d019d8588d0ac00 Merge: ef0cb88dd 72cfad8fe Author: Alexandru Ionut Tripon <[email protected]> Date: Sun Oct 13 09:48:27 2024 +0300 Merge pull request #2906 from TheKodeToad/no-recursive-remove-on-update Prevent directories from being removed on instance update commit 3c836ece71c61c19eacd7bb4f324940071c6e89a Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Date: Sun Oct 13 00:24:52 2024 +0000 chore(nix): update lockfile Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb?narHash=sha256-NOiTvBbRLIOe5F6RbHaAh6%2B%2BBNjsb149fGZd1T4%2BKBg%3D' (2024-10-04) → 'github:NixOS/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7?narHash=sha256-9UTxR8eukdg%2BXZeHgxW5hQA9fIKHsKCdOIUycTryeVw%3D' (2024-10-09) commit 3a1c06de027ab2755c2a27624f41cbd445a156b4 Author: Mia Moir <[email protected]> Date: Sat Oct 12 23:47:58 2024 +0100 fix: Tab order on custom command inputs The tab order on the custom command UI in the instance settings is off, it goes 0 -> 2 -> 1, This re-orders the ui file to fix the order the inputs are in. Signed-off-by: Mia Moir <[email protected]> commit ef0cb88dd391a1872f38a2ac7ce7f473c0d1f3b5 Merge: 0b624a43d 09c9da268 Author: Alexandru Ionut Tripon <[email protected]> Date: Sat Oct 12 12:21:09 2024 +0300 Merge pull request #2907 from Ryex/fix/icon_cache_stack_overflow Prevent infinite recursion when mod icon load fails commit 0b624a43d6f719dcbc94630b1f85c96e569cc1e3 Merge: 78ceae9c1 97f4ead0f Author: Alexandru Ionut Tripon <[email protected]> Date: Sat Oct 12 00:49:57 2024 +0300 Merge pull request #2908 from Trial97/remove_client remove client overrides instead of double deleting the normal ones commit 97f4ead0fbec5508f7ff6785f07dcf869ed663c2 Author: Trial97 <[email protected]> Date: Sat Oct 12 00:19:54 2024 +0300 remove client overrides instead of double deleting the normal ones Signed-off-by: Trial97 <[email protected]> commit 78ceae9c17af74d52b51ce3c9f56c71ae3c16b72 Merge: 0c4c86c41 df9f54454 Author: Alexandru Ionut Tripon <[email protected]> Date: Sat Oct 12 00:07:14 2024 +0300 Merge pull request #2887 from Trial97/filters_modpack Add filters for modpack search commit 72cfad8fee7f81d85df7389ab9e32294d13a4707 Author: TheKodeToad <[email protected]> Date: Fri Oct 11 21:35:13 2024 +0100 Continue deleting before failing Signed-off-by: TheKodeToad <[email protected]> commit 09c9da268fdc833304f6159735cfb7e80d0e69bc Author: Rachel Powers <[email protected]> Date: Fri Oct 11 13:26:20 2024 -0700 fix: prevent inf recursion when mod icon load fails; cut max pixmapcache to 1/4 previous value Signed-off-by: Rachel Powers <[email protected]> commit 2bc6ae97568f9c9e522c4a64988cb325eb4d25ec Author: TheKodeToad <[email protected]> Date: Fri Oct 11 19:53:28 2024 +0100 Prevent directories from being removed on instance update Signed-off-by: TheKodeToad <[email protected]> commit 0c4c86c41f3e241577627639575e0beede1658b2 Merge: 2abbcdfa6 98adcc60a Author: Tayou <[email protected]> Date: Fri Oct 11 19:10:55 2024 +0200 Merge pull request #2900 from TheKodeToad/log-utf8 Use UTF-8 to decode logs on Java 18 or newer commit 98adcc60a30a95a86b564ebe69bb0ad276263424 Author: TheKodeToad <[email protected]> Date: Wed Oct 9 16:59:56 2024 +0100 Use UTF-8 to decode logs on Java 18 or newer Signed-off-by: TheKodeToad <[email protected]> commit 909114bf2ae1090e7c4d2d757645b413c71aaba1 Author: TheKodeToad <[email protected]> Date: Wed Oct 9 15:07:09 2024 +0100 Change LaunchTask to only accept MinecraftInstance Signed-off-by: TheKodeToad <[email protected]> commit 2abbcdfa6ff96c4a3ca41a4a58c4348eaa238748 Merge: c72cce657 093313e59 Author: txtsd <[email protected]> Date: Wed Oct 9 13:01:15 2024 +0530 Merge pull request #2896 from PrismLauncher/renovate/actions-cache-4.x chore(deps): update actions/cache action to v4.1.1 commit 093313e5914b3759bdb1147cd0fd1ff6627bdb31 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Wed Oct 9 07:14:47 2024 +0000 chore(deps): update actions/cache action to v4.1.1 commit c72cce6572335ee6df6f2002c9e0cab9a6927d62 Merge: e2b346fc5 d31c947b3 Author: Alexandru Ionut Tripon <[email protected]> Date: Wed Oct 9 08:37:22 2024 +0300 Merge pull request #2897 from Trial97/fix_crash fix crash when no resorce version is available commit d31c947b36c907f59e82150f4fc60781d70185ab Author: Trial97 <[email protected]> Date: Tue Oct 8 22:02:38 2024 +0300 fix crash when no resorce version is available Signed-off-by: Trial97 <[email protected]> commit e2b346fc53bc326a5e67a74ab67bc5447044afa0 Merge: 7c45f8876 cc0c9d208 Author: seth <[email protected]> Date: Tue Oct 8 13:15:05 2024 -0400 Merge pull request #2888 from PrismLauncher/renovate/actions-cache-4.x chore(deps): update actions/cache action to v4.1.0 commit 7c45f8876952aa792400040657c9b712739e876d Merge: acd4dceaf 010678da5 Author: seth <[email protected]> Date: Tue Oct 8 13:14:47 2024 -0400 Merge pull request #2883 from PrismLauncher/renovate/cachix-install-nix-action-30.x chore(deps): update cachix/install-nix-action action to v30 commit acd4dceafa12a2ba0aea844064f0b4376f47ac47 Merge: a200fca45 f7bd76c7d Author: seth <[email protected]> Date: Tue Oct 8 13:14:18 2024 -0400 Merge pull request #2890 from arnfaldur/patch-1 Keep libGLU in Flatpak commit df9f54454ac8cfe40fad525e64e6cc3578f26a77 Author: Trial97 <[email protected]> Date: Tue Oct 8 19:19:03 2024 +0300 removed static functions Signed-off-by: Trial97 <[email protected]> commit 5bd5627a9646361ccee2d96bb555de58072bc7ab Author: Trial97 <[email protected]> Date: Tue Oct 8 15:06:50 2024 +0300 extended the modrinth search and applied the suggested change Signed-off-by: Trial97 <[email protected]> commit a200fca45c67b9aeea18d1a8b9dc0ce1a265fc66 Merge: dc1f56e10 a897b012d Author: TheKodeToad <[email protected]> Date: Tue Oct 8 12:36:11 2024 +0100 Merge pull request #2869 from Edgars-Cirulis/patch-1 chore: update Qt to 6.7.3 commit dc1f56e108831761f0ee2e06df34ac1988111676 Merge: 1eee5c924 a61c93bed Author: Alexandru Ionut Tripon <[email protected]> Date: Tue Oct 8 14:09:22 2024 +0300 Merge pull request #2865 from Ryex/nsis_vc_redist add vc_redist as a NSIS install section commit 6e5f616ced96acee9a9aad76193f82e6a0c2cd27 Author: Trial97 <[email protected]> Date: Sun Oct 6 23:33:24 2024 +0300 move checkMcVersions to Filter struct Signed-off-by: Trial97 <[email protected]> commit 1eee5c924bc4ebc45c2a3fd4161091b6cf48b0e8 Merge: 999dec18d 03294f000 Author: Alexandru Ionut Tripon <[email protected]> Date: Sun Oct 6 23:21:16 2024 +0300 Merge pull request #2891 from PrismLauncher/update_flake_lock_action chore(nix): update lockfile commit 999dec18dd2ad00833d4096e7f9b26afd67301db Merge: 44b4262f3 d5990cca4 Author: Alexandru Ionut Tripon <[email protected]> Date: Sun Oct 6 23:20:14 2024 +0300 Merge pull request #2893 from PrismLauncher/ftb-private-no-retry Disable retry for private pack fetch commit d5990cca4318121dea8d6b669abdada64944c88b Author: TheKodeToad <[email protected]> Date: Sun Oct 6 13:51:36 2024 +0100 Disable retry for private pack fetch This is already handled with a dialog asking whether you want it to be removed. Signed-off-by: TheKodeToad <[email protected]> commit 03294f0000eba56edc39cbd80cc53418a2429528 Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Date: Sun Oct 6 00:24:57 2024 +0000 chore(nix): update lockfile Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/1925c603f17fc89f4c8f6bf6f631a802ad85d784?narHash=sha256-J%2BPeFKSDV%2BpHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI%3D' (2024-09-26) → 'github:NixOS/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb?narHash=sha256-NOiTvBbRLIOe5F6RbHaAh6%2B%2BBNjsb149fGZd1T4%2BKBg%3D' (2024-10-04) commit f7bd76c7d4ce0d834f259e4d085b726e8117bd29 Author: arnfaldur <[email protected]> Date: Sat Oct 5 17:58:53 2024 +0000 flatpak: don't cleanup libGLU The mod AAA Particles (found in the modpack Prominence II RPG) fails to start due to a missing `libGLU.so.1` file. Removing this cleanup command fixes the issue and makes the modpack run without issue. I reproduced the issue at the head of the develop branch, with and without the change. No other issue was detected by adding the library, and I could not find the initial justification for removing it. Signed-off-by: arnfaldur <[email protected]> commit cc0c9d208dc4b686a254138f71465199a895ee3a Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Fri Oct 4 22:22:10 2024 +0000 chore(deps): update actions/cache action to v4.1.0 commit 859fac604bf698755e73083625c75969b59c5e8a Author: Trial97 <[email protected]> Date: Fri Oct 4 17:06:47 2024 +0300 add modrinth modpack filter Signed-off-by: Trial97 <[email protected]> commit a61c93bedefced10b59c310daa567e31cb30f967 Author: Rachel Powers <[email protected]> Date: Fri Oct 4 07:06:19 2024 -0700 Update .github/workflows/build.yml Co-authored-by: Sefa Eyeoglu <[email protected]> Signed-off-by: Rachel Powers <[email protected]> commit 023aa18e852ab1b570b378609edee1e7bbcd1588 Author: Rachel Powers <[email protected]> Date: Thu Oct 3 23:14:29 2024 -0700 ci: NSCurl only needed on MSVC Signed-off-by: Rachel Powers <[email protected]> commit 63172540fb467386864ae22356999451dd2ebe08 Author: Rachel Powers <[email protected]> Date: Thu Oct 3 22:38:30 2024 -0700 fix: nisi needs `!include` "x64.nsh" now. also, there were some broken varible Signed-off-by: Rachel Powers <[email protected]> commit bcb1d456d4773f985d3b18d42382400a2c8148e7 Author: Rachel Powers <[email protected]> Date: Thu Oct 3 21:56:19 2024 -0700 fix: version NSCurl plugin in workflow, detect and use arm64 vc_redist for arm64 Signed-off-by: Rachel Powers <[email protected]> commit 010678da53c864f08b0f900265aacdca256a4dd8 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Thu Oct 3 13:46:28 2024 +0000 chore(deps): update cachix/install-nix-action action to v30 commit dfe3cd849def92682c45610e65bde3f6f5344a39 Author: Trial97 <[email protected]> Date: Wed Oct 2 01:06:45 2024 +0300 add curseforge modpack filter Signed-off-by: Trial97 <[email protected]> commit 44b4262f3ce037140cb6415cea27ed44bd03164d Merge: 2539aa42d 79be2fc06 Author: Alexandru Ionut Tripon <[email protected]> Date: Tue Oct 1 14:04:55 2024 +0300 Merge pull request #2862 from PrismLauncher/renovate/cachix-install-nix-action-29.x chore(deps): update cachix/install-nix-action action to v29 commit 2539aa42da7696546e3a74c83a0ccb349cb58b25 Merge: 62f19a6ac c89904381 Author: Alexandru Ionut Tripon <[email protected]> Date: Tue Oct 1 14:04:28 2024 +0300 Merge pull request #2851 from PrismLauncher/update_flake_lock_action chore(nix): update lockfile commit 62f19a6ac99bcb5cdb874e6a3da8f527c4a2e4d5 Merge: c57e26cf5 5ea2dece5 Author: timoreo <[email protected]> Date: Tue Oct 1 11:41:11 2024 +0200 Merge pull request #2863 from Trial97/fix_resource_search_equal commit c57e26cf5703c849a3cbe01804c7954c7dd1a9ab Merge: 1b58645c5 946e791d3 Author: timoreo <[email protected]> Date: Tue Oct 1 11:40:42 2024 +0200 Merge pull request #2874 from Trial97/modpack_equal commit 1b58645c52930ef461e9c255359808abb35790d2 Merge: fa92e6bd2 0eefa52db Author: timoreo <[email protected]> Date: Tue Oct 1 10:20:56 2024 +0200 Merge pull request #2857 from Trial97/translation_warnings commit 946e791d39a19f50d7604b1f57714f8f3a7f63cb Author: Trial97 <[email protected]> Date: Mon Sep 30 21:50:07 2024 +0300 sync modpack search field Signed-off-by: Trial97 <[email protected]> commit 5ea2dece54f27c812af3eb5ba697ec7aab07e04b Author: Trial97 <[email protected]> Date: Thu Sep 26 22:59:00 2024 +0300 fix search term not remaining the same between providers on resource download Signed-off-by: Trial97 <[email protected]> commit 0eefa52dbcdc595f4b388ae306eae5f556f816e4 Author: Trial97 <[email protected]> Date: Wed Sep 25 15:04:31 2024 +0300 fix some transtaions warnings Signed-off-by: Trial97 <[email protected]> commit b676a67b3ce49ab550e9087834125d14400a8488 Merge: 0af639c20 fa92e6bd2 Author: Trial97 <[email protected]> Date: Tue Oct 1 08:49:03 2024 +0300 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_login commit fa92e6bd2908e9bcd600446f477e5b260d5e2478 Merge: 974c89b9c 1b2e9b95e Author: Alexandru Ionut Tripon <[email protected]> Date: Tue Oct 1 08:23:10 2024 +0300 Merge pull request #2859 from Trial97/packwiz_prefix add prefix to non-standard packwiz fields commit 79be2fc0622103b2d969044490fa179d31482f50 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Tue Oct 1 00:32:42 2024 +0000 chore(deps): update cachix/install-nix-action action to v29 commit 974c89b9c335f49759cec08441aada563d0cbdad Merge: a63451212 38fa2e0cd Author: seth <[email protected]> Date: Mon Sep 30 20:32:08 2024 -0400 Merge pull request #2843 from getchoo-contrib/ci/fix-nix Fix Nix CI commit 38fa2e0cd494d400110496a35c7f112b2b801d97 Author: seth <[email protected]> Date: Mon Sep 30 16:32:35 2024 -0400 style: format with clang-format Signed-off-by: seth <[email protected]> commit 988ef320193e5bfb7de600bc38f99f9ba122c379 Author: seth <[email protected]> Date: Mon Sep 30 16:30:22 2024 -0400 fix(nix): don't write to files in formatting check Signed-off-by: seth <[email protected]> commit bf432b5514d7c9c90761a285d17afbd736e4a687 Author: seth <[email protected]> Date: Mon Sep 30 16:21:07 2024 -0400 chore(nix): use cachix for binary cache Signed-off-by: seth <[email protected]> commit 68bf500f7ee48f17abf2a27e942d953a9962ef55 Author: seth <[email protected]> Date: Thu Sep 19 16:50:45 2024 -0400 chore: add nix reformat to .git-blame-ignore-revs Signed-off-by: seth <[email protected]> commit 5adca58337e9fe2a71f7bdd0951494ceddb34659 Author: seth <[email protected]> Date: Thu Sep 19 16:44:19 2024 -0400 ci: add nix job Signed-off-by: seth <[email protected]> commit 2663ac5405cbfc3c29a38b32a755b7c7ebda0779 Author: seth <[email protected]> Date: Thu Sep 19 16:34:59 2024 -0400 build(nix): add debug builds This will lead to build times on par with our other CI jobs, as now we're not always building for release Signed-off-by: seth <[email protected]> commit 732008db203d1ff6cc7c5d4957cb394d016eaf79 Author: seth <[email protected]> Date: Thu Sep 19 16:27:06 2024 -0400 ci: drop garnix Signed-off-by: seth <[email protected]> commit a63451212f0d6bd22bca4d0842d633ea3919a7c2 Merge: b9a6c13d4 b9c19fd3f Author: Tayou <[email protected]> Date: Sun Sep 29 09:07:25 2024 +0200 Merge pull request #2867 from turret-dev/turret/tmpdir_noexec_jvmarg_noannoy fix: don't annoy when java tmpdir jvmarg is set & /tmp is noexec commit c8990438165cce1d303e8754a125758fd69b8ad9 Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Date: Sun Sep 29 00:25:33 2024 +0000 chore(nix): update lockfile Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/4f807e8940284ad7925ebd0a0993d2a1791acb2f?narHash=sha256-IiA3jfbR7K/B5%2B9byVi9BZGWTD4VSbWe8VLpp9B/iYk%3D' (2024-09-11) → 'github:NixOS/nixpkgs/1925c603f17fc89f4c8f6bf6f631a802ad85d784?narHash=sha256-J%2BPeFKSDV%2BpHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI%3D' (2024-09-26) commit ed15a28eb3af1487cff7b81ed06b91afd35de4a0 Author: Rachel Powers <[email protected]> Date: Sat Sep 28 14:58:13 2024 -0700 fix : baking the redist into the installer breaks GPL, download at runtime instead Signed-off-by: Rachel Powers <[email protected]> commit a897b012d988861a47df887f0e8d2cd55d7bd584 Author: Edgars Cīrulis <[email protected]> Date: Sat Sep 28 12:11:25 2024 +0300 chore: update Qt to 6.7.3 Only bug fixes no new / breaking changes Signed-off-by: Edgars Cīrulis <[email protected]> commit 00f4221a836bc747ec8d220a52e7b96ed24f871a Author: Rachel Powers <[email protected]> Date: Fri Sep 27 19:16:50 2024 -0700 reorg MSVC set(CMAKE_INSTALL_SYSTEM_RUNTIMES_LIBS_SKIP true) call Signed-off-by: Rachel Powers <[email protected]> commit b9c19fd3f73877f80fb2363617d893f91e5037e2 Author: Mason Rocha <[email protected]> Date: Fri Sep 27 16:42:59 2024 -0500 fix: don't annoy when java tmpdir jvmarg is set & /tmp is noexec Signed-off-by: Mason Rocha <[email protected]> Got annoyed, didn't want to see it anymore. Java tmpdir noexec warning modified to include information about possible remedies available commit 8fa4467a362a55d10a3491a3b1d2301d3510383a Author: Rachel Powers <[email protected]> Date: Fri Sep 27 13:29:00 2024 -0700 use `/norestart` with redist install Co-authored-by: seth <[email protected]> Signed-off-by: Rachel Powers <[email protected]> commit c5daca3b013bd9cc8b17283d2a63e873480c2c16 Author: Rachel Powers <[email protected]> Date: Fri Sep 27 00:57:28 2024 -0700 include vc_redist in portable build Signed-off-by: Rachel Powers <[email protected]> commit 37d3b2a4f631d2a8ce3570a9c377576d4f5a3aa1 Author: Rachel Powers <[email protected]> Date: Fri Sep 27 00:49:00 2024 -0700 prevent the unauthorised reditribution of MSVC CRT files Signed-off-by: Rachel Powers <[email protected]> commit 2dc6f7504b4cfb64b59b3eb905f1b1ac387b8c83 Author: Rachel Powers <[email protected]> Date: Fri Sep 27 00:18:35 2024 -0700 add vc_redist as a NSIS install section Signed-off-by: Rachel Powers <[email protected]> commit b9a6c13d4782ed249f0119f86e65ec4d383f0667 Merge: 3e6071325 6475dc578 Author: Alexandru Ionut Tripon <[email protected]> Date: Thu Sep 26 20:35:14 2024 +0300 Merge pull req…
commit d2d6320e44674159ea2d89e675306ceaa3fb2d59 Author: Evan Goode <[email protected]> Date: Sun Jan 12 04:02:16 2025 +0000 README: Don't mention fjordlauncher-bin MPR package prismlauncher-bin [1] is out of date and so fjordlauncher-bin also hasn't been updated in a while. Not sure whether -bin packages are dangerous on MPR as they are on AUR, so we'll just omit it from the install instructions for now. [1] https://mpr.makedeb.org/packages/prismlauncher-bin commit 8cd807c2d6f4f98b8de5b48ed6595a33edce8ce8 Author: Evan Goode <[email protected]> Date: Sat Jan 11 19:37:53 2025 -0500 Fix FetchFlameAPIKey compile error commit ccc886b51fec06980a324188391b588d57e9ff79 Author: Evan Goode <[email protected]> Date: Sat Jan 11 19:19:36 2025 -0500 Re-enable built-in updater commit 594fa981ea8977c6f5fade037094cf0c4d0eb7da Merge: 936252e44 fdfdf2eef Author: Evan Goode <[email protected]> Date: Sat Jan 11 19:05:25 2025 -0500 Merge remote-tracking branch 'prismlauncher/release-9.x' into develop commit 936252e4455ab7179f21f2c765805e7e6689d10a Author: Evan Goode <[email protected]> Date: Tue Dec 31 11:28:38 2024 -0500 Not yet in nixpkgs Resolves #46 commit fdfdf2eef1f4ff4b91e0a2b3ac0001321729cdf0 Merge: 43dc330e5 bbfa5a5ed Author: Alexandru Ionut Tripon <[email protected]> Date: Thu Dec 19 10:34:01 2024 +0200 Merge pull request #3224 from Trial97/backport_fix_auto_mod_provider [backport]Fix automatically choose mod provider option commit bbfa5a5ed151d5d7966160f044de89a82550a264 Author: Trial97 <[email protected]> Date: Mon Dec 16 14:51:59 2024 +0200 Fix automatically choose mod provider option Signed-off-by: Trial97 <[email protected]> commit 43dc330e55e9cd4604e09e0fa2d2b54e6d0f9453 Merge: ca0dd583b 0c962dff5 Author: Alexandru Ionut Tripon <[email protected]> Date: Wed Dec 18 23:30:10 2024 +0200 Merge pull request #3223 from Trial97/backport_fix_flame_loader_match [backport]fix the flame loaders match commit 0c962dff599fda5818161d08e65ca7ff06cc7eb2 Author: Trial97 <[email protected]> Date: Fri Nov 1 13:44:06 2024 +0200 fix the flame loaders match Signed-off-by: Trial97 <[email protected]> commit ca0dd583bab6b0f64259bd301fabe27082b75d91 Merge: f8d3d8399 7bb686c85 Author: timoreo <[email protected]> Date: Wed Dec 18 19:53:32 2024 +0100 Merge pull request #3222 from PrismLauncher/backport-3197-to-release-9.x [Backport release-9.x] Do not fail curseforge import if modrinth file check fails commit 7bb686c85bab381fd8a2b4a8dc18e958f22c134d Author: Trial97 <[email protected]> Date: Thu Dec 12 17:29:46 2024 +0200 Do not fail curseforge import if modrinth file check fails Signed-off-by: Trial97 <[email protected]> (cherry picked from commit a1c1c0b769d77eb8c44cef3dc0966e7184b2ce78) commit f8d3d8399dfe8cba3ef2705217fd11bf69951c60 Merge: 072c495ec 9cb2a3ab2 Author: timoreo <[email protected]> Date: Wed Dec 18 19:42:58 2024 +0100 Merge pull request #3221 from PrismLauncher/backport-3214-to-release-9.x [Backport release-9.x] Correct symbolic link destination on manifest (Mojang) Java download commit 9cb2a3ab2d0aa89a081ce65f9a9c84f7c20493a5 Author: Kenneth Chew <[email protected]> Date: Mon Dec 16 02:27:26 2024 -0500 Correct symbolic link destination on manifest Java download Signed-off-by: Kenneth Chew <[email protected]> (cherry picked from commit 8d53242952ceeed11bd1a57c9ac43344d854ac8c) commit 072c495ec6395de3b8fc2ef018862cca6c58f61a Merge: ebeff36da 335941fb4 Author: Alexandru Ionut Tripon <[email protected]> Date: Sat Dec 14 18:39:04 2024 +0200 Merge pull request #3206 from PrismLauncher/backport-3202-to-release-9.x [Backport release-9.x] [macOS] Update Sparkle to v2.6.4 commit 335941fb46c8be4d6043bd882bb8c555ce648984 Author: Kenneth Chew <[email protected]> Date: Sat Dec 14 00:42:08 2024 -0500 Update Sparkle to v2.6.4 Signed-off-by: Kenneth Chew <[email protected]> (cherry picked from commit b6cd46ad27e8046962dcb7b3b43a973ff08564eb) commit ebeff36da57c81b9d76877dc734415dcbe3557c3 Merge: 87dc1bb6a 1d29f63be Author: Alexandru Ionut Tripon <[email protected]> Date: Sat Dec 14 18:34:38 2024 +0200 Merge pull request #3205 from PrismLauncher/backport-3199-to-release-9.x [Backport release-9.x] Fix tab order in launcher settings commit 1d29f63bec66f0dca653e4f1b75924172a6e25e5 Author: Kenneth Chew <[email protected]> Date: Thu Dec 12 14:53:39 2024 -0500 Fix tab order in launcher settings Signed-off-by: Kenneth Chew <[email protected]> (cherry picked from commit c3712ba6483f6386e2930ec0ed059d8c94f671b6) commit 87dc1bb6a6bc129dfbfefe38b18bd195dc2bd13e Merge: a85720b8d 4c28a94de Author: Alexandru Ionut Tripon <[email protected]> Date: Sat Dec 14 18:19:20 2024 +0200 Merge pull request #3204 from PrismLauncher/backport-3198-to-release-9.x [Backport release-9.x] [macOS] Add local network usage description commit a85720b8d6197bc3db8eb737384a2c1c59389cbd Merge: 577999bd3 344ae87f2 Author: Alexandru Ionut Tripon <[email protected]> Date: Sat Dec 14 18:19:09 2024 +0200 Merge pull request #3203 from PrismLauncher/backport-3181-to-release-9.x [Backport release-9.x] fix crash with invalid mrpack format commit 4c28a94de1ce8a64fa16c187379c4cb59b2bbf8b Author: Kenneth Chew <[email protected]> Date: Thu Dec 12 14:43:28 2024 -0500 Add local network usage description Signed-off-by: Kenneth Chew <[email protected]> (cherry picked from commit c3e44554abccfd16ff7f84740932848e59d28474) commit 344ae87f257f2d3bc706d7ebad56e405b2330165 Author: Trial97 <[email protected]> Date: Sun Dec 8 22:04:16 2024 +0200 fix crash with invalid mrpack format Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 1dd0728a58159bc835b2e7724a707776ae0b93ce) commit 577999bd356595c8c0f9923f1cfffa1e7cecf80f Merge: 7865b8128 887db29f3 Author: Alexandru Ionut Tripon <[email protected]> Date: Mon Dec 9 09:15:53 2024 +0200 Merge pull request #3183 from PrismLauncher/backport-3170-to-release-9.x [Backport release-9.x] [Linux] Don't use fallback icon search paths commit 887db29f35f7037994fbbdb8db3f5ebfcefe03bd Author: leia uwu <[email protected]> Date: Fri Dec 6 16:40:07 2024 -0300 fix icon theme search paths using fallback search paths breaks qadwaitadecorations Signed-off-by: leia uwu <[email protected]> (cherry picked from commit 614574f15c507f884fc2ceff74db8c919674a0f1) commit 7865b8128e1f44d4a52cc09b21ef501a0134673b Merge: d1a05d312 a58f12553 Author: Alexandru Ionut Tripon <[email protected]> Date: Fri Dec 6 08:47:51 2024 +0200 Merge pull request #3169 from PrismLauncher/backport-3166-to-release-9.x [Backport release-9.x] chore(deps): update actions/cache action to v4.2.0 commit a58f125535e45fea0bf9b955f9babba6afc524d9 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Thu Dec 5 20:29:11 2024 +0000 chore(deps): update actions/cache action to v4.2.0 (cherry picked from commit 94c893bd865ceba286dffc1d6392df07d47c11d9) commit d1a05d312d7fce8b9dd8f5dd6abc0c1570fb8c60 Merge: 189878e7e bbf21e582 Author: Alexandru Ionut Tripon <[email protected]> Date: Mon Dec 2 17:30:57 2024 +0200 Merge pull request #3158 from PrismLauncher/backport-3119-to-release-9.x [Backport release-9.x] Sync Flatpak manifest with Flathub's commit bbf21e5824a4e271e071c72aa3604b0ef1b012d3 Author: guihkx <[email protected]> Date: Tue Nov 26 13:51:09 2024 -0300 ci(flatpak): update build artifact name Just aligning the name of the Flatpak package with other build artifacts. Signed-off-by: guihkx <[email protected]> (cherry picked from commit e0faee7f262fda898ceb8ea5ab40249dbd6c52ea) commit 73b4223b6136898a76c12e4531f651aa0c529e16 Author: guihkx <[email protected]> Date: Tue Nov 26 13:51:09 2024 -0300 flatpak: update KDE runtime to 6.8 This also switches to the Docker image provided and maintained by Flathub collaborators through the 'flathub-infra' organization on GitHub, because it looks better maintained at the moment. Signed-off-by: guihkx <[email protected]> (cherry picked from commit f6770a847a8419ef0b1acab30144077f745a48ee) commit 686e0b7b189dd0dfa5852fe0e8c47ce439fdd577 Author: guihkx <[email protected]> Date: Tue Nov 26 13:51:09 2024 -0300 flatpak: update xrandr to 1.5.3 Signed-off-by: guihkx <[email protected]> (cherry picked from commit 4a50e949672461b5b69b039ff240ced6dad9bdd5) commit 189878e7e321b38898150e88a900dcadbd000dad Merge: cdfd0b100 af74d5f41 Author: Alexandru Ionut Tripon <[email protected]> Date: Mon Dec 2 16:25:06 2024 +0200 Merge pull request #3157 from PrismLauncher/backport-3135-to-release-9.x [Backport release-9.x] Make FTB Import note italic to match others commit af74d5f41012847ee3116bf38d3b40cc7996bee8 Author: Trial97 <[email protected]> Date: Sun Nov 24 20:29:07 2024 +0200 Make FTB Import note italic to match others Signed-off-by: Trial97 <[email protected]> (cherry picked from commit a09af619cee3265710097724f539d9457695658d) commit cdfd0b10027680346ea453dc4dc3171ba0951a9b Merge: e0c323a19 9791c306d Author: Tayou <[email protected]> Date: Mon Dec 2 15:02:21 2024 +0100 Merge pull request #3156 from PrismLauncher/backport-3152-to-release-9.x [Backport release-9.x] Fix system icons on Linux commit 9791c306dcd0ba4b33335c649fe56cc08e394193 Author: leia uwu <[email protected]> Date: Sat Nov 30 12:50:57 2024 -0300 fix: icon search paths memory leak Signed-off-by: leia uwu <[email protected]> (cherry picked from commit 3f67ef968bb9be3b1cdfdfa68e2d38ddf8e1a3cf) commit e7e9265c40a1621e5a7f7c08db47bc77dc859896 Author: leia uwu <[email protected]> Date: Sat Nov 30 11:30:25 2024 -0300 fix: fix system icons This sets the fallback icon theme to the current(system default) icon theme before launcher specific themes are applied And removes `Inherits` line of multimc/legacy icon theme because it can end up making it inherit a default theme set from /usr/share/icons/default/index.theme instead of the user configured theme (probably a qt bug?) Signed-off-by: leia uwu <[email protected]> (cherry picked from commit fd9c80db62436b1a364cb8342ba45a059c53f899) commit 687934433423b9d7c1014867f66f2bc73bd57c91 Author: Evan Goode <[email protected]> Date: Sat Nov 30 17:29:26 2024 -0500 chore(nix): nixfmt commit a5bca15d46ef5820340bed387003541777120da9 Author: Evan Goode <[email protected]> Date: Sat Nov 30 17:24:43 2024 -0500 chore(nix): sync with upstream Prism Launcher commit 7b5a2baa36a814bc332efc3469650e729502af07 Merge: 7516b3c70 70e662ca7 Author: Evan Goode <[email protected]> Date: Sat Nov 30 16:20:14 2024 -0500 Merge pull request #42 from ryze312/nix Nix: Update lock file and switch to addDriverRunpath commit 70e662ca7dafc30c9c00f0a6c4eccb4d2c5782f0 Author: Ryze <[email protected]> Date: Sat Nov 30 11:38:48 2024 +0300 nix: update lock file and switch to addDriverRunpath Signed-off-by: Ryze <[email protected]> commit 7516b3c70cf9910831ca3d2d119c6db78f88adfb Merge: e2de54b6b 8f44b6513 Author: Evan Goode <[email protected]> Date: Wed Nov 27 13:34:10 2024 -0500 Merge pull request #41 from unmojang/evan-goode/select-profile Add dialog to select profile if multiple availableProfiles commit 8f44b6513fefd228296f816010641c2198a21148 Author: Evan Goode <[email protected]> Date: Mon Nov 25 17:42:38 2024 -0500 Add dialog to select profile if multiple availableProfiles Resolves https://github.com/unmojang/FjordLauncher/issues/29 and obsoletes https://github.com/unmojang/FjordLauncher/pull/34. This implementation follows the authlib-injector specification: https://github.com/yushijinhun/authlib-injector/wiki/%E5%90%AF%E5%8A%A8%E5%99%A8%E6%8A%80%E6%9C%AF%E8%A7%84%E8%8C%83#%E8%B4%A6%E6%88%B7%E7%9A%84%E6%B7%BB%E5%8A%A0 ([Google translate to English](https://github-com.translate.goog/yushijinhun/authlib-injector/wiki/%E5%90%AF%E5%8A%A8%E5%99%A8%E6%8A%80%E6%9C%AF%E8%A7%84%E8%8C%83?_x_tr_sl=auto&_x_tr_tl=en&_x_tr_hl=en-US)) commit e0c323a190e1173ef41756f287b5585fe8423f85 Merge: d453240a9 a91474741 Author: Alexandru Ionut Tripon <[email protected]> Date: Mon Nov 25 12:09:01 2024 +0200 Merge pull request #3138 from PrismLauncher/backport-3130-to-release-9.x [Backport release-9.x] Improve MANIFEST.MF parsing commit a9147474169bdad603c139b5b8bad4e1912563d4 Author: Kationor <[email protected]> Date: Sun Nov 24 19:30:59 2024 +0100 Improve MANIFEST.MF parsing Previously, we would only properly parse LF-encoded manifests, and even those only if they used the recommended casing. This commit allows the parser to recognise CR and CRLF newlines, and also makes the name comparison case insensitive to align with the specification. (Though not completely: we still don't support multiline values) Signed-off-by: Kationor <[email protected]> (cherry picked from commit b40a1973bfe590fb21b486419a8d223b2c6aae7f) commit e2de54b6b3fdab5bbfa1ed2c7d05b4ee694628f6 Author: Evan Goode <[email protected]> Date: Sat Nov 23 16:32:40 2024 -0500 Add Spaceship and Phoebe catpack commit d453240a949c90a732f3203216ca4b2e2296a611 Merge: 2a4c4ed8e 4c4017d7c Author: Alexandru Ionut Tripon <[email protected]> Date: Fri Nov 15 10:35:25 2024 +0200 Merge pull request #3105 from Trial97/backport_3019 [Backport release-9.x] fixed double deletion for tasks commit 4c4017d7ca84162ff8c508d4b9f22a979d6c223e Author: Trial97 <[email protected]> Date: Mon Oct 28 19:13:14 2024 +0200 remove task parent from constuctor Signed-off-by: Trial97 <[email protected]> commit 2a4c4ed8ea001900210eb1853e792dc07c863109 Merge: 947fbf7d6 1c94a3e3e Author: Alexandru Ionut Tripon <[email protected]> Date: Fri Nov 15 08:55:46 2024 +0200 Merge pull request #3103 from PrismLauncher/backport-3024-to-release-9.x [Backport release-9.x] fix leak on resource search commit 947fbf7d644281b647b667b6841576be7eaf8c95 Merge: 6c6a4625a eefeb5799 Author: Alexandru Ionut Tripon <[email protected]> Date: Fri Nov 15 08:55:17 2024 +0200 Merge pull request #3102 from PrismLauncher/backport-3070-to-release-9.x [Backport release-9.x] Add scrollbar to Settings -> Launcher -> Features commit 1c94a3e3e5e6273216987041c926652c8bf6f34c Author: Trial97 <[email protected]> Date: Tue Oct 29 00:40:13 2024 +0200 fix leak on resource search Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 8e7d84d05beffac492522f4b2c0d9e638b15146b) commit eefeb5799df51ef7a1d634c84596553a2107555d Author: TheKodeToad <[email protected]> Date: Wed Nov 6 23:57:24 2024 +0000 Add scrollbar to Settings -> Launcher -> Features Signed-off-by: TheKodeToad <[email protected]> (cherry picked from commit 71e55f88294976577ad0b2f8c21b635cf8fc9735) commit 6c6a4625ab81ec7aeb47d56d8f527a979a84365c Merge: 6d2a96f6a ea9029d7b Author: timoreo <[email protected]> Date: Fri Nov 15 06:15:22 2024 +0100 Merge pull request #3101 from PrismLauncher/backport-3096-to-release-9.x [Backport release-9.x] Fix file remaingin open after program closure commit 6d2a96f6a757071680028855b852d22ec7a4f971 Merge: 509f8c730 76602391f Author: timoreo <[email protected]> Date: Fri Nov 15 06:15:06 2024 +0100 Merge pull request #3098 from Trial97/resource_backport Fix crash caused by invalid resource pointer commit ea9029d7b62a729206a8f137d58065e574540b7b Author: Trial97 <[email protected]> Date: Thu Nov 14 13:17:52 2024 +0200 Fix file remaingin open after program closure Signed-off-by: Trial97 <[email protected]> (cherry picked from commit ce61ed2f86d313f63c999d012d768425ea3793c3) commit 76602391f4079b303f31143cf60b4823e2a2b2b2 Author: Trial97 <[email protected]> Date: Thu Nov 14 16:26:21 2024 +0200 Fix crash caused by invalid resource pointer Signed-off-by: Trial97 <[email protected]> commit 509f8c730765140b0d9f7c972e1563ab42bfe886 Merge: 04e1a97d5 984daa450 Author: Alexandru Ionut Tripon <[email protected]> Date: Thu Nov 7 23:48:40 2024 +0200 Merge pull request #3079 from PrismLauncher/backport-3074-to-release-9.x [Backport release-9.x] Close the window using the invokeMethod to not block commit 984daa450bbc53cec83b183472d83e022efc3739 Author: Trial97 <[email protected]> Date: Thu Nov 7 14:45:14 2024 +0200 Close the window using the invokeMethod to not block Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 9601fbf2d5b36d3609cce6b1a3b458db0d170531) commit 04e1a97d596614af675e932793e596ac7a5cd9c3 Merge: 87d5b9676 1dce1360b Author: Tayou <[email protected]> Date: Thu Nov 7 17:31:15 2024 +0100 Merge pull request #3077 from PrismLauncher/backport-3036-to-release-9.x [Backport release-9.x] Fix installed typo commit 1dce1360bdea93e5c8450585e1154cead29463aa Author: Trial97 <[email protected]> Date: Thu Oct 31 14:51:18 2024 +0200 Fix installed typo Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 670c932f32753fd67979f95810b052d7a62a0006) commit 87d5b96760709b6d6a60b2c6aec45fa79c8588de Merge: 53bc20f13 7f074ca7b Author: timoreo <[email protected]> Date: Tue Nov 5 11:26:18 2024 +0100 Merge pull request #3061 from PrismLauncher/backport-3060-to-release-9.x [Backport release-9.x] ci: bump linux qt version commit 7f074ca7b94d56a8700752ede95c7474291ee307 Author: Rachel Powers <[email protected]> Date: Tue Nov 5 01:30:55 2024 -0700 ci: libxcb-curcsor_dev ? Signed-off-by: Rachel Powers <[email protected]> (cherry picked from commit ba6743d134589294ac3ba754e6ad83c2e59d4ffd) commit c0394c52b7e944c7e5d14e8da5128b5f92e19ace Author: Rachel Powers <[email protected]> Date: Tue Nov 5 01:10:38 2024 -0700 ci: bump linux qt version Signed-off-by: Rachel Powers <[email protected]> (cherry picked from commit d63a3364111a99337c2096c807550f3d7c62b47a) commit 53bc20f13fc62e3ffc758c008ccd3cc462402558 Merge: 3977918c5 40af3cf3d Author: Alexandru Ionut Tripon <[email protected]> Date: Sun Nov 3 11:56:20 2024 +0200 Merge pull request #3052 from PrismLauncher/backport-3042-to-release-9.x [Backport release-9.x] use isPortable to determine if the MSAStep should check for url handler commit 40af3cf3d2fbf0c931eb9e137e6a69f6e8831a86 Author: Trial97 <[email protected]> Date: Fri Nov 1 11:03:47 2024 +0200 use isPortable to determine if the MSAStep should check for url handler Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 99cfb6237030f03c148e531da78b8da8f7d4c2f1) commit 3977918c5b30366459dc0f01a72578b637ac161d Merge: 0f5eb0383 484d90899 Author: Alexandru Ionut Tripon <[email protected]> Date: Sun Nov 3 11:56:07 2024 +0200 Merge pull request #3051 from PrismLauncher/backport-3045-to-release-9.x [Backport release-9.x] disable retry for modrinth currentVersions API commit 484d90899f293121558a5a6da984bd7eb5a1c508 Author: Trial97 <[email protected]> Date: Fri Nov 1 17:34:29 2024 +0200 disable retry for modrinth currentVersions API Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 6f2f3c2d3bf6a170060523ad47fe69fef57bd9b4) commit 0f5eb03839a18b61567ad0374770ab4815b40325 Merge: 52a321b93 d21cda188 Author: Tayou <[email protected]> Date: Wed Oct 30 21:57:18 2024 +0100 Merge pull request #3034 from PrismLauncher/backport-3010-to-release-9.x commit d21cda188061778ab678cc69bfaa004b7bf99b59 Author: Trial97 <[email protected]> Date: Sun Oct 27 12:36:14 2024 +0200 lock m_instanceExtras Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 11d4d948aa1a1ba67cee59193eb98a7fdad2d909) commit 52a321b93b11affc8ff0aee2e9f760b661c5a2f8 Merge: 23d6f8aae dd8dec8be Author: Alexandru Ionut Tripon <[email protected]> Date: Wed Oct 30 21:21:49 2024 +0200 Merge pull request #3033 from PrismLauncher/backport-3030-to-release-9.x [Backport release-9.x] Fix system detection for Intel Macs commit dd8dec8be8c9c12f659c89a13746e4e52d0d0aa7 Author: Trial97 <[email protected]> Date: Wed Oct 30 17:15:42 2024 +0200 fix macos system detection Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 14c95b9d376975144faddc33e7154cca86621804) commit 390af2df4572390715336f2b13c43fbea81826ad Author: Evan Goode <[email protected]> Date: Tue Oct 29 21:30:04 2024 -0400 Add back "PollyMC Contributors", it was deleted by mistake commit 4e154d2b47b7447158049b0702bca77c5411df38 Merge: 441d471a9 0f33e1292 Author: Evan Goode <[email protected]> Date: Tue Oct 29 20:54:09 2024 -0400 Merge pull request #38 from unmojang/evan-goode/merge-9.0 Merge changes from Prism Launcher 9.1 commit 23d6f8aaed3588fc875e0b5896fa01a8142d4984 Merge: 1129b4160 d105d76f2 Author: Tayou <[email protected]> Date: Tue Oct 29 23:15:22 2024 +0100 Merge pull request #3028 from PrismLauncher/backport-3027-to-release-9.x commit d105d76f2af754d71104f0d05c4911b57b71fc00 Author: Ben Westover <[email protected]> Date: Tue Oct 29 18:24:19 2024 +0000 Fix some typos Signed-off-by: Ben Westover <[email protected]> (cherry picked from commit f6511c601e1fd63a864f1681beef0f85adfe6f7e) commit 698a838b56d47a6be806eb92107e2ae617583d9f Author: Ben Westover <[email protected]> Date: Tue Oct 29 18:20:00 2024 +0000 Shorten metainfo.xml app summary Signed-off-by: Ben Westover <[email protected]> (cherry picked from commit fd109c47401c755e35da9c2884e9b38532bed56c) commit 0f33e129226bcfa138013be69a8d3a7c88b4bf69 Author: Evan Goode <[email protected]> Date: Mon Oct 28 22:12:48 2024 -0400 Remove extra search bars in FtbAppImport and Modrinth pages commit 04703d83eeae113bdfb8cf7508edb9bedb92a377 Author: Evan Goode <[email protected]> Date: Mon Oct 28 22:07:15 2024 -0400 Delete remaining Mojang cruft commit 1129b4160c0be6ec5bb9d7411d56a98a316e0f15 Merge: 42190819a 63a6f823f Author: Alexandru Ionut Tripon <[email protected]> Date: Mon Oct 28 23:00:19 2024 +0200 Merge pull request #3022 from PrismLauncher/backport-2989-to-release-9.x [Backport release-9.x] add extra protection against empty download link commit 63a6f823fd9a35c749f061b26f53d5b0623f50cf Author: Trial97 <[email protected]> Date: Mon Oct 28 22:27:40 2024 +0200 add qassert Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 94f65f8727bfd12cc50eb8b62d52bca308cef9b5) commit db32b2ad992a534b8824d905339ba15d3bf371f8 Author: Trial97 <[email protected]> Date: Mon Oct 28 19:19:06 2024 +0200 remove message box Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 9cdda4377b0090a035e286a86fd78f126f995356) commit c3cf5d31da70ed980ebab0cbf0a2216156dc835c Author: Trial97 <[email protected]> Date: Mon Oct 28 12:54:21 2024 +0200 replace currentData with itemData on QComboBox::currentIndexChanged slots Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 0cafac84ac6328fefb8992de2c6a2385b1c0053c) commit 1e696328bb89ce363e36d3c460b9ec05709b8644 Author: Trial97 <[email protected]> Date: Sun Oct 27 03:05:56 2024 +0200 fix #3001 Signed-off-by: Trial97 <[email protected]> (cherry picked from commit b593ff09e9c4b5fa30ca082eea4cd69f12a286e5) commit 1d9c97803a51ac1a4d44fe23adf129388688dde9 Author: Trial97 <[email protected]> Date: Sun Oct 27 03:05:30 2024 +0200 rename snake_case to camelCase Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 44894a29b1784cfa8a04807c17d21169230ff922) commit 3d55236fdf14cbe0c39b922ed7ef21e831a3688e Author: Trial97 <[email protected]> Date: Fri Oct 25 01:05:58 2024 +0300 add extra protection against empty download link Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 8daa1219a508ddb37070c01046c78b731a277887) commit 42190819ae0fc92813b9ec01a8bd18e3b0cdf76c Merge: bf57d7707 130714a9a Author: Alexandru Ionut Tripon <[email protected]> Date: Mon Oct 28 22:36:29 2024 +0200 Merge pull request #3020 from PrismLauncher/backport-2837-to-release-9.x [Backport release-9.x] translate standard buttons commit 130714a9ab24ce45ad935d7e2ab2a9440b2708fd Author: Trial97 <[email protected]> Date: Wed Sep 18 21:01:34 2024 +0300 translate standard buttons Signed-off-by: Trial97 <[email protected]> (cherry picked from commit bd82737efbb99dfc488d6d073046e5fe62693a9e) commit bf57d77075c944a16257e23eb79597a62be243c6 Merge: 0722dba82 98fe03544 Author: Tayou <[email protected]> Date: Mon Oct 28 14:24:25 2024 +0100 Merge pull request #3017 from PrismLauncher/backport-3002-to-release-9.x commit 98fe035442edc0efa9b58e9b4924ca05da864f8b Author: Trial97 <[email protected]> Date: Mon Oct 28 12:39:26 2024 +0200 replace unzipping with unpacking Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 9eb1ce3ad7dde0b2ca551b0b281081724e6fd58e) commit 8e4994590bd59bcabca2c0b27e4b064f49d00c31 Author: Trial97 <[email protected]> Date: Sun Oct 27 03:02:13 2024 +0300 fix unzipping typo Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 685d3c79ac78d7e41ab257de82dc743020189a33) commit 0722dba820837ec2ee29e339c6478bc8e16871c3 Merge: 4d89512ca 9560447c9 Author: Tayou <[email protected]> Date: Mon Oct 28 14:04:52 2024 +0100 Merge pull request #3016 from PrismLauncher/backport-3009-to-release-9.x commit 9560447c92a5d5c794f9a890134de38839eda81e Author: Trial97 <[email protected]> Date: Sun Oct 27 12:06:45 2024 +0200 swap search with filter button for modpacks Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 61448a61ea400eebd91f97aa07e9419cc2f35823) commit 4d89512ca1782092d6a8a418a4aa2217a4b75ee5 Merge: d85408708 42a6bd115 Author: Alexandru Ionut Tripon <[email protected]> Date: Sun Oct 27 22:30:02 2024 +0200 Merge pull request #3013 from PrismLauncher/backport-3008-to-release-9.x [Backport release-9.x] change contributors name commit 42a6bd11515e9dd7fd51d79c015e9a62ea99f925 Author: Trial97 <[email protected]> Date: Sun Oct 27 13:17:58 2024 +0200 change ZekeZ name Signed-off-by: Trial97 <[email protected]> (cherry picked from commit c4cd7cf6c173b7052f31614b4641d2172defa91a) commit f06505b1381a13826a04adfe42acbc6369f6e012 Author: Trial97 <[email protected]> Date: Sun Oct 27 11:58:34 2024 +0200 change contributors name Signed-off-by: Trial97 <[email protected]> (cherry picked from commit f373a5cea0e816158cdabca3423107989aed0a85) commit 5c8bdf99cdc04d984ed0d10a2a920a5265c30b98 Author: Evan Goode <[email protected]> Date: Sun Oct 27 13:19:33 2024 -0400 Gray out "Manage Skins" button for authlib-injector accounts Support for this is blocked by https://github.com/unmojang/FjordLauncher/issues/37, which we can get to after the 9.0 release. commit fab399c0943f7af42c313a1fcc1323a65a37585b Author: Evan Goode <[email protected]> Date: Sat Oct 26 19:36:26 2024 -0400 Remove extra code comment commit e177117a8f7ff30a6fae49a6dc272a7a6d0b1571 Author: Evan Goode <[email protected]> Date: Sat Oct 26 19:08:36 2024 -0400 Fix FTB import goof commit 9a0f9a9f67b6ee4401d73f146bb205fd08c5fe90 Author: Evan Goode <[email protected]> Date: Sat Oct 26 18:30:16 2024 -0400 Fix Windows build commit 95af313f4971b74ad7435971a4ec7b7b4b39c9cd Merge: da9c085a0 07addf244 Author: Evan Goode <[email protected]> Date: Sat Oct 26 17:54:34 2024 -0400 Merge tag '9.1' into evan-goode/merge-9.0 commit da9c085a0643c48984c84aecb7def950ade1f329 Author: Evan Goode <[email protected]> Date: Sat Oct 26 17:24:52 2024 -0400 Clean up some lingering differences from upstream commit b4963162413e5a89782cdecd4578c0ceeb187b6d Author: Evan Goode <[email protected]> Date: Sat Oct 26 16:45:14 2024 -0400 Change a few occurrences of "prism" to "fjord" commit c15afbda4af9473ebfd80f20de5d700aa460ccfc Author: Evan Goode <[email protected]> Date: Sat Oct 26 15:25:27 2024 -0400 Fix build? commit 7f52d57454539880704d5422b595e43e1de5116a Author: Evan Goode <[email protected]> Date: Sat Oct 26 14:56:55 2024 -0400 Fix MSA login commit d40b6d8eb346f8b25fa82a0755acab776b5b5de5 Author: Evan Goode <[email protected]> Date: Sat Oct 26 13:40:09 2024 -0400 Error handling for Yggdrasil accounts commit c32aaf244dc8db2771643b1671c456abe7d613b9 Author: Evan Goode <[email protected]> Date: Sat Oct 26 00:17:24 2024 -0400 It compiles, Yggdrasil login working except error handling commit d854087089b4eea2f12d9105a10d46cbf19cf565 Merge: dde5fc47d 31031ec92 Author: seth <[email protected]> Date: Fri Oct 25 21:20:31 2024 -0400 Merge pull request #2997 from PrismLauncher/backport-2992-to-release-9.x [Backport release-9.x] Sync Flake with Nixpkgs commit 31031ec92311c1ccba385ce4cb10553f8172a2ed Author: seth <[email protected]> Date: Fri Oct 25 02:34:15 2024 -0400 chore(nix): use `self` for version Signed-off-by: seth <[email protected]> (cherry picked from commit 63b10738b2a1065d55077e729fcada6e7f64d10a) commit 5f06517b62745219183fd364e2557f23dcc04d66 Author: seth <[email protected]> Date: Fri Oct 25 02:33:29 2024 -0400 chore(nix): sync with nixpkgs Signed-off-by: seth <[email protected]> (cherry picked from commit a5c554cf6ee32afa41c5a2af1ea8e8feb0087a49) commit 7dbaa896a6f1e414ead53de6b0a5f0d960b995ea Merge: 441d471a9 e8c9722a5 Author: Evan Goode <[email protected]> Date: Fri Oct 25 15:34:57 2024 -0400 Merge tag '9.0' into develop This is an intermediate/halfway commit, more refactoring is needed to get this to build. commit dde5fc47d32c9b2580f77db47eba1e873ba89add Merge: 76d5f632d a839258c0 Author: Tayou <[email protected]> Date: Fri Oct 25 09:53:49 2024 +0200 Merge pull request #2987 from Trial97/bump_9.2 commit 76d5f632dc7323a66a61039bd5f6b6d7f3ed4526 Merge: e2f5fb27a 27c6596bc Author: Alexandru Ionut Tripon <[email protected]> Date: Fri Oct 25 09:46:30 2024 +0300 Merge pull request #2993 from PrismLauncher/backport-2982-to-release-9.x [Backport release-9.x] Use Launcher log level in AutoInstallJava commit 27c6596bcbfd079c404d99a08688d1a9e72a498c Author: TheKodeToad <[email protected]> Date: Thu Oct 24 01:33:01 2024 +0100 Use Launcher log level in AutoInstallJava Signed-off-by: TheKodeToad <[email protected]> (cherry picked from commit d8702e1357d36423a0d40b916d49fd937284a204) commit e2f5fb27a64b2e349491052f136786103f21846f Merge: 2dde2c4be 98819a0d0 Author: Alexandru Ionut Tripon <[email protected]> Date: Fri Oct 25 09:33:52 2024 +0300 Merge pull request #2991 from PrismLauncher/backport-2963-to-release-9.x [Backport release-9.x] chore(deps): update actions/cache action to v4.1.2 commit 98819a0d02499514590809049ed46feafbb7501a Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Tue Oct 22 13:48:29 2024 +0000 chore(deps): update actions/cache action to v4.1.2 (cherry picked from commit 210d0d8aa25578cbbf8250797504ae1652544600) commit 2dde2c4becce3325112c7b29ec92aee8ef8586f2 Merge: 89041531e 008d69e5e Author: seth <[email protected]> Date: Fri Oct 25 02:20:10 2024 -0400 Merge pull request #2990 from PrismLauncher/backport-2980-to-release-9.x [Backport release-9.x] Sync with Flathub manifest commit 008d69e5e5fc7e0b05125a464dcd23fd95c9fcb5 Author: Arcitec <[email protected]> Date: Thu Oct 24 09:52:40 2024 +0200 fix: bring back Flathub manifest improvements to the repo - Brings back all manifest improvements, such as the incredibly important Mojang Java Downloader (without it, the Flatpak doesn't work), and important fixes for Wayland. Signed-off-by: Arcitec <[email protected]> (cherry picked from commit 4ce025c0a209a4eec20f7f1b9a7777bbe886be8c) commit a839258c07d1faf7958c9c9b0246faacefaabedc Author: Trial97 <[email protected]> Date: Fri Oct 25 00:19:06 2024 +0300 bump develop to 9.2 Signed-off-by: Trial97 <[email protected]> commit 07addf24494933943631245f586d880f432b021d Author: TheKodeToad <[email protected]> Date: Thu Oct 24 13:32:23 2024 +0100 Bump version to 9.1 commit eea119d9c9180b44e3991c98e8eadbe15003efac Merge: e8c9722a5 78e24962f Author: TheKodeToad <[email protected]> Date: Thu Oct 24 13:31:21 2024 +0100 Merge remote-tracking branch 'TheKodeToad/vc-redist-norestart' into 9.1-hotfix commit 89041531e13c550153405ea5ccb1a43592e87d32 Merge: 80d675d2e 729cec5f4 Author: Alexandru Ionut Tripon <[email protected]> Date: Thu Oct 24 15:09:19 2024 +0300 Merge pull request #2981 from PrismLauncher/backport-2975-to-release-9.x [Backport release-9.x] fix: don't hang the ui for a full version load commit 729cec5f45468e9647027ea75155fc1fb6d7c0f1 Author: Rachel Powers <[email protected]> Date: Wed Oct 23 16:23:10 2024 -0700 fix don't hang the ui for a full version load Signed-off-by: Rachel Powers <[email protected]> (cherry picked from commit 7bd04ae928527b065174021fba98dc78d0d119a3) commit 80d675d2e6fd19d634affc69764a35773a1c621c Merge: 877ab62c2 fb7d19941 Author: TheKodeToad <[email protected]> Date: Wed Oct 23 22:39:58 2024 +0100 Merge pull request #2974 from PrismLauncher/backport-2972-to-release-9.x [Backport release-9.x] Fix launching Minecraft in portable Linux commit fb7d19941f7f7e314df1c776fde8cafb3fb248ad Author: TheKodeToad <[email protected]> Date: Wed Oct 23 13:44:39 2024 +0100 Fix CleanEnviroment()'s usage of stripVariableEntries Signed-off-by: TheKodeToad <[email protected]> (cherry picked from commit e7cd8fe078e3a68bd3179816020a9ed08f1b2847) commit 877ab62c2f9dab7a333d5b7a7ae6f04f05c60130 Merge: 25eaa4eba b983ae0fb Author: Alexandru Ionut Tripon <[email protected]> Date: Tue Oct 22 17:41:45 2024 +0300 Merge pull request #2964 from PrismLauncher/backport-2958-to-release-9.x [Backport release-9.x] skip parsing open QSaveFile temprary files as resources commit b983ae0fb000b0a413115f4b8bd64f8447cca80b Author: Trial97 <[email protected]> Date: Tue Oct 22 13:43:16 2024 +0300 fix small leak Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 836aebc0d91fe8658052b8c4a5a4ab31da4a4b15) commit 85422427b9794a3bb6765e9947c03844862035e4 Author: Trial97 <[email protected]> Date: Tue Oct 22 09:41:00 2024 +0300 Replaced QSet with QHash Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 73d33f93b30f658f9671358ac52bf4e03afeaefd) commit 51a71d04715bfc47c1688bd7606b3c4f043cd3d8 Author: Trial97 <[email protected]> Date: Mon Oct 21 23:53:23 2024 +0300 skip QSaveFile temprary files Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 562c3013269dbb9cad411f58ded333dee1aea158) commit 25eaa4eba6663d4237e02b3c49a7ac1f2f18622f Merge: 740db2db0 6da14d66b Author: Alexandru Ionut Tripon <[email protected]> Date: Tue Oct 22 00:15:10 2024 +0300 Merge pull request #2959 from PrismLauncher/backport-2954-to-release-9.x [Backport release-9.x] do not try to import skin if path is empty commit 6da14d66bb80cbd6818582347b49bc6eb3a4c1f2 Author: Alexandru Ionut Tripon <[email protected]> Date: Mon Oct 21 22:59:51 2024 +0300 Update launcher/ui/dialogs/skins/SkinManageDialog.cpp Co-authored-by: TheKodeToad <[email protected]> Signed-off-by: Alexandru Ionut Tripon <[email protected]> (cherry picked from commit 69028969f1a6c42b698b900256ad2e6d9ee208eb) commit 199c5497d327f35d0bc70aa7949be397ed583aa7 Author: Trial97 <[email protected]> Date: Mon Oct 21 19:28:34 2024 +0300 do not try to import skin if path is empty Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 9a5b773e69e7198cc37413ab7d69ba6d0a66f854) commit 740db2db022b333e762b15f7440ad9a5f478ca49 Merge: c5e7bb90c 577f8074e Author: Alexandru Ionut Tripon <[email protected]> Date: Mon Oct 21 22:46:49 2024 +0300 Merge pull request #2956 from PrismLauncher/backport-2953-to-release-9.x [Backport release-9.x] Fix removing portable.txt on Linux portable build commit 577f8074e1ec203e119b50b1588d2b789eb40425 Author: TheKodeToad <[email protected]> Date: Mon Oct 21 16:30:08 2024 +0100 Fix removing portable.txt on Linux portable build Signed-off-by: TheKodeToad <[email protected]> (cherry picked from commit f3f4c446206647b69b9c19e63617b163b99c6164) commit c5e7bb90c5b03cd6434cad40b42595cf59254dbd Merge: 3bf4fbf8f 1cf91fa5d Author: Alexandru Ionut Tripon <[email protected]> Date: Mon Oct 21 18:04:53 2024 +0300 Merge pull request #2952 from PrismLauncher/backport-2947-to-release-9.x [Backport release-9.x] do not require java if auto-download is enabled commit 1cf91fa5d93aa2a4b2caab10a20b65ca4b95869a Author: Trial97 <[email protected]> Date: Mon Oct 21 16:17:48 2024 +0300 do not require java if auto-download is enabled Signed-off-by: Trial97 <[email protected]> (cherry picked from commit fcadbbb739076096a9057ec340f7f6d39bc4b72f) commit 3bf4fbf8f44357829038ea8cf0898f94c033c08b Merge: e8c9722a5 ff97affa7 Author: Tayou <[email protected]> Date: Mon Oct 21 16:55:28 2024 +0200 Merge pull request #2951 from PrismLauncher/backport-2948-to-release-9.x commit ff97affa7210524a506a7ae25d8d17c41ca6f0ae Author: TheKodeToad <[email protected]> Date: Mon Oct 21 14:41:48 2024 +0100 Fix /norestart Signed-off-by: TheKodeToad <[email protected]> (cherry picked from commit 78e24962f93b5cc2350d04bebd7e5231d1bc4819) commit 78e24962f93b5cc2350d04bebd7e5231d1bc4819 Author: TheKodeToad <[email protected]> Date: Mon Oct 21 14:41:48 2024 +0100 Fix /norestart Signed-off-by: TheKodeToad <[email protected]> commit e8c9722a53b9cc1eaceb6da23257dfad5b70081d Merge: 3ac080806 9a810dfa6 Author: Alexandru Ionut Tripon <[email protected]> Date: Mon Oct 21 00:08:40 2024 +0300 Merge pull request #2939 from PrismLauncher/backport-2938-to-release-9.x [Backport release-9.x] fix sparkle signature commit 9a810dfa6e609d736511fb166efa403eaf9506b3 Author: Trial97 <[email protected]> Date: Sun Oct 20 23:14:05 2024 +0300 fix sparkle signature Signed-off-by: Trial97 <[email protected]> (cherry picked from commit 0586d38e03de6890bf5697c7e1a965aac9bd36fb) commit a8c3a49cb9d12c41cbdaab85e09d38a071bb7560 Merge: 3ac080806 0586d38e0 Author: Alexandru Ionut Tripon <[email protected]> Date: Mon Oct 21 00:05:57 2024 +0300 Merge pull request #2938 from Trial97/fix_sparkle fix sparkle signature commit 0586d38e03de6890bf5697c7e1a965aac9bd36fb Author: Trial97 <[email protected]> Date: Sun Oct 20 23:14:05 2024 +0300 fix sparkle signature Signed-off-by: Trial97 <[email protected]> commit 3ac080806de6f4ec47b7fa889d7daa57096f3ffb Merge: 38e0e0cb7 b676a67b3 Author: ZekeZ <[email protected]> Date: Mon Oct 21 00:14:36 2024 +1000 Merge pull request #2831 from Trial97/fix_login split the auth loading screen commit 38e0e0cb73a0ea07d4545a0fbd17512cb1865a13 Merge: 417bb3564 0501c1e17 Author: seth <[email protected]> Date: Sun Oct 20 02:11:26 2024 -0400 Merge pull request #2935 from PrismLauncher/update_flake_lock_action chore(nix): update lockfile commit 0501c1e17a75172b8c3b8c15da27a86cf64c420b Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Date: Sun Oct 20 00:25:22 2024 +0000 chore(nix): update lockfile Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7?narHash=sha256-9UTxR8eukdg%2BXZeHgxW5hQA9fIKHsKCdOIUycTryeVw%3D' (2024-10-09) → 'github:NixOS/nixpkgs/4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0?narHash=sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c%2BcHUJwA%3D' (2024-10-18) commit 417bb3564d11247dbf02e0d31bee1729670f4977 Merge: e43836a27 01721b593 Author: Alexandru Ionut Tripon <[email protected]> Date: Sat Oct 19 22:33:05 2024 +0300 Merge pull request #2933 from getchoo-contrib/flatpak/jdks Don't bundle JREs in Flatpak commit e43836a271ac496fc5d0213f31dfb0de962600db Merge: 9a161a033 522d105db Author: Alexandru Ionut Tripon <[email protected]> Date: Sat Oct 19 22:32:59 2024 +0300 Merge pull request #2932 from getchoo-contrib/nix/enable-tests Enable checks in Nix package commit 9a161a03350b6486e4e71f5096d11019f573b24f Merge: 464c7c1d4 2d234b127 Author: Alexandru Ionut Tripon <[email protected]> Date: Sat Oct 19 22:32:51 2024 +0300 Merge pull request #2930 from Trial97/fixes Fix tests segfault commit 2d234b127b1561fcedd0beae5bd242d1012c7426 Author: Trial97 <[email protected]> Date: Sat Oct 19 22:07:31 2024 +0300 make sure that tests are only disabled fro cmark Signed-off-by: Trial97 <[email protected]> commit 464c7c1d4d11b8d96f8b168d72acae24dc9cfdb6 Merge: f60d6e4d4 7519c63f2 Author: Rachel Powers <[email protected]> Date: Sat Oct 19 12:00:52 2024 -0700 Merge pull request #2929 from Trial97/https Replace http with https on skins commit 2030041fcc14aa9d56f59e0a61c8a26ba6522a0f Author: Trial97 <[email protected]> Date: Sat Oct 19 01:10:04 2024 +0300 Fix tests segfault Signed-off-by: Trial97 <[email protected]> commit 01721b593b16bbbf9cd15c4f262176d0345681f8 Author: seth <[email protected]> Date: Sat Oct 19 12:38:17 2024 -0400 fix(flatpak): run tests for launcher Signed-off-by: seth <[email protected]> commit 0bae14999f8e4997be96a8fadb4e4ed14dfd5b40 Author: seth <[email protected]> Date: Sat Oct 19 12:33:40 2024 -0400 chore(flatpak): don't bundle JREs After https://github.com/PrismLauncher/PrismLauncher/pull/2069, JREs can be managed at runtime. This is great for the Flatpak, as previously *all* JREs had to be installed and could not be updated independently of the launcher's Flatpak. It also makes using unsupported Java versions easier as the launcher can download any version in the sandbox We don't need to include these anymore Signed-off-by: seth <[email protected]> commit 522d105dbe50d6392e1d74dd9f1dec2a3ef7a357 Author: seth <[email protected]> Date: Sat Oct 19 11:59:32 2024 -0400 fix(nix): enable checks Signed-off-by: seth <[email protected]> commit 7519c63f2e8a5ebc9480a470a1e7702436178c51 Author: Trial97 <[email protected]> Date: Sat Oct 19 01:11:27 2024 +0300 Replace http with https on skins Signed-off-by: Trial97 <[email protected]> commit f60d6e4d4868d9e3ac48ea1d31c676deb83af0bb Merge: 43eb27b69 ac13579b9 Author: timoreo <[email protected]> Date: Fri Oct 18 12:09:24 2024 +0200 Merge pull request #2917 from Trial97/asan_log fix heap-use-after-free in modrinth creation task commit 43eb27b695f7a375a4b1736389b155d50bd0e728 Merge: f239f4c17 a108b5b42 Author: Alexandru Ionut Tripon <[email protected]> Date: Tue Oct 15 08:59:12 2024 +0300 Merge pull request #2916 from Ryex/fix/progress_dialog_use_after_free fix: ensure all connections to the ProgressDialogs's Task the dialog made are disconnected commit ac13579b9963a312b909e712c372cb115f21f0db Author: Trial97 <[email protected]> Date: Mon Oct 14 11:10:54 2024 +0300 fix heap-use-after-free in modrinth creation task Signed-off-by: Trial97 <[email protected]> commit a108b5b420b7d2785c9850d4a0bcb9c628d073a4 Author: Rachel Powers <[email protected]> Date: Mon Oct 14 00:32:12 2024 -0700 fix: ensure all connections to the ProgressDialogs's Task the dialog made are dissconnected Signed-off-by: Rachel Powers <[email protected]> commit f239f4c17c80e88aa12635e142f7829688f122c3 Merge: 5685bc340 3c836ece7 Author: Alexandru Ionut Tripon <[email protected]> Date: Sun Oct 13 22:46:00 2024 +0300 Merge pull request #2914 from PrismLauncher/update_flake_lock_action chore(nix): update lockfile commit 5685bc340774da9026bbd6338593a2ec04ce7527 Merge: bd01c47dc 3a1c06de0 Author: Alexandru Ionut Tripon <[email protected]> Date: Sun Oct 13 09:49:13 2024 +0300 Merge pull request #2913 from archessmn/fix/custom-command-tab-order Fix tab order on custom command inputs commit bd01c47dc9539656dde229344d019d8588d0ac00 Merge: ef0cb88dd 72cfad8fe Author: Alexandru Ionut Tripon <[email protected]> Date: Sun Oct 13 09:48:27 2024 +0300 Merge pull request #2906 from TheKodeToad/no-recursive-remove-on-update Prevent directories from being removed on instance update commit 3c836ece71c61c19eacd7bb4f324940071c6e89a Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Date: Sun Oct 13 00:24:52 2024 +0000 chore(nix): update lockfile Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb?narHash=sha256-NOiTvBbRLIOe5F6RbHaAh6%2B%2BBNjsb149fGZd1T4%2BKBg%3D' (2024-10-04) → 'github:NixOS/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7?narHash=sha256-9UTxR8eukdg%2BXZeHgxW5hQA9fIKHsKCdOIUycTryeVw%3D' (2024-10-09) commit 3a1c06de027ab2755c2a27624f41cbd445a156b4 Author: Mia Moir <[email protected]> Date: Sat Oct 12 23:47:58 2024 +0100 fix: Tab order on custom command inputs The tab order on the custom command UI in the instance settings is off, it goes 0 -> 2 -> 1, This re-orders the ui file to fix the order the inputs are in. Signed-off-by: Mia Moir <[email protected]> commit ef0cb88dd391a1872f38a2ac7ce7f473c0d1f3b5 Merge: 0b624a43d 09c9da268 Author: Alexandru Ionut Tripon <[email protected]> Date: Sat Oct 12 12:21:09 2024 +0300 Merge pull request #2907 from Ryex/fix/icon_cache_stack_overflow Prevent infinite recursion when mod icon load fails commit 0b624a43d6f719dcbc94630b1f85c96e569cc1e3 Merge: 78ceae9c1 97f4ead0f Author: Alexandru Ionut Tripon <[email protected]> Date: Sat Oct 12 00:49:57 2024 +0300 Merge pull request #2908 from Trial97/remove_client remove client overrides instead of double deleting the normal ones commit 97f4ead0fbec5508f7ff6785f07dcf869ed663c2 Author: Trial97 <[email protected]> Date: Sat Oct 12 00:19:54 2024 +0300 remove client overrides instead of double deleting the normal ones Signed-off-by: Trial97 <[email protected]> commit 78ceae9c17af74d52b51ce3c9f56c71ae3c16b72 Merge: 0c4c86c41 df9f54454 Author: Alexandru Ionut Tripon <[email protected]> Date: Sat Oct 12 00:07:14 2024 +0300 Merge pull request #2887 from Trial97/filters_modpack Add filters for modpack search commit 72cfad8fee7f81d85df7389ab9e32294d13a4707 Author: TheKodeToad <[email protected]> Date: Fri Oct 11 21:35:13 2024 +0100 Continue deleting before failing Signed-off-by: TheKodeToad <[email protected]> commit 09c9da268fdc833304f6159735cfb7e80d0e69bc Author: Rachel Powers <[email protected]> Date: Fri Oct 11 13:26:20 2024 -0700 fix: prevent inf recursion when mod icon load fails; cut max pixmapcache to 1/4 previous value Signed-off-by: Rachel Powers <[email protected]> commit 2bc6ae97568f9c9e522c4a64988cb325eb4d25ec Author: TheKodeToad <[email protected]> Date: Fri Oct 11 19:53:28 2024 +0100 Prevent directories from being removed on instance update Signed-off-by: TheKodeToad <[email protected]> commit 0c4c86c41f3e241577627639575e0beede1658b2 Merge: 2abbcdfa6 98adcc60a Author: Tayou <[email protected]> Date: Fri Oct 11 19:10:55 2024 +0200 Merge pull request #2900 from TheKodeToad/log-utf8 Use UTF-8 to decode logs on Java 18 or newer commit 98adcc60a30a95a86b564ebe69bb0ad276263424 Author: TheKodeToad <[email protected]> Date: Wed Oct 9 16:59:56 2024 +0100 Use UTF-8 to decode logs on Java 18 or newer Signed-off-by: TheKodeToad <[email protected]> commit 909114bf2ae1090e7c4d2d757645b413c71aaba1 Author: TheKodeToad <[email protected]> Date: Wed Oct 9 15:07:09 2024 +0100 Change LaunchTask to only accept MinecraftInstance Signed-off-by: TheKodeToad <[email protected]> commit 2abbcdfa6ff96c4a3ca41a4a58c4348eaa238748 Merge: c72cce657 093313e59 Author: txtsd <[email protected]> Date: Wed Oct 9 13:01:15 2024 +0530 Merge pull request #2896 from PrismLauncher/renovate/actions-cache-4.x chore(deps): update actions/cache action to v4.1.1 commit 093313e5914b3759bdb1147cd0fd1ff6627bdb31 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Wed Oct 9 07:14:47 2024 +0000 chore(deps): update actions/cache action to v4.1.1 commit c72cce6572335ee6df6f2002c9e0cab9a6927d62 Merge: e2b346fc5 d31c947b3 Author: Alexandru Ionut Tripon <[email protected]> Date: Wed Oct 9 08:37:22 2024 +0300 Merge pull request #2897 from Trial97/fix_crash fix crash when no resorce version is available commit d31c947b36c907f59e82150f4fc60781d70185ab Author: Trial97 <[email protected]> Date: Tue Oct 8 22:02:38 2024 +0300 fix crash when no resorce version is available Signed-off-by: Trial97 <[email protected]> commit e2b346fc53bc326a5e67a74ab67bc5447044afa0 Merge: 7c45f8876 cc0c9d208 Author: seth <[email protected]> Date: Tue Oct 8 13:15:05 2024 -0400 Merge pull request #2888 from PrismLauncher/renovate/actions-cache-4.x chore(deps): update actions/cache action to v4.1.0 commit 7c45f8876952aa792400040657c9b712739e876d Merge: acd4dceaf 010678da5 Author: seth <[email protected]> Date: Tue Oct 8 13:14:47 2024 -0400 Merge pull request #2883 from PrismLauncher/renovate/cachix-install-nix-action-30.x chore(deps): update cachix/install-nix-action action to v30 commit acd4dceafa12a2ba0aea844064f0b4376f47ac47 Merge: a200fca45 f7bd76c7d Author: seth <[email protected]> Date: Tue Oct 8 13:14:18 2024 -0400 Merge pull request #2890 from arnfaldur/patch-1 Keep libGLU in Flatpak commit df9f54454ac8cfe40fad525e64e6cc3578f26a77 Author: Trial97 <[email protected]> Date: Tue Oct 8 19:19:03 2024 +0300 removed static functions Signed-off-by: Trial97 <[email protected]> commit 5bd5627a9646361ccee2d96bb555de58072bc7ab Author: Trial97 <[email protected]> Date: Tue Oct 8 15:06:50 2024 +0300 extended the modrinth search and applied the suggested change Signed-off-by: Trial97 <[email protected]> commit a200fca45c67b9aeea18d1a8b9dc0ce1a265fc66 Merge: dc1f56e10 a897b012d Author: TheKodeToad <[email protected]> Date: Tue Oct 8 12:36:11 2024 +0100 Merge pull request #2869 from Edgars-Cirulis/patch-1 chore: update Qt to 6.7.3 commit dc1f56e108831761f0ee2e06df34ac1988111676 Merge: 1eee5c924 a61c93bed Author: Alexandru Ionut Tripon <[email protected]> Date: Tue Oct 8 14:09:22 2024 +0300 Merge pull request #2865 from Ryex/nsis_vc_redist add vc_redist as a NSIS install section commit 6e5f616ced96acee9a9aad76193f82e6a0c2cd27 Author: Trial97 <[email protected]> Date: Sun Oct 6 23:33:24 2024 +0300 move checkMcVersions to Filter struct Signed-off-by: Trial97 <[email protected]> commit 1eee5c924bc4ebc45c2a3fd4161091b6cf48b0e8 Merge: 999dec18d 03294f000 Author: Alexandru Ionut Tripon <[email protected]> Date: Sun Oct 6 23:21:16 2024 +0300 Merge pull request #2891 from PrismLauncher/update_flake_lock_action chore(nix): update lockfile commit 999dec18dd2ad00833d4096e7f9b26afd67301db Merge: 44b4262f3 d5990cca4 Author: Alexandru Ionut Tripon <[email protected]> Date: Sun Oct 6 23:20:14 2024 +0300 Merge pull request #2893 from PrismLauncher/ftb-private-no-retry Disable retry for private pack fetch commit d5990cca4318121dea8d6b669abdada64944c88b Author: TheKodeToad <[email protected]> Date: Sun Oct 6 13:51:36 2024 +0100 Disable retry for private pack fetch This is already handled with a dialog asking whether you want it to be removed. Signed-off-by: TheKodeToad <[email protected]> commit 03294f0000eba56edc39cbd80cc53418a2429528 Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Date: Sun Oct 6 00:24:57 2024 +0000 chore(nix): update lockfile Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/1925c603f17fc89f4c8f6bf6f631a802ad85d784?narHash=sha256-J%2BPeFKSDV%2BpHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI%3D' (2024-09-26) → 'github:NixOS/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb?narHash=sha256-NOiTvBbRLIOe5F6RbHaAh6%2B%2BBNjsb149fGZd1T4%2BKBg%3D' (2024-10-04) commit f7bd76c7d4ce0d834f259e4d085b726e8117bd29 Author: arnfaldur <[email protected]> Date: Sat Oct 5 17:58:53 2024 +0000 flatpak: don't cleanup libGLU The mod AAA Particles (found in the modpack Prominence II RPG) fails to start due to a missing `libGLU.so.1` file. Removing this cleanup command fixes the issue and makes the modpack run without issue. I reproduced the issue at the head of the develop branch, with and without the change. No other issue was detected by adding the library, and I could not find the initial justification for removing it. Signed-off-by: arnfaldur <[email protected]> commit cc0c9d208dc4b686a254138f71465199a895ee3a Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Fri Oct 4 22:22:10 2024 +0000 chore(deps): update actions/cache action to v4.1.0 commit 859fac604bf698755e73083625c75969b59c5e8a Author: Trial97 <[email protected]> Date: Fri Oct 4 17:06:47 2024 +0300 add modrinth modpack filter Signed-off-by: Trial97 <[email protected]> commit a61c93bedefced10b59c310daa567e31cb30f967 Author: Rachel Powers <[email protected]> Date: Fri Oct 4 07:06:19 2024 -0700 Update .github/workflows/build.yml Co-authored-by: Sefa Eyeoglu <[email protected]> Signed-off-by: Rachel Powers <[email protected]> commit 023aa18e852ab1b570b378609edee1e7bbcd1588 Author: Rachel Powers <[email protected]> Date: Thu Oct 3 23:14:29 2024 -0700 ci: NSCurl only needed on MSVC Signed-off-by: Rachel Powers <[email protected]> commit 63172540fb467386864ae22356999451dd2ebe08 Author: Rachel Powers <[email protected]> Date: Thu Oct 3 22:38:30 2024 -0700 fix: nisi needs `!include` "x64.nsh" now. also, there were some broken varible Signed-off-by: Rachel Powers <[email protected]> commit bcb1d456d4773f985d3b18d42382400a2c8148e7 Author: Rachel Powers <[email protected]> Date: Thu Oct 3 21:56:19 2024 -0700 fix: version NSCurl plugin in workflow, detect and use arm64 vc_redist for arm64 Signed-off-by: Rachel Powers <[email protected]> commit 010678da53c864f08b0f900265aacdca256a4dd8 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Thu Oct 3 13:46:28 2024 +0000 chore(deps): update cachix/install-nix-action action to v30 commit dfe3cd849def92682c45610e65bde3f6f5344a39 Author: Trial97 <[email protected]> Date: Wed Oct 2 01:06:45 2024 +0300 add curseforge modpack filter Signed-off-by: Trial97 <[email protected]> commit 44b4262f3ce037140cb6415cea27ed44bd03164d Merge: 2539aa42d 79be2fc06 Author: Alexandru Ionut Tripon <[email protected]> Date: Tue Oct 1 14:04:55 2024 +0300 Merge pull request #2862 from PrismLauncher/renovate/cachix-install-nix-action-29.x chore(deps): update cachix/install-nix-action action to v29 commit 2539aa42da7696546e3a74c83a0ccb349cb58b25 Merge: 62f19a6ac c89904381 Author: Alexandru Ionut Tripon <[email protected]> Date: Tue Oct 1 14:04:28 2024 +0300 Merge pull request #2851 from PrismLauncher/update_flake_lock_action chore(nix): update lockfile commit 62f19a6ac99bcb5cdb874e6a3da8f527c4a2e4d5 Merge: c57e26cf5 5ea2dece5 Author: timoreo <[email protected]> Date: Tue Oct 1 11:41:11 2024 +0200 Merge pull request #2863 from Trial97/fix_resource_search_equal commit c57e26cf5703c849a3cbe01804c7954c7dd1a9ab Merge: 1b58645c5 946e791d3 Author: timoreo <[email protected]> Date: Tue Oct 1 11:40:42 2024 +0200 Merge pull request #2874 from Trial97/modpack_equal commit 1b58645c52930ef461e9c255359808abb35790d2 Merge: fa92e6bd2 0eefa52db Author: timoreo <[email protected]> Date: Tue Oct 1 10:20:56 2024 +0200 Merge pull request #2857 from Trial97/translation_warnings commit 946e791d39a19f50d7604b1f57714f8f3a7f63cb Author: Trial97 <[email protected]> Date: Mon Sep 30 21:50:07 2024 +0300 sync modpack search field Signed-off-by: Trial97 <[email protected]> commit 5ea2dece54f27c812af3eb5ba697ec7aab07e04b Author: Trial97 <[email protected]> Date: Thu Sep 26 22:59:00 2024 +0300 fix search term not remaining the same between providers on resource download Signed-off-by: Trial97 <[email protected]> commit 0eefa52dbcdc595f4b388ae306eae5f556f816e4 Author: Trial97 <[email protected]> Date: Wed Sep 25 15:04:31 2024 +0300 fix some transtaions warnings Signed-off-by: Trial97 <[email protected]> commit b676a67b3ce49ab550e9087834125d14400a8488 Merge: 0af639c20 fa92e6bd2 Author: Trial97 <[email protected]> Date: Tue Oct 1 08:49:03 2024 +0300 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_login commit fa92e6bd2908e9bcd600446f477e5b260d5e2478 Merge: 974c89b9c 1b2e9b95e Author: Alexandru Ionut Tripon <[email protected]> Date: Tue Oct 1 08:23:10 2024 +0300 Merge pull request #2859 from Trial97/packwiz_prefix add prefix to non-standard packwiz fields commit 79be2fc0622103b2d969044490fa179d31482f50 Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Tue Oct 1 00:32:42 2024 +0000 chore(deps): update cachix/install-nix-action action to v29 commit 974c89b9c335f49759cec08441aada563d0cbdad Merge: a63451212 38fa2e0cd Author: seth <[email protected]> Date: Mon Sep 30 20:32:08 2024 -0400 Merge pull request #2843 from getchoo-contrib/ci/fix-nix Fix Nix CI commit 38fa2e0cd494d400110496a35c7f112b2b801d97 Author: seth <[email protected]> Date: Mon Sep 30 16:32:35 2024 -0400 style: format with clang-format Signed-off-by: seth <[email protected]> commit 988ef320193e5bfb7de600bc38f99f9ba122c379 Author: seth <[email protected]> Date: Mon Sep 30 16:30:22 2024 -0400 fix(nix): don't write to files in formatting check Signed-off-by: seth <[email protected]> commit bf432b5514d7c9c90761a285d17afbd736e4a687 Author: seth <[email protected]> Date: Mon Sep 30 16:21:07 2024 -0400 chore(nix): use cachix for binary cache Signed-off-by: seth <[email protected]> commit 68bf500f7ee48f17abf2a27e942d953a9962ef55 Author: seth <[email protected]> Date: Thu Sep 19 16:50:45 2024 -0400 chore: add nix reformat to .git-blame-ignore-revs Signed-off-by: seth <[email protected]> commit 5adca58337e9fe2a71f7bdd0951494ceddb34659 Author: seth <[email protected]> Date: Thu Sep 19 16:44:19 2024 -0400 ci: add nix job Signed-off-by: seth <[email protected]> commit 2663ac5405cbfc3c29a38b32a755b7c7ebda0779 Author: seth <[email protected]> Date: Thu Sep 19 16:34:59 2024 -0400 build(nix): add debug builds This will lead to build times on par with our other CI jobs, as now we're not always building for release Signed-off-by: seth <[email protected]> commit 732008db203d1ff6cc7c5d4957cb394d016eaf79 Author: seth <[email protected]> Date: Thu Sep 19 16:27:06 2024 -0400 ci: drop garnix Signed-off-by: seth <[email protected]> commit a63451212f0d6bd22bca4d0842d633ea3919a7c2 Merge: b9a6c13d4 b9c19fd3f Author: Tayou <[email protected]> Date: Sun Sep 29 09:07:25 2024 +0200 Merge pull request #2867 from turret-dev/turret/tmpdir_noexec_jvmarg_noannoy fix: don't annoy when java tmpdir jvmarg is set & /tmp is noexec commit c8990438165cce1d303e8754a125758fd69b8ad9 Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Date: Sun Sep 29 00:25:33 2024 +0000 chore(nix): update lockfile Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/4f807e8940284ad7925ebd0a0993d2a1791acb2f?narHash=sha256-IiA3jfbR7K/B5%2B9byVi9BZGWTD4VSbWe8VLpp9B/iYk%3D' (2024-09-11) → 'github:NixOS/nixpkgs/1925c603f17fc89f4c8f6bf6f631a802ad85d784?narHash=sha256-J%2BPeFKSDV%2BpHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI%3D' (2024-09-26) commit ed15a28eb3af1487cff7b81ed06b91afd35de4a0 Author: Rachel Powers <[email protected]> Date: Sat Sep 28 14:58:13 2024 -0700 fix : baking the redist into the installer breaks GPL, download at runtime instead Signed-off-by: Rachel Powers <[email protected]> commit a897b012d988861a47df887f0e8d2cd55d7bd584 Author: Edgars Cīrulis <[email protected]> Date: Sat Sep 28 12:11:25 2024 +0300 chore: update Qt to 6.7.3 Only bug fixes no new / breaking changes Signed-off-by: Edgars Cīrulis <[email protected]> commit 00f4221a836bc747ec8d220a52e7b96ed24f871a Author: Rachel Powers <[email protected]> Date: Fri Sep 27 19:16:50 2024 -0700 reorg MSVC set(CMAKE_INSTALL_SYSTEM_RUNTIMES_LIBS_SKIP true) call Signed-off-by: Rachel Powers <[email protected]> commit b9c19fd3f73877f80fb2363617d893f91e5037e2 Author: Mason Rocha <[email protected]> Date: Fri Sep 27 16:42:59 2024 -0500 fix: don't annoy when java tmpdir jvmarg is set & /tmp is noexec Signed-off-by: Mason Rocha <[email protected]> Got annoyed, didn't want to see it anymore. Java tmpdir noexec warning modified to include information about possible remedies available commit 8fa4467a362a55d10a3491a3b1d2301d3510383a Author: Rachel Powers <[email protected]> Date: Fri Sep 27 13:29:00 2024 -0700 use `/norestart` with redist install Co-authored-by: seth <[email protected]> Signed-off-by: Rachel Powers <[email protected]> commit c5daca3b013bd9cc8b17283d2a63e873480c2c16 Author: Rachel Powers <[email protected]> Date: Fri Sep 27 00:57:28 2024 -0700 include vc_redist in portable build Signed-off-by: Rachel Powers <[email protected]> commit 37d3b2a4f631d2a8ce3570a9c377576d4f5a3aa1 Author: Rachel Powers <[email protected]> Date: Fri Sep 27 00:49:00 2024 -0700 prevent the unauthorised reditribution of MSVC CRT files Signed-off-by: Rachel Powers <[email protected]> commit 2dc6f7504b4cfb64b59b3eb905f1b1ac387b8c83 Author: Rachel Powers <[email protected]> Date: Fri Sep 27 00:18:35 2024 -0700 add vc_redist as a NSIS install section Signed-off-by: Rachel Powers <[email protected]> commit b9a6c13d4782ed249f0119f86e65ec4d383f0667 Merge: 3e6071325 6475dc578 Author: Alexandru Ionut Tripon <[email protected]> Date: Thu Sep 26 20:35:14 2024 +0300 Merge pull req…
Prism Launcher 9.0 made substantial changes to the authentication logic (PrismLauncher/PrismLauncher#2402), so this merge involved a lot of refactoring and rewriting the authlib-injector authentication code to match Prism Launcher's new structure. But the error handling while adding a new authlib-injector account is now much nicer (no more "Mojang user authentication ended in a network error").
I'd really appreciate volunteers to test this before it's released!
Suggested things to test: