Commit Graph

4798 Commits

Author SHA1 Message Date
Yihe Li
dbdc9bea7a Add create shortcut button for servers
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-05-11 19:28:00 +08:00
Yihe Li
37213ecc34 Add create shortcut button for worlds
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-05-11 19:08:36 +08:00
Yihe Li
69469b4484 Refactor shortcut creation logic into its own file
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-05-11 03:37:47 +08:00
Trial97
e1cfae5e06 fix(skin manager): accept files with same name
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-05-10 12:21:32 +03:00
Trial97
a67a015e49 fix: qr code overlaping with text when adding account
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-05-10 12:21:10 +03:00
Trial97
3d0bef92a1 feat: compound the conncurent task error
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-05-10 12:16:10 +03:00
Trial97
de541bf397 refactor: paste upload to report the error directly
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-05-10 12:16:10 +03:00
Trial97
c3749c4fdc feat: add sink fail reason and correctly propagate it through the NetRequest
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-05-10 12:16:10 +03:00
Alexandru Ionut Tripon
a89fc7d1e0 Improvements to upload logs (#1872) 2025-05-10 12:12:46 +03:00
Alexandru Ionut Tripon
2c838f8c2c Allow the user to create a shortcut on the desktop and/or application folder (#2966) 2025-05-10 12:12:04 +03:00
Alexandru Ionut Tripon
0a665231db feat: search for pack icon in the actual file (#3752) 2025-05-10 12:11:48 +03:00
Alexandru Ionut Tripon
bc9af29158 feat: prevent deletion of running instances (#3754) 2025-05-10 12:11:26 +03:00
seth
cf7061b9a8 fix(FileSystem): dont re-define structs for newer mingw versions
Signed-off-by: seth <getchoo@tuta.io>
2025-05-07 17:42:30 -04:00
Trial97
4bad7e48c3 feat: prevent deletion of running instances
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-05-07 23:21:35 +03:00
Trial97
fa189572db feat: search for pack icon in the actual file
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-05-07 22:52:22 +03:00
Hendrik Lind
14a78d55b0 Merge branch 'PrismLauncher:develop' into add-startmenu-shortcut 2025-05-07 13:34:35 +02:00
Trial97
e325806173 feat: add regex removal for log sesnitive data
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-05-07 00:12:10 +03:00
Trial97
63d40ecda4 feat: add upload action for launcher logs
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-05-07 00:12:09 +03:00
Trial97
cb01d5c46e feat: refactor logs upload to use the NetJob
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-05-07 00:12:09 +03:00
Trial97
9b07c6948c fix: modrinth categories not loading
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-05-06 23:27:29 +03:00
Trial97
7523bc1925 fix: replaced deprecated unique_qobject_ptr::swap with unique_ptr
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-05-06 23:12:03 +03:00
Trial97
476f3edce0 Revert "fix: 6.2 deprecation warning regard the QScopedPointer::swap function (#3655)"
This reverts commit ca258109c5, reversing
changes made to 693d9d02bc.
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-05-06 23:12:03 +03:00
Trial97
fe0c52ff78 remove: unused files
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-05-05 19:57:24 +03:00
timoreo
ca258109c5 fix: 6.2 deprecation warning regard the QScopedPointer::swap function (#3655) 2025-05-05 14:42:09 +02:00
TheKodeToad
13f533801b Use options struct for FlamePackExportTask
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-05-03 14:26:52 +01:00
TheKodeToad
29d867cb88 Merge branch 'develop' into recommended-memory
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-30 10:35:17 +01:00
Trial97
a465af45dc fix: task typo in flame export task
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-04-30 10:15:59 +03:00
Alexandru Ionut Tripon
36d18b393b fix: crash when task was canceled and abort signal was fired early (#3712) 2025-04-30 10:10:36 +03:00
Trial97
053b57c21f fix: crash when task was canceled and abort signal was fired early
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-04-29 19:24:04 +03:00
TheKodeToad
24036021bb Propagate task warnings
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-29 17:16:18 +01:00
TheKodeToad
acdb8c5578 Implement recommendedRam in CurseForge import
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-29 17:16:16 +01:00
Trial97
147159be2c fix: file filtering on modpack export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-04-29 19:02:35 +03:00
TheKodeToad
ee52127044 Implement recommendedRam in CurseForge export
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-29 16:46:48 +01:00
TheKodeToad
75d4ef1828 Implement UI for setting recommended RAM
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-29 14:44:30 +01:00
TheKodeToad
497e0cbfdc Tweak pack export UI – add recommended RAM
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-29 14:44:09 +01:00
TheKodeToad
80fb1a8f4e Fixes for new changes
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-29 12:15:58 +01:00
Trial97
476054ba19 feat: move qr code glue in MSALoginDialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-04-29 11:27:02 +03:00
TheKodeToad
fadbcf2d04 Merge remote-tracking branch 'upstream/develop' into data-packs
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-29 09:15:11 +01:00
Trial97
5c8481a118 chore: reformat
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-04-29 10:46:41 +03:00
Trial97
93552277fe fix: build error introduced in #3516
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-04-29 10:20:28 +03:00
Alexandru Ionut Tripon
6b4f07e976 Add checkboxes to resource downloader (#3516) 2025-04-29 08:32:30 +03:00
Alexandru Ionut Tripon
0d15699b26 change java on modpack update (#3379) 2025-04-29 08:31:59 +03:00
Alexandru Ionut Tripon
a6006c3a33 chore: make all the regexes static const (#3647) 2025-04-29 00:33:49 +03:00
Alexandru Ionut Tripon
d6bba50d86 replace qvector with qlist (#3519) 2025-04-29 00:32:40 +03:00
Trial97
c5fd5e6ac1 chore: make all the regexes static const
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-04-28 22:37:29 +03:00
Alexandru Ionut Tripon
21c90527d2 Parse log4j xml events in logs (#3642) 2025-04-28 18:33:17 +03:00
Rachel Powers
07a6606c9c fix: cover both usages of the download dialog
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2025-04-28 04:49:30 -07:00
Rachel Powers
d0ccd110a1 fix: use after free begone!
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2025-04-28 04:49:23 -07:00
Rachel Powers
2031859731 Merge remote-tracking branch 'upstream/develop' into xml-logs 2025-04-28 04:11:53 -07:00
Rachel Powers
2c943a003d feat(xml-logs): preserve whitespace lines in logs
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2025-04-28 03:54:47 -07:00