Commit Graph

2441 Commits

Author SHA1 Message Date
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
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
bf1084d7fa Fix some undefined behaviour
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-02-11 10:59:10 +02:00
7d202e348d Use the same UI for instance and global settings (#3341) 2025-02-05 23:04:54 +02:00
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
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
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
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
06b50dfd33 Fix more header mistakes
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-02-05 11:11:45 +00:00
5a76d9b7e1 Make requested changes
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-02-05 10:58:06 +00:00
c5efe081b4 fix add resource with no instance
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-31 22:03:57 +02:00
5d179671bf Fix non-Linux build
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-01-27 18:55:24 +00:00
dc6f536843 Fix Qt 5 compilation
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-01-27 18:04:41 +00:00
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
a92c68adbd Remove duplicate console section
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-01-27 16:54:45 +00:00
7aaa9fa93c Finish off MinecraftSettingsWidget implementation
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-01-27 16:46:26 +00:00
81769b9047 Use MinecraftInstancePtr instance of InstancePtr
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-01-27 14:34:07 +00:00
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
9d0918a064 Remove outdated JavaWizardWidget comment
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-01-27 13:19:10 +00:00
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
39ae2fbd4a Fix tab inconsistencies
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-01-26 22:44:43 +00:00
36a35d7925 Fix tab order
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-01-26 22:36:48 +00:00
1b4b36df33 Unify Java page
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-01-26 22:25:26 +00:00
bb20848449 use more sensible protocol version
Signed-off-by: iTrooz <hey@itrooz.fr>
2025-01-25 21:01:21 +01:00
0b9d4784d8 Show socket error in McClient
Signed-off-by: iTrooz <hey@itrooz.fr>
2025-01-25 20:26:52 +01:00
b06c4341d8 update documentation
Signed-off-by: iTrooz <hey@itrooz.fr>
2025-01-25 20:22:09 +01:00
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
439c565961 forward McResolver error as Task error
Signed-off-by: iTrooz <hey@itrooz.fr>
2025-01-25 20:14:15 +01:00
cf2b413f29 forward McClient error as Task error
Signed-off-by: iTrooz <hey@itrooz.fr>
2025-01-25 20:10:31 +01:00
fe8f755b43 remove waitForConnected() and waitForReadyRead() and use signals ineatd
Signed-off-by: iTrooz <hey@itrooz.fr>
2025-01-25 20:08:44 +01:00
43376b1c40 remove unused defines in McClient.h
Signed-off-by: iTrooz <hey@itrooz.fr>
2025-01-25 19:06:52 +01:00
255f27d419 virtual constructor
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-22 16:11:54 +02:00
aeeb6f6bb6 fix build final
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-22 00:16:20 +02:00
49d82ab528 fix build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-21 23:49:42 +02:00
7010b8acb6 fix the freeze with openglwidget
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-21 23:36:40 +02:00
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
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
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
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
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
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
c2f4389e5f Merge pull request #3254 from Trial97/remove_multimc
remove EditAccountDialog
2025-01-17 08:51:44 +02:00
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
1cce582d56 Merge pull request #3292 from Trial97/fix_modrinth_link
fix modrinth link
2025-01-16 20:42:00 -05:00
797cacf804 refactor to remove code duplication
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-16 17:04:53 +02:00
d2516cbecc use YCbCr for chesboard pattern
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-16 14:11:56 +02:00
aa6518410e fix build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-15 23:04:47 +02:00
9d25680587 remove defaults blocked list
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-15 22:35:47 +02:00
82e59658d5 uniform ignoreFilesWithPath
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-15 21:59:31 +02:00
a6f5858dac Fix ignore for modrinth/flame export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-15 21:54:02 +02:00