Evan Goode
48689d1b79
Merge remote-tracking branch 'upstream/release-9.x' into develop
2025-04-06 18:16:05 -05:00
Evan Goode
7050d01aab
Support authlib-injector skin upload
2025-04-06 17:46:06 -05:00
Evan Goode
b43764d355
Show CurseForge in new instance dialog even if no API key
2025-04-06 17:46:05 -05:00
Luna
8239d03e0e
Update authlib-injector to point to local doc rather than fjord's
2025-02-26 15:19:00 -06:00
Evan Goode
491cb1e5a2
Merge remote-tracking branch 'prismlauncher/release-9.x' into develop
2025-01-12 12:46: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
b4b9051793
Merge in Changes from Prism 9.2
2025-01-11 13:58:12 -06: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
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
da9c085a06
Clean up some lingering differences from upstream
2024-10-26 17:52:25 -04:00
Evan Goode
c32aaf244d
It compiles, Yggdrasil login working except error handling
2024-10-26 00:17:24 -04:00
Evan Goode
7dbaa896a6
Merge tag '9.0' into develop
...
This is an intermediate/halfway commit, more refactoring is needed to
get this to build.
2024-10-25 15:34:57 -04:00
Cart
6475dc5786
Lots of J's for Java needed to be uppercased
2024-09-26 01:58:21 -04:00
Alexandru Ionut Tripon
e59f90eca8
Update launcher/ui/pages/global/APIPage.cpp
...
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2024-09-14 00:19:48 +03:00
Trial97
1db122f1a2
fix typo
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-13 21:37:50 +03:00
Alexandru Ionut Tripon
d20f24d96f
Apply suggestions from code review
...
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2024-09-13 21:13:21 +03:00
Trial97
973b43ca7a
Add techinc client ID
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-13 20:01:45 +03:00
Trial97
92495494ca
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-23 08:16:59 +03:00
TheKodeToad
2ad34c724e
Make log colours themeable
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-08-21 22:19:50 +01:00
Trial97
0ac62f9ddf
Recommend java major
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-07-23 01:41:41 +03:00
Trial97
5d3549a5e9
Add tooltips and fix archive download task
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-07-22 09:18:20 +03:00
Trial97
29a6db171f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
2024-07-22 08:57:31 +03:00
Edgars Cirulis
fc2d013402
ui: swap timeoutSecondsLabel and numberOfManualRetriesLabel order
...
fixes: 7a200a337f6078a771c1
2024-07-20 01:55:23 +03:00
Alexandru Ionut Tripon
0041d2a126
Merge pull request #2440 from Trial97/fix_retry_dialog
...
update retry netjob dialog
2024-07-19 15:47:12 +03:00
Alexandru Ionut Tripon
ddcaf25149
Merge pull request #2650 from Trial97/help-pages
...
fix a few missing help pages
2024-07-19 15:45:57 +03:00
UnownPlain
e6019ab396
Fix dead link to Modrinth authentication docs
...
Signed-off-by: UnownPlain <38232575+UnownPlain@users.noreply.github.com>
2024-07-17 23:04:52 -04:00
Trial97
6d425717e9
fix a few missing help pages
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-07-16 14:42:23 +03:00
Trial97
a09742a406
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
2024-07-06 01:07:00 +03:00
Kationor
83a5fe1984
Rename setting to SkipModpackUpdatePrompt
...
Was ModpackUpdatePromptDisabled
Signed-off-by: Kationor <n96211028@gmail.com>
2024-07-03 23:13:39 +02:00
Kationor
9b172278f8
Add ModpackUpdatePromptDisabled setting
...
When creating an instance of a modpack that's already associated with
another instance, the user gets asked if they want to update that
instance instead. This commit introduces a setting to suppress the
prompt and directly create the new instance.
Signed-off-by: Kationor <n96211028@gmail.com>
2024-07-03 12:43:05 +02:00
Trial97
0f311453e1
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-30 22:54:23 +03:00
Trial97
4b4da8e6f6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-30 22:41:49 +03:00
Alexandru Ionut Tripon
fc445078cd
Merge pull request #2415 from Trial97/configure_timeout
...
Add config for transfer timeout
2024-06-30 22:26:19 +03:00
Alexandru Ionut Tripon
555c4a7c59
Apply suggestions from code review
...
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2024-06-25 15:33:11 +03:00
Evan Goode
bf997aa117
Merge pull request #14 from unmojang/evan-goode/msa
...
Use Nintendo Switch client ID
2024-06-23 23:16:59 -04:00
Evan Goode
62f87c423f
Use Nintendo Switch client ID
...
Reputable projects such as prismarine-auth and azalea-auth hardcode the
Nintendo Switch client ID instead of their own custom Azure application,
so we should be fine to go ahead and do the same.
Unfortunately, client IDs created for custom Azure applications, such as
Prism Launcher's client ID, will no longer work with Fjord Launcher, so
users who manually supplied a client ID will need to clear theirs.
2024-06-23 22:57:31 -04:00
Evan Goode
810ab868b3
Fetch CurseForge API key from official files
...
Instead of fetching the CurseForge API key from PolyMC's server, fetch
it from the files of the CurseForge app, mirrored by archive.org. We can
do this without downloading the entire 100MiB+ application by
range-requesting the specific DEFLATE block where the key is and
decompressing just that block.
2024-06-23 22:35:06 -04:00
Trial97
c04031ff00
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog
2024-06-23 23:40:12 +03:00
Trial97
bbf52e3549
renamed dialog and button action
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-16 01:59:50 +03:00
Trial97
cfdf4a9e1f
Merge branch 'develop' of github.com:Trial97/PrismLauncher into feature/java-downloader
2024-06-14 22:50:20 +03:00
Trial97
5f5296ef5e
update ui once again
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-12 19:34:19 +03:00
Trial97
df142550fe
update Add account question
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-12 11:55:56 +03:00
Trial97
c4a65dd861
update login flow
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-12 00:34:39 +03:00
Trial97
11ae169087
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-10 09:34:48 +03:00
Alexandru Ionut Tripon
95e7f36732
Merge pull request #2054 from Trial97/add_configurable_updater_interval
...
Made updater interval configurable
2024-06-10 09:22:54 +03:00
Trial97
e63f25c9e4
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-10 09:01:01 +03:00
Trial97
7a200a337f
update retry netjob dialog
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-26 11:04:41 +03:00
Evan Goode
513361df25
DRM: check for valid account, not just any account
2024-05-22 19:46:43 -04:00
Evan Goode
13a32a6642
Add back DRM for offline and authlib-injector accounts
2024-05-20 13:24:16 -04:00
