AstralTransRocketries/FjordLauncher
1
0
Fork 0
mirror of https://github.com/unmojang/FjordLauncher.git synced 2025-09-15 18:29:07 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,892 Commits 15 Branches 55 Tags
Commit Graph

1756 Commits

Author SHA1 Message Date
Trial97
4802f6950e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-28 23:06:18 +03:00
Sefa Eyeoglu
531b58093e
Merge pull request #1263 from Trial97/develop 2023-09-28 22:03:14 +02:00
Sefa Eyeoglu
2ff9ef0620
Merge pull request #1363 from Trial97/download_threads 2023-09-28 22:02:57 +02:00
Trial97
9acbf98f94
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-28 22:50:12 +03:00
Sefa Eyeoglu
59e565ef96
Merge pull request #1643 from bolli24/develop 2023-09-27 17:34:32 +02:00
seth
f370f0d749
chore: cleanup a few more mentions of mojang accounts 
Signed-off-by: seth <getchoo@tuta.io>
 2023-09-27 05:34:48 -04:00
Trial97
b8d9c3d779
format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-26 20:19:35 +03:00
Trial97
ebde563648
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater 2023-09-26 20:16:46 +03:00
Trial97
7c636d4608
Removed mojang 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-25 17:44:04 +03:00
alexia
1684cff7ac
Update links to Minecraft Wiki 
Minecraft Wiki has officially moved from Fandom to their own wiki.
I updated some links I found in comments.

Signed-off-by: alexia <me@alexia.lol>
 2023-09-25 15:49:12 +02:00
bolli24
14af7044be
Update launcher/ui/dialogs/ModUpdateDialog.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: bolli24 <9805065+bolli24@users.noreply.github.com>
 2023-09-24 03:01:47 +02:00
Evan Goode
aa589701ed Automatically install authlib-injector when missing 
Add MissingAuthlibInjectorBehavior setting to control this behavior

Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-09-23 18:53:14 -04:00
bolli24
f3c089792a Skip folders when updating mods. 
Previously the mod updater would fail, reporting "The mod updater was aborted!", when trying to update a folder.

Signed-off-by: bolli24 <4827765-bolli24@users.noreply.gitlab.com>
 2023-09-22 21:36:19 +02:00
Trial97
a49851cb40
updated blocked mods with empty hash 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-19 15:48:12 +03:00
Sefa Eyeoglu
00af385619
Merge pull request #1572 from Trial97/catpacks2 2023-09-16 18:22:13 +02:00
Sefa Eyeoglu
bf6dc10f35
Merge pull request #1605 from TheKodeToad/flame-shaders 2023-09-16 18:20:45 +02:00
fn2006
0c2c98f289 Remove DRM from authlib-injector accounts 2023-09-05 21:32:15 +01:00
Evan Goode
a980b4d537 Clean up authlib-injector merge, mostly clang-format 
Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-09-05 00:13:50 -04:00
Evan Goode
9d442a0348 authlib-injector 
* 'Custom Yggdrasil' AccountType

Signed-off-by: Evan Goode <mail@evangoo.de>

* Allow multiple accounts with the same player UUID

Signed-off-by: Evan Goode <mail@evangoo.de>

* Use correct services server URL for SkinDelete

Signed-off-by: Evan Goode <mail@evangoo.de>

* Correctly use CustomYggdrasilRefresh, add warning message

Signed-off-by: Evan Goode <mail@evangoo.de>

* Custom Yggdrasil: Readability fixes

Also made the MinecraftEntitlement for Custom Yggdrasil accounts work
just like offline accounts---instead of checking the reply from the auth
server, Custom Yggdrasil accounts are granted canPlayMinecraft and
ownsMinecraft when they are created, in MinecraftAccount.cpp.

Signed-off-by: Evan Goode <mail@evangoo.de>

* Custom Yggdrasil: Add extra confirmation dialog

Signed-off-by: Evan Goode <mail@evangoo.de>

* Add install authlib-injector button

Signed-off-by: Evan Goode <mail@evangoo.de>

* authlib-injector accounts

Signed-off-by: Evan Goode <mail@evangoo.de>

* Suggest installing authlib-injector when needed

Signed-off-by: Evan Goode <mail@evangoo.de>

* Use Unmojang metadata

Signed-off-by: Evan Goode <mail@evangoo.de>

