Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-11 20:57:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,720 Commits 9 Branches 38 Tags
d63a3364111a99337c2096c807550f3d7c62b47a
Commit Graph

4120 Commits

Author SHA1 Message Date
Trial97
428889a68d removed + from bad chars in filenames 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-19 19:38:06 +03:00
Trial97
1b0e8260ac fix zero launch time 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-19 15:36:39 +03:00
Trial97
425a6e0919 Fix code format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-19 10:09:34 +03:00
Trial97
d9e2badf71 Rename timeout option 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-19 08:54:19 +03:00
Trial97
76a656a017 retry auth step on fail 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 22:44:17 +03:00
Trial97
6078a771c1 add config for transfer timeout 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-18 21:46:05 +03:00
Alexandru Ionut Tripon
74c2f2599f Merge pull request #1365 from Trial97/netjob_retry 
Ask user to retry if netjob fails
 2024-05-18 17:54:12 +03:00
Trial97
5a598db608 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 2024-05-18 17:40:54 +03:00
Trial97
5bd28e2cc8 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-05-18 17:11:41 +03:00
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
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
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
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
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
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
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
Trial97
c2ed50627d Added back qt version check 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-14 00:36:35 +03:00
Trial97
e285a85fe8 Removed AccountTask 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-14 00:21:51 +03:00
Trial97
3336f8107c Removed AuthRequest and NetAction 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-14 00:21:45 +03:00
Trial97
d795ba25e7 Delete instaces tmp diectory on startup 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-10 20:55:26 +03:00
Alexandru Ionut Tripon
f15981d786 Merge pull request #2358 from DioEgizio/nosystem-portablewithqt 
Remove prebuilt system tarballs on Linux, bundle Qt with Linux portable
 2024-05-09 08:22:43 +03:00
Alexandru Ionut Tripon
c703babda9 Merge pull request #2379 from kthchew/fix/blocked-desc 
Improve blocked mods dialog (permissions prompt, misc. fixes) on macOS
 2024-05-09 08:17:03 +03:00
Alexandru Ionut Tripon
72e9d7b148 Merge pull request #2366 from Trial97/modrint_import2 
Fix download packs with invalid characters
 2024-05-09 08:16:16 +03:00