Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-10 20:35:43 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,239 Commits 9 Branches 38 Tags
e9791d6bc19ae5cfceae7fd175492324b9afeeb5
Commit Graph

263 Commits

Author SHA1 Message Date
Edgars Cirulis
fc2d013402 ui: swap timeoutSecondsLabel and numberOfManualRetriesLabel order 
fixes: 7a200a337f
conflicted with 6078a771c1

Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
 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
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
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
Trial97
c04031ff00 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog 2024-06-23 23:40:12 +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
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
Trial97
d9e2badf71 Rename timeout option 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-19 08:54:19 +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
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
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
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
09c0c11033 Add back device code flow 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-05-16 21:58:25 +03:00
DylanJOrr
77aead6470 Rename object name "userInterfaceTab" from "generalTab" 
The "User Interface" tab was innacurately named "General" which I just
went in and fixed.

This also renamed the object for respective vertical spacers.

Signed-off-by: SolidStateDj <solidstatedj@proton.me>
 2024-04-16 16:01:34 -04:00
DioEgizio
44327980db feat: add "use zink" button 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-02-18 13:30:55 +01:00
Trial97
9bbeb5ef3a Made updater interval configurable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-22 21:26:46 +02:00
TheKodeToad
f285c3fe13 Merge pull request #1972 from lumiscosity/feature/cat_opacity 
Add a cat opacity option
 2024-01-06 19:42:17 +00:00
TheKodeToad
05e4533096 Add online mode fix for legacy versions; minor refactors in legacy 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-01-02 18:11:54 +00:00
lumiscosity
43306350e0 Add cat opacity 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
 2023-12-22 15:02:41 +01:00
Trial97
908072710a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-23 14:34:56 +02:00
Sefa Eyeoglu
d60d089cbc Merge pull request #1751 from LocalSpook/account_type 2023-11-23 10:27:06 +01:00
Trial97
a7be21733f Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 2023-11-23 10:41:55 +02:00
Sefa Eyeoglu
48e9753fb5 Merge pull request #1880 from Trial97/link 2023-11-23 09:07:34 +01:00
Sefa Eyeoglu
364fb9808e Merge pull request #1347 from HyperSoop/reduce-min-memory 2023-11-23 08:58:58 +01:00
Trial97
196d24330a Fixed open link on settings page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-21 17:47:59 +02:00
Trial97
54c308e5b5 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-19 21:15:12 +02:00
Trial97
361329d5d1 Made resource columns resizable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-14 23:21:53 +02:00
Desoroxxx
6093399f5c Update LauncherPage.ui 
Signed-off-by: Desoroxxx <desoroxxx@gmail.com>
 2023-11-08 17:32:30 +01:00
Trial97
7a0b2a316a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-06 23:19:58 +02:00
TheKodeToad
bd9d5e0990 Reword 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-11-05 20:31:48 +00:00
Trial97
9a8667e99c Added Global Dependenicies toggle 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-05 22:22:49 +02:00
Alexandru Ionut Tripon
1bd69ecbb2 Update launcher/ui/pages/global/AccountListPage.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-11-03 11:42:40 +02:00
Trial97
127a31ba3a Added warning for remove account 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-03 10:31:40 +02:00
LocalSpook
9d972ccc63 Localize account type in account list 
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
 2023-10-26 13:32:33 -07:00
TheKodeToad
bd11b93a0c Use hidden tab bar like other pages 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-26 21:01:24 +01:00
Trial97
12d567a9b8 made env vars behave like the rest of the settings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-26 22:51:38 +03:00
Trial97
869f654a10 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-16 22:46:11 +03:00
TheKodeToad
cc990c4f94 Merge branch 'develop' into env-vars 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-15 21:57:20 +01:00
TheKodeToad
c4882e7162 Merge pull request #443 from TheKodeToad/skinfix 
Add legacy skin fix
 2023-10-15 21:46:29 +01:00
TheKodeToad
7112d04df5 Mark setting as optional 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-15 14:11:08 +01:00