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

2451 Commits

Author SHA1 Message Date
sticks
998bc660fa feat: add updater dialogues 
Signed-off-by: sticks <tanner@teamhydra.dev>
 2025-02-28 15:09:46 -06: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
Trial97
5810032861 Fix icon removal in icon picker 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-02-19 09:29:05 +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
iTrooz
34233a93a2 MinecraftTarget::parse() to parse IP 
Signed-off-by: iTrooz <hey@itrooz.fr>
 2025-02-13 00:55:35 +01: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
iTrooz
bb20848449 use more sensible protocol version 
Signed-off-by: iTrooz <hey@itrooz.fr>
 2025-01-25 21:01:21 +01:00
iTrooz
0b9d4784d8 Show socket error in McClient 
Signed-off-by: iTrooz <hey@itrooz.fr>
 2025-01-25 20:26:52 +01:00
iTrooz
b06c4341d8 update documentation 
Signed-off-by: iTrooz <hey@itrooz.fr>
 2025-01-25 20:22:09 +01:00
iTrooz
7c82cd82d7 use m_responseReadState to avoid calling parseResponse() (as a failsafe for malicious/bad server responses) 
Signed-off-by: iTrooz <hey@itrooz.fr>
 2025-01-25 20:19:19 +01:00
iTrooz
439c565961 forward McResolver error as Task error 
Signed-off-by: iTrooz <hey@itrooz.fr>
 2025-01-25 20:14:15 +01:00
iTrooz
cf2b413f29 forward McClient error as Task error 
Signed-off-by: iTrooz <hey@itrooz.fr>
 2025-01-25 20:10:31 +01:00
iTrooz
fe8f755b43 remove waitForConnected() and waitForReadyRead() and use signals ineatd 
Signed-off-by: iTrooz <hey@itrooz.fr>
 2025-01-25 20:08:44 +01:00
iTrooz
43376b1c40 remove unused defines in McClient.h 
Signed-off-by: iTrooz <hey@itrooz.fr>
 2025-01-25 19:06:52 +01: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: 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