Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-05-04 08:34:30 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,023 Commits 11 Branches 38 Tags
Commit Graph

2226 Commits

Author SHA1 Message Date
Trial97
8f8c8394dc
remove some QEventLoops 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-03-02 08:36:48 +02:00
Alexandru Ionut Tripon
ecf770d4ae
implement packignore for curseforge/modrinth export (#3295) 2025-03-02 08:19:03 +02:00
Alexandru Ionut Tripon
bf01d42c83
Add skin preview (#3283) 2025-03-02 08:18:51 +02:00
Alexandru Ionut Tripon
74ed1f3b5d
Improve profile setup error messages (#3256) 2025-03-02 08:18:40 +02:00
Alexandru Ionut Tripon
12a4915420
Apply suggestions from code review 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2025-02-21 11:32:30 +02:00
Trial97
6a2f5f071c
improve chessboard contrast 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-02-21 11:12:27 +02:00
Trial97
47af33ff6f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin 2025-02-21 08:40:33 +02:00
Rachel Powers
7b97863685
make sure if user changes java path also disable java management (#3414) 2025-02-13 14:40:40 -07:00
Trial97
174cddcf42
make sure if user changes java path also disable java management 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-02-12 20:40: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
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
Trial97
255f27d419
virtual constructor 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-22 16:11:54 +02:00
Trial97
aeeb6f6bb6
fix build final 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-22 00:16:20 +02:00
Trial97
49d82ab528
fix build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-21 23:49:42 +02:00
Trial97
7010b8acb6
fix the freeze with openglwidget 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-21 23:36:40 +02:00
Alexandru Ionut Tripon
38d3f14f06
Apply suggestions from code review 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2025-01-21 16:45:40 +02: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: 2a403b3bfe9f4c79c38c33e80515a232576f6018
I, eff3ry <jeffery.tolmie@gmail.com>, hereby add my Signed-off-by to this commit: 4ba3fd559d2664099524848825adb6f5a60650ab

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
0a71b19509
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2025-01-17 08:53:10 +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
797cacf804
refactor to remove code duplication 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-16 17:04:53 +02:00
Trial97
d2516cbecc
use YCbCr for chesboard pattern 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-16 14:11:56 +02:00
Trial97
aa6518410e
fix build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-15 23:04:47 +02:00