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

1921 Commits

Author SHA1 Message Date
Trial97
a9c7e95c66 fix widebar action removal 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-08 19:39:32 +03:00
Trial97
c9809fff6d add setting for quickplay singleplayer 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-08 16:53:26 +03:00
Trial97
63a380a039 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into clean_net 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-22 22:06:09 +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
Alexandru Ionut Tripon
69c55d90ce Merge pull request #2558 from Trial97/update_filters 
Resolve issue with multiple loaders during mod update
 2024-07-19 15:46:15 +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
Ben Westover
fb10cb5fdf Fix a few typos 
As part of packaging Prism Launcher for Debian, I have run a package linter
called lintian which found a few spelling errors throughout the source.

I am not a fan of contributions that only fix cosmetics like spelling errors,
but Debian encourages forwarding this stuff upstream instead of letting it get
fixed naturally over time.

Signed-off-by: Ben Westover <me@benthetechguy.net>
 2024-07-18 22:08:18 -04: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
061fdc1ada Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into clean_net 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-09 18:36:23 +03:00
Alexandru Ionut Tripon
5f345cedea Merge pull request #2596 from TayouVR/more-system-themes 
Display all system themes in widget theme selector
 2024-07-09 12:55:22 +03:00
Trial97
c07260e836 remove duplicate code from net folder 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-07 02:49:27 +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
Tayou
dbcfefca1b fix system theme 
Signed-off-by: Tayou <git@tayou.org>
 2024-07-01 23:05:54 +02:00
Tayou
d70be5121c tooltips 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 23:27:45 +02:00
Tayou
4f795eb6ef format 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 22:06:01 +02:00
Tayou
7104f8909d another oop 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 21:52:26 +02:00
Tayou
a184b26a00 #ifdef, not #if... I'm smort 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 21:47:52 +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
Tayou
f0c9b52055 oop 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 21:41:37 +02:00
Tayou
046e3588af more system themes initial changes 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 21:35:03 +02: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
7ff173d72a Merge pull request #2173 from Trial97/dependency_removal 
Remove dependencies if review mods is rejected
 2024-06-30 22:21:38 +03:00
Trial97
25bae20db4 trim input from import page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-30 00:17:25 +03:00
Trial97
f1a4a1e8ee increase 'or' font size for login dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-29 08:41:35 +03:00
Trial97
06add2b0a8 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:55:16 +03:00
Trial97
4f8b20437f Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3 2024-06-28 20:49:37 +03:00
Trial97
515baffb8e Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog 2024-06-28 20:48:28 +03:00
Trial97
147741e616 increment clang-tools version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 12:48:52 +03:00
Alexandru Ionut Tripon
68292aff6c Merge pull request #2574 from ajerick/develop 
fix non-persistent user icon selection in NewInstanceDialog.cpp
 2024-06-27 08:38:46 +03:00
seth
3f3351f89e Merge pull request #1892 from Trial97/change_version 
Added mod reinstall dialog
 2024-06-27 02:12:00 +00:00
Aiden J Erickson
37388e1d48 fix non-persistent user icon selection in NewInstanceDialog.cpp 
Signed-off-by: Aiden J Erickson <aiden.j.erickson@gmail.com>
 2024-06-26 20:54:04 -04:00
Trial97
2f88da9de2 add warnning when user closes the resource download dialog with selection 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-25 09:50:33 +03:00
Trial97
00b83efb9a fix build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-24 20:12:40 +03:00
Trial97
e57c2180da Resolve issue with multiple loaders during update 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-24 03:06:10 +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
seth
92b9f1a3e3 Merge pull request #2515 from Trial97/size_for_skin 
force aspect ratio for skin preview
 2024-06-22 19:21:59 -04:00
Trial97
27ee8374e7 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3 2024-06-22 22:54:38 +03:00
Tayou
178bd4a9c3 don't tr() file types on file save/open, etc. dialogs 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-22 17:28:59 +02:00
Trial97
766ddc80e3 refactored hassing task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-18 16:51:26 +03:00
Trial97
5fbbdb9707 fix merge issues 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 00:31:31 +03:00
Trial97
c01f3107a4 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into change_version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 00:18:11 +03:00
Trial97
98f8bc526d Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-06-15 10:21:53 +03:00
Trial97
d5fb9f0935 force aspect ratio for skin preview 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-15 10:21:21 +03:00
Alexandru Ionut Tripon
3c4eed13a3 Merge pull request #1829 from Trial97/demo 
Fixed demo mode
 2024-06-14 18:41:02 +03:00
Trial97
3db4f4dc2b fix build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 13:00:59 +03:00
Trial97
f60d0135f7 made login link to open browser 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 12:47:44 +03:00
Trial97
c35461b314 remove aspect ratio 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 11:23:14 +03:00