Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-05-01 23:24:31 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,416 Commits 10 Branches 38 Tags
Commit Graph

329 Commits

Author SHA1 Message Date
Trial97
5c8481a118
chore: reformat 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-04-29 10:46:41 +03:00
Trial97
c5fd5e6ac1
chore: make all the regexes static const 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-04-28 22:37:29 +03: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
Trial97
a4472406b9
fix account help link 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-03-23 14:02:09 +02:00
Trial97
14b653e08d
remove some unused files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-02-12 20:16:00 +02:00
TheKodeToad
e1896d5b6b
Update launcher/ui/pages/global/MinecraftPage.h 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-02-05 13:45:49 +00:00
TheKodeToad
6e3dd04a1f
Update launcher/ui/pages/global/MinecraftPage.h 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-02-05 12:09:32 +00:00
TheKodeToad
9ed6801b15
Update launcher/ui/pages/global/JavaPage.h 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-02-05 12:09:12 +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
TheKodeToad
98ab686348
Merge remote-tracking branch 'upstream/develop' into unify-mc-settings 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 13:18:19 +00:00
TheKodeToad
1b4b36df33
Unify Java page 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-26 22:25:26 +00:00
seth
1cce582d56
Merge pull request #3292 from Trial97/fix_modrinth_link 
fix modrinth link
 2025-01-16 20:42:00 -05:00
Trial97
3ee73916ca
fix modrinth link 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-13 08:16:12 +02: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
TheKodeToad
e6d4e5d78d
Unify instance and global settings pt.1 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-11-06 23:46:30 +00:00
Trial97
0f42f3cc5c
Added warning regarding maximized option 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-28 17:19:18 +02:00
Cart
6475dc5786 Lots of J's for Java needed to be uppercased 2024-09-26 01:58:21 -04:00
Alexandru Ionut Tripon
e59f90eca8
Update launcher/ui/pages/global/APIPage.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-09-14 00:19:48 +03:00
Trial97
1db122f1a2
fix typo 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-13 21:37:50 +03:00
Alexandru Ionut Tripon
d20f24d96f
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-09-13 21:13:21 +03:00
Trial97
973b43ca7a
Add techinc client ID 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-13 20:01:45 +03:00
Trial97
92495494ca
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-23 08:16:59 +03:00
TheKodeToad
2ad34c724e
Make log colours themeable 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-08-21 22:19:50 +01:00
Trial97
0ac62f9ddf
Recommend java major 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-23 01:41:41 +03:00
Trial97
5d3549a5e9
Add tooltips and fix archive download task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-22 09:18:20 +03: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: 7a200a337f08cfa1e32102594958f10cb7f000c6
conflicted with 6078a771c18fd749f38d7c1a2f80ed3c7ec7ad28

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
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
Alexandru Ionut Tripon
555c4a7c59
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-06-25 15:33:11 +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
bbf52e3549
renamed dialog and button action 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 01:59:50 +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
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