* Use std::string for MANAGED_AGENTS, not QString

---------

Signed-off-by: Evan Goode <mail@evangoo.de>

Resolve X-Authlib-Injector-API-Location

Signed-off-by: Evan Goode <mail@evangoo.de>

Prefetch authlib-injector metadata

Resolves https://github.com/unmojang/PrismLauncher/issues/4

See 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#%E9%85%8D%E7%BD%AE%E9%A2%84%E8%8E%B7%E5%8F%96

Signed-off-by: Evan Goode <mail@evangoo.de>

drag-and-drop authlib-injector URL, clang-format

Resolves https://github.com/unmojang/PrismLauncher/issues/2

Signed-off-by: Evan Goode <mail@evangoo.de>
 2023-09-04 19:00:18 +01:00
Sefa Eyeoglu
546d49e183
Merge pull request #1530 from Trial97/metadata_delete 2023-09-04 17:02:52 +02:00
TheKodeToad
94c1cd6bcf
CurseForge shader downloading 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-04 14:15:37 +01:00
fn2006
65821b54e6 Remove current Ely.by implementation 2023-09-04 01:35:37 +01:00
fn2006
be1d2a6070 Merge remote-tracking branch 'upstream/develop' into develop 2023-09-04 00:45:11 +01:00
fn2006
70e6f323fe fix regressions 2023-09-04 00:43:23 +01:00
fn2006
b6904ba50a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-09-04 00:39:20 +01:00
TheKodeToad
1213a5ab46
Merge remote-tracking branch 'upstream/develop' into skinfix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-02 22:27:57 +01:00
Trial97
17f696bffc
small tweaks to atl icons 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-01 22:25:15 +03:00
Trial97
e095780cc3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into modrinth_pack 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-01 21:36:28 +03:00
TheKodeToad
25ce11d85d
Merge pull request #1539 from Trial97/refactor_modpack_ux 
Improvements to modpack UX
 2023-08-31 14:58:54 +01:00
TheKodeToad
befa3baa6a
Merge branch 'develop' into feat/launcher-updater 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-30 11:47:33 +01:00
TheKodeToad
8c30cb3706
Fix CI 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-29 13:27:06 +01:00
TheKodeToad
c1855c6ce3
Merge branch 'develop' into rename-groups 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-29 12:41:40 +01:00
TheKodeToad
0e67686295
Hide index folder in pack export dialog 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-28 17:25:07 +01:00
TheKodeToad
e98bca4749
Fix cancelling pack save 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-28 17:09:40 +01:00
Trial97
211865a1e1
handle gracefully the upload abort 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-28 13:31:19 +03:00
Sefa Eyeoglu
fbf6833124
Merge pull request #1519 from TheKodeToad/better-export-pack 2023-08-28 10:29:32 +02:00
Trial97
07d8598638
added catpacks tests 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 23:40:32 +03:00
Trial97
79652799bd
Made text smaller 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 21:30:46 +03:00
Trial97
630145a1d0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into welcome_background 2023-08-27 21:03:21 +03:00
Trial97
0680d2dceb
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 20:41:56 +03:00
TheKodeToad
9110fbf282
Merge pull request #1560 from Trial97/curse_multiple_loaders2 
Add suport for flame multiple loaders
 2023-08-27 18:21:14 +01:00
TheKodeToad
e3b04d10cf
Merge pull request #1536 from Trial97/time3 
Allow showing playtime in hours
 2023-08-27 18:14:04 +01:00
Trial97
8c607ae734
removed extra if 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 20:02:12 +03:00
Trial97
c5aac24a93
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse_multiple_loaders2 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 15:53:35 +03:00
Trial97
4036cecfc0
Added progress widget to some modpack providers 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 15:04:42 +03:00
Sefa Eyeoglu
df14f88307
Merge pull request #1532 from Trial97/curseforge-url-handle 2023-08-27 12:26:57 +02:00
TheKodeToad
479335dfe0
Rewrite optional mod dialog 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-27 00:50:33 +01:00
TheKodeToad
d1566f2610
Merge branch 'develop' into env-vars 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-26 23:12:02 +01:00
Trial97
c54fecf5d9
added condition for empty loader type 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-25 09:05:04 +03:00
Trial97
f897b14e3e
changed technic icon name retrival 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-24 13:05:27 +03:00