60234a550b
feat: auto install modpack & choise nickname
CodeQL Code Scanning / CodeQL (push) Has been cancelled
Build Application / Build Debug (push) Has been cancelled
Nix / Build (${{ matrix.system }}) (macos-13, x86_64-darwin) (push) Has been cancelled
Nix / Build (${{ matrix.system }}) (macos-14, aarch64-darwin) (push) Has been cancelled
Nix / Build (${{ matrix.system }}) (ubuntu-22.04, x86_64-linux) (push) Has been cancelled
Nix / Build (${{ matrix.system }}) (ubuntu-22.04-arm, aarch64-linux) (push) Has been cancelled
Update Flake Lockfile / update-flake (push) Has been cancelled
2025-04-15 11:13:45 +03:00
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
1a02c19176
correct some instances of "fjord" to "shattered/shattered prism"
2025-01-11 13:00:30 -06:00
Evan Goode
a1537bf42d
Add Spaceship and Phoebe catpack
2024-11-29 08:32:14 -06:00
Luna
2921db3e19
Add Pseurae to in-launcher Contributors list, revert readme changes
2024-10-29 19:44:51 -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
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
b496316241
Change a few occurrences of "prism" to "fjord"
2024-10-26 16:45:14 -04:00
Evan Goode
7f52d57454
Fix MSA login
2024-10-26 14:56:55 -04:00
Evan Goode
d40b6d8eb3
Error handling for Yggdrasil accounts
2024-10-26 13:40:09 -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
ZekeZ
3ac080806d
Merge pull request #2831 from Trial97/fix_login
...
split the auth loading screen
2024-10-21 00:14:36 +10:00
Trial97
2030041fcc
Fix tests segfault
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-19 21:42:14 +03:00
Rachel Powers
a108b5b420
fix: ensure all connections to the ProgressDialogs's Task the dialog made are dissconnected
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2024-10-14 00:45:45 -07:00
Mia Moir
3a1c06de02
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 <63592337+archessmn@users.noreply.github.com>
2024-10-12 23:47:58 +01:00
Alexandru Ionut Tripon
78ceae9c17
Merge pull request #2887 from Trial97/filters_modpack
...
Add filters for modpack search
2024-10-12 00:07:14 +03:00
Trial97
d31c947b36
fix crash when no resorce version is available
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-08 22:02:38 +03:00
Trial97
df9f54454a
removed static functions
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-08 19:19:03 +03:00
Trial97
5bd5627a96
extended the modrinth search and applied the suggested change
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-08 15:06:50 +03:00
Trial97
6e5f616ced
move checkMcVersions to Filter struct
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-07 00:21:28 +03:00
Trial97
859fac604b
add modrinth modpack filter
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-04 17:06:47 +03:00
Trial97
dfe3cd849d
add curseforge modpack filter
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-02 01:06:45 +03:00
timoreo
62f19a6ac9
Merge pull request #2863 from Trial97/fix_resource_search_equal
2024-10-01 11:41:11 +02:00
timoreo
c57e26cf57
Merge pull request #2874 from Trial97/modpack_equal
2024-10-01 11:40:42 +02:00
Trial97
946e791d39
sync modpack search field
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-01 08:53:27 +03:00
Trial97
5ea2dece54
fix search term not remaining the same between providers on resource download
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-01 08:52:07 +03:00
Trial97
0eefa52dbc
fix some transtaions warnings
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-01 08:51:06 +03:00
Trial97
b676a67b3c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_login
2024-10-01 08:49:03 +03:00
seth
38fa2e0cd4
style: format with clang-format
...
Signed-off-by: seth <getchoo@tuta.io>
2024-09-30 16:32:55 -04:00
Cart
6475dc5786
Lots of J's for Java needed to be uppercased
2024-09-26 01:58:21 -04:00
seth
3e60713257
Merge pull request #2838 from Trial97/view_log
...
Always display Minecraft log tab
2024-09-24 20:00:54 -04:00
seth
48904c0d66
Merge pull request #2806 from Trial97/technic_client
...
Add Technic client ID
2024-09-24 19:55:21 -04:00
Trial97
77463c6d33
display minecraft log before instance run
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-18 21:17:15 +03:00
timoreo
dc67807894
Merge pull request #2825 from Trial97/skin_fix
2024-09-17 08:50:19 +02:00
Alexandru Ionut Tripon
d06f0529a0
Merge pull request #2830 from Trial97/login_wizard_retry
...
Show login dialog again if account login fails
2024-09-17 08:44:41 +03:00
Alexandru Ionut Tripon
c57b1d4227
Merge pull request #2820 from Trial97/mac_java
...
Add extra step to macos java install
2024-09-17 08:44:09 +03:00
Trial97
2fd8685894
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into java_dir
2024-09-16 20:08:20 +03:00
Trial97
580fc32518
split the auth loading screen
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-16 16:41:16 +03:00
Trial97
75756b49c3
reshow login dialog in case account login fails
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-16 16:15:36 +03:00
Trial97
d2f0d1d8d5
Wrap FS::write in try catch
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-16 12:42:09 +03:00
