Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-12 05:07:46 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,961 Commits 9 Branches 38 Tags
0626e354a026f9a2a35a4d6e28a0af105cb22986
Commit Graph

2193 Commits

Author SHA1 Message Date
TheKodeToad
79180db663 Fix some undefined behaviour (#3407) 2025-02-11 19:04:56 +00:00
Alexandru Ionut Tripon
22b59e760c Update launcher/ui/widgets/CheckComboBox.cpp 
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2025-02-11 21:03:04 +02:00
Alexandru Ionut Tripon
1d1a4f1b30 Apply suggestions from code review 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2025-02-11 21:02:27 +02:00
Trial97
bf1084d7fa Fix some undefined behaviour 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-02-11 10:59:10 +02:00
Alexandru Ionut Tripon
7d202e348d Use the same UI for instance and global settings (#3341) 2025-02-05 23:04:54 +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
f7a401ab22 Update launcher/ui/pages/instance/InstanceSettingsPage.h 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-02-05 12:09:26 +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
06b50dfd33 Fix more header mistakes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-02-05 11:11:45 +00:00
TheKodeToad
5a76d9b7e1 Make requested changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-02-05 10:58:06 +00:00
Trial97
c5efe081b4 fix add resource with no instance 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-31 22:03:57 +02:00
TheKodeToad
5d179671bf Fix non-Linux build 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 18:55:24 +00:00
TheKodeToad
dc6f536843 Fix Qt 5 compilation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 18:04:41 +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
7aaa9fa93c Finish off MinecraftSettingsWidget implementation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 16:46:26 +00:00
TheKodeToad
81769b9047 Use MinecraftInstancePtr instance of InstancePtr 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 14:34:07 +00:00
TheKodeToad
147b315c14 Update thresholds when min. memory value is changed too 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 14:15:07 +00:00
TheKodeToad
9d0918a064 Remove outdated JavaWizardWidget comment 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 13:19:10 +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
39ae2fbd4a Fix tab inconsistencies 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-26 22:44:43 +00:00
TheKodeToad
36a35d7925 Fix tab order 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-26 22:36:48 +00:00
TheKodeToad
1b4b36df33 Unify Java page 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-26 22:25:26 +00:00
Jeffery Tolmie
caccaefb39 Change "none" to "" 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: Jeffery Tolmie <jeffery.tolmie@gmail.com>
 2025-01-22 02:06:49 +13:00
eff3ry
532fec7748 DCO Remediation Commit 
DCO Remediation Commit for eff3ry <jeffery.tolmie@gmail.com>

I, eff3ry <jeffery.tolmie@gmail.com>, hereby add my Signed-off-by to this commit: 2a403b3bfe
I, eff3ry <jeffery.tolmie@gmail.com>, hereby add my Signed-off-by to this commit: 4ba3fd559d

Signed-off-by: eff3ry <jeffery.tolmie@gmail.com>
 2025-01-22 01:48:04 +13:00
eff3ry
4ba3fd559d Update Filter Checks 
Updates the filter checks so that options both and none can be differentiated.

Signed-off-by: Jeffery Tolmie Jeffery.tolmie@gmail.com
 2025-01-22 01:40:59 +13:00
Alexandru Ionut Tripon
f17599c8b8 Merge pull request #1689 from Trial97/progrss_bar_interaction 
Added mouse interactions for labels in ProgressDialog
 2025-01-17 20:59:52 +02:00
Alexandru Ionut Tripon
c2f4389e5f Merge pull request #3254 from Trial97/remove_multimc 
remove EditAccountDialog
 2025-01-17 08:51:44 +02:00
Alexandru Ionut Tripon
b7d117cc77 Merge pull request #2737 from maskersss/log-upload 
Truncate logs for mclo.gs to fit 25k line limit
 2025-01-17 08:49:49 +02: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
Alexandru Ionut Tripon
f4f1d5f0d7 Merge pull request #3228 from Trial97/delete_block 
Add settings to control the if prism should move the downloaded mods
 2025-01-09 00:12:12 +02:00
Alexandru Ionut Tripon
fbd886e9db Merge pull request #3255 from Trial97/propagate_load 
propagate load component error
 2025-01-09 00:11:48 +02:00
Alexandru Ionut Tripon
cb8320ca41 Merge pull request #3278 from Trial97/remove_drop 
remove drop label
 2025-01-09 00:10:50 +02:00
Trial97
0f9ea5c949 remove drop label 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-08 01:55:45 +02:00
Trial97
d40c8b704c fix drop file on resource page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-08 01:52:11 +02:00
Trial97
6ebfcb91cf propagate load component error 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-12-31 13:44:22 +02:00
Trial97
e01df73deb remove EditAccountDialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-12-31 11:13:01 +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
Alexandru Ionut Tripon
0b6ce5525d Merge pull request #3216 from Trial97/fix_auto_mod_provider 
Fix automatically choose mod provider option
 2024-12-19 09:16:59 +02:00
timoreo
c7b6977692 Merge pull request #3043 from Trial97/fix_flame_loader_match 
fix the flame loaders match
 2024-12-18 19:53:22 +01:00
Trial97
0412ed3f78 Fix automatically choose mod provider option 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-12-16 14:51:59 +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
leia uwu
614574f15c fix icon theme search paths 
using fallback search paths breaks qadwaitadecorations

Signed-off-by: leia uwu <leia@tutamail.com>
 2024-12-06 23:26:46 -03:00
Alexandru Ionut Tripon
28a471777a Merge pull request #2800 from QazCetelic/advanced-icon-dialog 
Add search and support for subdirectories to icon picker
 2024-12-06 12:37:45 +02:00
TheKodeToad
488dc7815c Merge pull request #3135 from Trial97/italic 
Make FTB Import note italic to match others
 2024-12-02 14:07:42 +00:00
leia uwu
3f67ef968b fix: icon search paths memory leak 
Signed-off-by: leia uwu <leia@tutamail.com>
 2024-11-30 12:51:39 -03:00
leia uwu
fd9c80db62 fix: fix system icons 
This sets the fallback icon theme to the current(system default) icon theme before
launcher specific themes are applied

And removes `Inherits` line of multimc/legacy icon theme because it can end up making it
inherit a default theme set from /usr/share/icons/default/index.theme
instead of the user configured theme (probably a qt bug?)

Signed-off-by: leia uwu <leia@tutamail.com>
 2024-11-30 11:35:41 -03:00
Trial97
a09af619ce Make FTB Import note italic to match others 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-11-24 20:29:07 +02:00