Commit Graph

9207 Commits

Author SHA1 Message Date
Evan Goode
80baecf088 Remove irrelevant FIXME comment 2025-02-25 22:25:17 -06:00
Evan Goode
b1e0b70833 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-02-25 22:25:17 -06:00
Evan Goode
f66c5b116f 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-02-25 22:25:17 -06:00
Evan Goode
31d99a35e7 Fix FetchFlameAPIKey compile error 2025-01-12 12:46:48 -06:00
Evan Goode
491cb1e5a2 Merge remote-tracking branch 'prismlauncher/release-9.x' into develop 2025-01-12 12:46:48 -06:00
Evan Goode
2c014a075d Not yet in nixpkgs
Resolves #46
2025-01-12 12:43:54 -06:00
Evan Goode
6b6da03aa4 chore(nix): nixfmt 2025-01-12 12:43:41 -06:00
Evan Goode
6ec444e0c4 chore(nix): sync with upstream Prism Launcher 2025-01-12 12:38:34 -06:00
Evan Goode
e0088f7811 Merge pull request #42 from ryze312/nix
Nix: Update lock file and switch to addDriverRunpath
2025-01-12 12:30:56 -06:00
Luna
9d66c25d42 Revert "Merge pull request #42 from ryze312/nix"
This reverts commit d7e190cabb.
2025-01-11 14:19:48 -06:00
Luna
41e90afbab Revert "Merge in Changes from Prism 9.2"
This reverts commit b4b9051793.
2025-01-11 14:19:46 -06:00
Luna
32b45d0fd7 Revert "Parity with Upstream towards Nix"
This reverts commit 4de9053c05.
2025-01-11 14:19:43 -06:00
Luna
2129244378 Revert "revert auth parent changes"
This reverts commit cbcbda6d4c.
2025-01-11 14:19:39 -06:00
Luna
cbcbda6d4c revert auth parent changes 2025-01-11 14:11:12 -06:00
Luna
4de9053c05 Parity with Upstream towards Nix 2025-01-11 13:58:43 -06:00
Luna
b4b9051793 Merge in Changes from Prism 9.2 2025-01-11 13:58:12 -06:00
Evan Goode
d7e190cabb Merge pull request #42 from ryze312/nix
Nix: Update lock file and switch to addDriverRunpath
2025-01-11 13:02:27 -06:00
Luna
1a02c19176 correct some instances of "fjord" to "shattered/shattered prism" 2025-01-11 13:00:30 -06:00
Evan Goode
8990841c8b 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))
2024-11-29 08:32:14 -06:00
Evan Goode
a1537bf42d Add Spaceship and Phoebe catpack 2024-11-29 08:32:14 -06:00
Luna
d08118b05a restore original versioning without causing nix breakage(?) 2024-11-29 08:31:50 -06:00
Luna
72a8ff070e Revert "Remove patch system as updater breaks."
This reverts commit fec49be639.
2024-11-29 08:31:27 -06:00
Luna
6f8fc48839 Revert "fix nix builds again(?)"
This reverts commit 25d90beb12.
2024-11-29 08:31:13 -06:00
Luna
25d90beb12 fix nix builds again(?) 2024-10-30 03:48:52 -05:00
Luna
fec49be639 Remove patch system as updater breaks. 2024-10-30 00:11:37 -05:00
Luna
f70084972a Fix builds, restore PollyMC to contributors list. 2024-10-29 23:00:35 -05:00
Luna
2921db3e19 Add Pseurae to in-launcher Contributors list, revert readme changes 2024-10-29 19:44:51 -05:00
Luna
4d0b910ead
Merge pull request #1 from Pseurae/merge-9.0
Possible fix for failing Nix builds
2024-10-29 19:35:54 -05:00
Adhith Chand Thiruvath
4ae137c8d3
Update .markdownlint.yaml 2024-10-30 05:46:43 +05:30
Luna
f8469afe2b test if nix readme is the breakage for nix builds 2024-10-29 18:36:52 -05:00
Luna
02a60f97c3 adjust missed fjords to shattered in hopes of fixing builds 2024-10-29 03:48:04 -05:00
Luna
a03b3d8c7a Fix overlooked branding errors 2024-10-29 03:36:32 -05:00
Luna
707f9026f3 Update README.md 2024-10-29 03:33:18 -05:00
Luna
10991d9556 Update README.md 2024-10-29 03:33:17 -05:00
Luna
e5e86a1211 Update README.md 2024-10-29 03:33:17 -05:00
Luna
f6c44570af correct copyright and license 2024-10-29 03:33:17 -05:00
Luna
ea7d9c0a8d fix typo preventing linux builds 2024-10-29 03:30:29 -05:00
Luna
1b95061bcf Adjust branding to that of ShatteredPrism 2024-10-29 03:29:24 -05:00
Luna
168b980d7a Remove DRM, Bump Version, Re-enable Updater.
Doing this in hopes it is easier to base upon the new version, alongside hopes of the patch system not breaking the updater.
2024-10-29 02:57:00 -05:00
Evan Goode
0f33e12922 Remove extra search bars in FtbAppImport and Modrinth pages 2024-10-28 22:12:48 -04:00
Evan Goode
04703d83ee Delete remaining Mojang cruft 2024-10-28 22:07:15 -04:00
Evan Goode
5c8bdf99cd 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.
2024-10-27 13:19:38 -04:00
Evan Goode
fab399c094 Remove extra code comment 2024-10-26 19:36:26 -04:00
Evan Goode
e177117a8f Fix FTB import goof 2024-10-26 19:08:36 -04:00
Evan Goode
9a0f9a9f67 Fix Windows build 2024-10-26 18:30:16 -04:00
Evan Goode
95af313f49 Merge tag '9.1' into evan-goode/merge-9.0 2024-10-26 17:54:34 -04:00
Evan Goode
da9c085a06 Clean up some lingering differences from upstream 2024-10-26 17:52:25 -04:00
Evan Goode
b496316241 Change a few occurrences of "prism" to "fjord" 2024-10-26 16:45:14 -04:00
Evan Goode
c15afbda4a Fix build? 2024-10-26 16:12:01 -04:00
Evan Goode
7f52d57454 Fix MSA login 2024-10-26 14:56:55 -04:00