Commit graph

9324 commits

Author SHA1 Message Date
Herobrine Persson
c97a005058 Merge tag '9.2.4' into develop
Some checks failed
CodeQL Code Scanning / CodeQL (push) Has been cancelled
Build Application / Build Debug (push) Has been cancelled
2025-03-27 19:52:06 +00:00
Evan Goode
808277d2f8 Bump to 9.2.4 2025-03-25 16:57:13 -04:00
Evan Goode
3ced5d6546 Support authlib-injector skin upload 2025-03-25 16:16:40 -04:00
Evan Goode
43cd5853c1 clang-format 2025-03-24 21:57:40 -04:00
Evan Goode
9116d373e7 Create authlib-injector account with punycoded URL
Related: https://github.com/yushijinhun/authlib-injector/issues/270
2025-03-24 20:20:36 -04:00
Evan Goode
0e943b4bb1 Add back AuthlibInjectorMetadataStep
Apparently this was forgotten during the 9.0 merging.
2025-03-24 13:15:00 -04:00
Evan Goode
fde597aa0a Bump to 9.2.3 2025-03-23 20:27:57 -04:00
Evan Goode
84e9606e4f legacy: handle URL-encoded session ID 2025-03-23 19:38:16 -04:00
Evan Goode
d9ca7d2e74 legacy: rewrite http://session.minecraft.net/game/joinserver.jsp 2025-03-23 19:38:16 -04:00
Evan Goode
859ab72ea1 Update flake.lock 2025-03-23 15:25:49 -04:00
Evan Goode
15aff73aa1 Show CurseForge in new instance dialog even if no API key 2025-03-08 13:04:43 -05:00
Herobrine Persson
f86df99639 Fix Login Wizard extra window 2025-02-17 19:59:20 +00:00
Herobrine Persson
0aa5c583da Merge remote-tracking branch 'upstream/develop' into develop 2025-02-17 19:04:15 +00:00
Evan Goode
ec0baa6a1e Bump to 9.2.2 2025-02-16 19:45:59 -05:00
Alexandru Ionut Tripon
2bf6d66615 Update .github/workflows/build.yml
Co-authored-by: Seth Flynn <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit db766574a42a4b7db6b320b6d469b233ce5f3100)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
2025-02-16 15:54:15 -05:00
Alexandru Ionut Tripon
abd55c9d38 Update .github/workflows/build.yml
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 1b5d3c2bf903bbcade7b38c22c0b103a0c6999f8)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
2025-02-16 15:54:15 -05:00
Trial97
c45000eac3 remove specific step for qt6
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit be3eca8c97fdbb8daede84cab20fbd7695334242)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
2025-02-16 15:54:15 -05:00
Trial97
162188eaec fix appimage
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit bca517b8d3cd685540beebf69fbc1f80fe0a6ce4)
Signed-off-by: Seth Flynn <getchoo@tuta.io>
2025-02-16 15:54:15 -05:00
Evan Goode
9842c2f24f
Merge pull request #52 from unmojang/update_flake_lock_action
chore(nix): update lockfile
2025-02-16 15:52:32 -05:00
Evan Goode
86903bfc7f
Merge pull request #56 from unmojang/evan-goode/feed-the-beast
Use api.feed-the-beast.com, not modpacks.ch
2025-02-16 15:52:23 -05:00
Evan Goode
61892f857f Use api.feed-the-beast.com, not modpacks.ch 2025-02-15 19:45:07 -05:00
github-actions[bot]
63edfdf7ac chore(nix): update lockfile
Flake lock file updates:

• Updated input 'flake-compat':
    'github:edolstra/flake-compat/9ed2ac151eada2306ca8c418ebd97807bb08f6ac?narHash=sha256-HRJ/18p%2BWoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg%3D' (2024-11-27)
  → 'github:edolstra/flake-compat/ff81ac966bb2cae68946d5ed5fc4994f96d0ffec?narHash=sha256-NeCCThCEP3eCl2l/%2B27kNNK7QrwZB1IJCrXfrbv5oqU%3D' (2024-12-04)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/fa42b5a5f401aab8a32bd33c9a4de0738180dc59?narHash=sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo%3D' (2024-11-28)
  → 'github:NixOS/nixpkgs/2ff53fe64443980e139eaa286017f53f88336dd0?narHash=sha256-%2B/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc%3D' (2025-02-13)
