Trial97
|
e42dfbc391
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod
|
2024-05-18 17:02:10 +03:00 |
|
Trial97
|
477d1408ad
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size
|
2024-05-18 16:53:14 +03:00 |
|
Trial97
|
83fdfe8091
|
fix regression
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-18 16:52:29 +03:00 |
|
Trial97
|
4d21f71ccf
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refresh_cats
|
2024-05-18 16:34:21 +03:00 |
|
Trial97
|
31d0cad377
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into demo
|
2024-05-18 16:24:22 +03:00 |
|
Trial97
|
c9c67ef79e
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into change_version
|
2024-05-18 15:27:02 +03:00 |
|
Trial97
|
d77d1f3be3
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into coremods
|
2024-05-18 14:44:33 +03:00 |
|
Trial97
|
b23b53d98d
|
Add missing header
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-18 14:43:58 +03:00 |
|
Trial97
|
7a5348a179
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
|
2024-05-18 14:14:31 +03:00 |
|
DioEgizio
|
3ba84cb844
|
fix: update bundled flatpak
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
|
2024-05-18 12:57:09 +02:00 |
|
Trial97
|
633489884d
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-18 13:27:31 +03:00 |
|
Alexandru Ionut Tripon
|
3887cfe5df
|
Merge pull request #1525 from Trial97/waitprofiler
Add wait profiler
|
2024-05-18 13:17:24 +03:00 |
|
Alexandru Ionut Tripon
|
f7cad1110e
|
Merge pull request #2411 from PrismLauncher/backport-2377-to-release-8.x
[Backport release-8.x] Adding sdkman java location to MacOs
|
2024-05-18 13:16:44 +03:00 |
|
Samuel Stidham
|
bffb2a3609
|
Fixed the code.
Signed-off-by: Samuel Stidham <dqfan2012@gmail.com>
(cherry picked from commit adf0cfdebf)
|
2024-05-18 10:16:15 +00:00 |
|
Samuel Stidham
|
0d3596c864
|
Add extra java locations for MacOs.
Signed-off-by: Samuel Stidham <dqfan2012@gmail.com>
(cherry picked from commit 8e0af16de9)
|
2024-05-18 10:16:15 +00:00 |
|
Alexandru Ionut Tripon
|
7b39ec5048
|
Merge pull request #2377 from dqfan2012/AddSdkmanToMacOs
Adding sdkman java location to MacOs
|
2024-05-18 13:15:57 +03:00 |
|
Trial97
|
ba947993c2
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
|
2024-05-18 12:47:01 +03:00 |
|
Tayou
|
acd23ff163
|
Merge pull request #2402 from Trial97/refactor_auth
Improve Microsoft login
|
2024-05-18 11:07:16 +02:00 |
|
Alexandru Ionut Tripon
|
c8ff768d64
|
Merge pull request #1827 from Trial97/shader
fixed shader packs detection
|
2024-05-18 12:02:13 +03:00 |
|
Trial97
|
b6d87fc090
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into instance_copy_progress
|
2024-05-18 11:57:41 +03:00 |
|
Trial97
|
6aaf3a3ed4
|
Merge branch 'skin_selector' of github.com:Trial97/PrismLauncher into skin_selector
|
2024-05-18 11:57:06 +03:00 |
|
Trial97
|
2ac6efaa4a
|
Fix reggresion
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-18 11:56:43 +03:00 |
|
Trial97
|
23134d4b72
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
|
2024-05-18 11:38:18 +03:00 |
|
Trial97
|
318819afc6
|
Made recommended button default
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-18 11:36:46 +03:00 |
|
Alexandru Ionut Tripon
|
8eeab0805a
|
Merge pull request #2410 from PrismLauncher/backport-2382-to-release-8.x
[Backport release-8.x] Add neoforge support for technic packs and atlauncher packs
|
2024-05-18 10:41:15 +03:00 |
|
Trial97
|
8898eb0a19
|
Add neoforge support for technic packs and atlauncher packs
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a95c1768a7)
|
2024-05-18 07:40:59 +00:00 |
|
Alexandru Ionut Tripon
|
eb0d0450e3
|
Merge pull request #2382 from Trial97/neoforge_technic
Add neoforge support for technic packs and atlauncher packs
|
2024-05-18 10:40:45 +03:00 |
|
Alexandru Ionut Tripon
|
0f2736306e
|
Update launcher/ui/dialogs/skins/SkinManageDialog.ui
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2024-05-18 10:36:15 +03:00 |
|
Evan Goode
|
2778fe760b
|
Use $FJORDLAUNCHER_JAVA_PATHS
|
2024-05-16 21:55:48 -04:00 |
|
Trial97
|
639c6e7f80
|
Add cancel to Add account dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-17 00:49:00 +03:00 |
|
Trial97
|
78804b26ee
|
Maybe fix nix
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-17 00:34:39 +03:00 |
|
Trial97
|
75a457ebfa
|
Add custom page to land after microsoft login
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-17 00:31:04 +03:00 |
|
Trial97
|
ce09f06bda
|
Fix CI3
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-16 22:16:42 +03:00 |
|
Trial97
|
09c0c11033
|
Add back device code flow
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-16 21:58:25 +03:00 |
|
Alexandru Ionut Tripon
|
ab5f628453
|
Update launcher/updater/prismupdater/PrismUpdater.cpp
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2024-05-16 19:45:43 +03:00 |
|
Alexandru Ionut Tripon
|
051e788683
|
Update launcher/updater/prismupdater/PrismUpdater.cpp
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2024-05-16 19:45:00 +03:00 |
|
Trial97
|
2a58fb0ac5
|
Remove cobrandid
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-16 17:31:25 +03:00 |
|
Trial97
|
c15f6fcd2a
|
Fix portable if manifest is missing
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-16 17:21:30 +03:00 |
|
Alexandru Ionut Tripon
|
898ee67a07
|
Update launcher/ui/dialogs/MSALoginDialog.cpp
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2024-05-16 00:41:07 +03:00 |
|
Evan Goode
|
59c0625f02
|
Fix broken in link in Add authlib-injector dialog
Resolves https://github.com/unmojang/FjordLauncher/issues/1
|
2024-05-15 16:25:34 -04:00 |
|
renovate[bot]
|
1d384544d3
|
chore(deps): update cachix/install-nix-action action to v27
|
2024-05-15 19:40:15 +00:00 |
|
Trial97
|
8b051b97fd
|
Fix CI2
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-15 17:54:35 +03:00 |
|
Trial97
|
abedc6a23c
|
Improve login UI
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-15 17:25:15 +03:00 |
|
Trial97
|
849c3faeb4
|
Fix CI
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-15 14:07:03 +03:00 |
|
Trial97
|
80d8e3ee06
|
Remove katabasis
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-15 12:53:06 +03:00 |
|
Evan Goode
|
08b3a1d956
|
s/Prism/Fjord in .github
|
2024-05-15 00:01:58 -04:00 |
|
Evan Goode
|
62d2f7d042
|
Add doc/alternative-auth-servers.md
|
2024-05-14 23:03:20 -04:00 |
|
Evan Goode
|
f9815c7212
|
README: Adjust for Fjord Launcher
Took out the installation section, I'll redo that once we make some
packages.
|
2024-05-14 22:59:28 -04:00 |
|
Evan Goode
|
67846827f5
|
Add DRM notice
|
2024-05-14 22:58:19 -04:00 |
|
Trial97
|
c2ed50627d
|
Added back qt version check
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-14 00:36:35 +03:00 |
|