Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-13 05:37:42 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,632 Commits 11 Branches 38 Tags
edb1020dcee3c252c62c45eb0a1408c100e29ad7
Commit Graph

94 Commits

Author SHA1 Message Date
TheKodeToad
6d3d4d0083 Redo tab orderings 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-04-15 19:52:21 +01:00
TheKodeToad
fc94bb6af3 Add colons to single-line settings 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-04-15 19:47:00 +01:00
TheKodeToad
76db89460b Redo layouts 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-04-15 19:21:38 +01:00
TheKodeToad
53305bf5a7 Align task spinboxes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-04-15 14:17:03 +01:00
TheKodeToad
54e63fee6e Fix spacer 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-04-15 13:17:31 +01:00
TheKodeToad
33ac9e3f47 Apparently this is correct 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-04-15 12:39:25 +01:00
TheKodeToad
4a2e4e9dc2 Use title case for 'When Renaming Instances...' 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-04-15 12:32:14 +01:00
TheKodeToad
e04acdb8fb Cleanup modpack update prompt phrasing 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-04-15 11:44:19 +01:00
TheKodeToad
211c71f84a Merge remote-tracking branch 'upstream/develop' into rework-settings 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-04-15 11:38:31 +01:00
TheKodeToad
ec2552e501 Make padding consistent 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-04-15 10:42:02 +01:00
Yihe Li
b550a6c5c4 Revert the radio button changes 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
 2025-03-27 05:20:58 +08:00
Yihe Li
4b20e3bc39 Implement instance renaming 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
 2025-03-27 03:26:13 +08:00
Yihe Li
0da645594f Adjust instance view sorting mode to QComboBox and add renaming behavior 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
 2025-03-27 01:20:07 +08:00
TheKodeToad
23a28fe762 Fix tooltip inconsistency 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-03-24 17:19:09 +00:00
TheKodeToad
c5e766512e Improve update interval setting 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-03-24 01:21:52 +00:00
TheKodeToad
2ab08f01b1 Merge mods & modpack settings 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-03-24 00:30:23 +00:00
TheKodeToad
8852b5823b Rework tools page 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-03-23 13:11:26 +00:00
TheKodeToad
dd3a4023c9 Move cat to right and use QPushButtons for browse 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-03-23 13:11:26 +00:00
TheKodeToad
99eeef40d9 Improve appearance page more 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-03-23 13:11:26 +00:00
TheKodeToad
7dd159aac0 Rework Launcher as General category 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-03-23 13:11:25 +00:00
TheKodeToad
5a76d9b7e1 Make requested changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-02-05 10:58:06 +00:00
TheKodeToad
cc504f4a6c Merge remote-tracking branch 'upstream/develop' into unify-mc-settings 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 17:02:50 +00:00
TheKodeToad
a92c68adbd Remove duplicate console section 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 16:54:45 +00:00
Trial97
7dde35fef2 Add settings to control the if prism should move the downloaded mods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-12-20 19:57:09 +02:00
Kenneth Chew
c3712ba648 Fix tab order in launcher settings 
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
 2024-12-12 14:53:39 -05:00
TheKodeToad
71e55f8829 Add scrollbar to Settings -> Launcher -> Features 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-11-07 00:11:27 +00:00
Trial97
29a6db171f Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-07-22 08:57:31 +03:00
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
Trial97
a09742a406 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-07-06 01:07:00 +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
0f311453e1 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-30 22:54:23 +03: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
cfdf4a9e1f Merge branch 'develop' of github.com:Trial97/PrismLauncher into feature/java-downloader 2024-06-14 22:50:20 +03:00
Trial97
11ae169087 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-10 09:34:48 +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
7a5348a179 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-05-18 14:14: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
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
Trial97
3d29da916d Made Java path configurable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-08 20:15:19 +02:00
Trial97
9bbeb5ef3a Made updater interval configurable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-22 21:26:46 +02:00
lumiscosity
43306350e0 Add cat opacity 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
 2023-12-22 15:02:41 +01: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