2025-02-16 00:17:12 +00:00
Herobrine Persson
c6103f0425 Merge remote-tracking branch 'upstream/develop' into develop 2025-01-14 03:56:08 +00:00
Herobrine Persson
ecf0bcef64 Fix DRM 2025-01-14 03:55:29 +00:00
Evan Goode
bf48b45ff1 Bump to 9.2.1 2025-01-13 12:23:55 -05:00
Evan Goode
d931e8fa49
Merge pull request #51 from unmojang/evan-goode/fix-selectedProfile
Only send `selectedProfile` when selecting a profile
2025-01-13 11:52:09 -05:00
Evan Goode
a108c8678e Remove irrelevant FIXME comment 2025-01-13 11:51:33 -05:00
Evan Goode
a5fcdd03bf Only send selectedProfile when selecting a profile
Some authentication servers (Blessing Skin) care when selectedProfile is
sent on POST /refresh but the clientToken is already bound to a profile.
We should only include selectedProfile in POST /refresh during the
initial "Add authlib-injector account" process when selecting a profile
from multiple availableProfiles.

For https://github.com/unmojang/FjordLauncher/issues/50
2025-01-12 22:54:25 -05:00
Herobrine Persson
78cee27845 Set FjordLauncherUnlocked updater URL 2025-01-12 19:39:08 +00:00
Herobrine Persson
cde2c0a03b Merge remote-tracking branch 'upstream/develop' into develop 2025-01-12 17:30:50 +00:00
Evan Goode
d2d6320e44
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
2025-01-12 04:02:16 +00:00
Evan Goode
8cd807c2d6 Fix FetchFlameAPIKey compile error 2025-01-11 19:37:53 -05:00
Evan Goode
ccc886b51f Re-enable built-in updater 2025-01-11 19:19:36 -05:00
Evan Goode
594fa981ea Merge remote-tracking branch 'prismlauncher/release-9.x' into develop 2025-01-11 19:05:25 -05:00
Evan Goode
936252e445
Not yet in nixpkgs
Resolves #46
2024-12-31 11:28:38 -05:00
Alexandru Ionut Tripon
fdfdf2eef1
Merge pull request #3224 from Trial97/backport_fix_auto_mod_provider
[backport]Fix automatically choose mod provider option
2024-12-19 10:34:01 +02:00
Trial97
bbfa5a5ed1
Fix automatically choose mod provider option
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-12-19 09:23:51 +02:00
Alexandru Ionut Tripon
43dc330e55
Merge pull request #3223 from Trial97/backport_fix_flame_loader_match
[backport]fix the flame loaders match
2024-12-18 23:30:10 +02:00
Trial97
0c962dff59
fix the flame loaders match
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-12-18 22:53:18 +02:00
timoreo
ca0dd583ba
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
2024-12-18 19:53:32 +01:00
Trial97
7bb686c85b Do not fail curseforge import if modrinth file check fails
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a1c1c0b769d77eb8c44cef3dc0966e7184b2ce78)
2024-12-18 18:53:13 +00:00
timoreo
f8d3d8399d
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
2024-12-18 19:42:58 +01:00
Kenneth Chew
9cb2a3ab2d Correct symbolic link destination on manifest Java download
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
(cherry picked from commit 8d53242952ceeed11bd1a57c9ac43344d854ac8c)
2024-12-18 18:42:39 +00:00
Alexandru Ionut Tripon
072c495ec6
Merge pull request #3206 from PrismLauncher/backport-3202-to-release-9.x
[Backport release-9.x] [macOS] Update Sparkle to v2.6.4
2024-12-14 18:39:04 +02:00
Kenneth Chew
335941fb46 Update Sparkle to v2.6.4
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
(cherry picked from commit b6cd46ad27e8046962dcb7b3b43a973ff08564eb)
2024-12-14 16:36:04 +00:00
Alexandru Ionut Tripon
ebeff36da5
Merge pull request #3205 from PrismLauncher/backport-3199-to-release-9.x
[Backport release-9.x] Fix tab order in launcher settings
2024-12-14 18:34:38 +02:00
Kenneth Chew
1d29f63bec Fix tab order in launcher settings
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
(cherry picked from commit c3712ba6483f6386e2930ec0ed059d8c94f671b6)
2024-12-14 16:32:21 +00:00
Alexandru Ionut Tripon
87dc1bb6a6
Merge pull request #3204 from PrismLauncher/backport-3198-to-release-9.x
[Backport release-9.x] [macOS] Add local network usage description
2024-12-14 18:19:20 +02:00
Alexandru Ionut Tripon
a85720b8d6
Merge pull request #3203 from PrismLauncher/backport-3181-to-release-9.x
[Backport release-9.x] fix crash with invalid mrpack format
2024-12-14 18:19:09 +02:00
Kenneth Chew
4c28a94de1 Add local network usage description
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
(cherry picked from commit c3e44554abccfd16ff7f84740932848e59d28474)
2024-12-14 16:16:49 +00:00