Commit Graph

217 Commits

Author SHA1 Message Date
Alexandru Ionut Tripon 178965676e Remove reference to deprecated Q_OS_OSX macro (#3824) 2025-06-02 12:45:24 +03:00
Alexandru Ionut Tripon 52fa074ff7 Make column visibility global (#3748) 2025-06-02 12:45:03 +03:00
Yihe Li 5ccdb0a477 Remove several warnings when building the project
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-06-02 17:00:13 +08:00
Trial97 a29b189056 feat: make the visibility per resource
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-02 11:56:03 +03:00
Trial97 8c710fb8de chore: migrate map settings to json string
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-02 11:56:03 +03:00
TheKodeToad edb1020dce Merge remote-tracking branch 'upstream/develop' into data-packs
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-06-02 09:52:05 +01:00
Trial97 6177fa0148 feat: make resource header config global
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-02 11:40:48 +03:00
Trial97 ca54971499 chore: ensure the setting is saved as string
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-02 09:45:49 +03:00
Trial97 492769aea6 feat: add setting to control the loaders for mod search
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-02 09:19:40 +03:00
TheKodeToad e4ed3b4546 Merge branch 'PrismLauncher:develop' into data-packs 2025-06-01 07:54:16 +00: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 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 c5fd5e6ac1 chore: make all the regexes static const
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-04-28 22:37:29 +03:00
Rachel Powers 2031859731 Merge remote-tracking branch 'upstream/develop' into xml-logs 2025-04-28 04:11:53 -07:00
TheKodeToad 63e30352e6 Fix catastrophic regex mistake (#3669) 2025-04-28 11:07:01 +01:00
TheKodeToad 1e3c197222 Merge remote-tracking branch 'upstream/develop' into shallow-lazy-otherlogs
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-28 10:31:48 +01:00
TheKodeToad 20626e6606 Fix log sorting
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-28 10:28:57 +01:00
Rachel Powers 21570a03fb feat(xml-logs): finish tests
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2025-04-19 13:02:30 -07:00
TheKodeToad 92ba13cfdb Fix catastrophic regex mistake
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-19 00:12:38 +01:00
Seth Flynn 3df98dd5e7 Remove support for Qt 5 (#2174) 2025-04-18 16:26:55 -04:00
TheKodeToad d5db974008 Shallow search and lazy loading for Other Logs page
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-18 20:14:33 +01:00
TheKodeToad 0f847d6682 Fix mistakes
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-18 19:40:19 +01:00
Trial97 442aae88ce chore: remove qt version checks from code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-04-17 23:46:55 +03:00
TheKodeToad ce76320b23 Remove unnecessary import
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-15 15:58:11 +01:00
TheKodeToad be803b3279 Optimise guessLevel
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-15 15:39:27 +01:00
TheKodeToad ea82d44aab Allow absolute path for global data packs
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-03-26 00:30:00 +00:00
TheKodeToad 18ee1f897a Global data packs
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-03-25 16:28:16 +00:00
Trial97 9e954548dd add libMangoHud_shim.so to mangohub preloadlist
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-02-12 20:21:45 +02:00
seth b7f2175718 Merge pull request #3179 from sshcrack/fix-inst-java
Fix $INST_JAVA not being set for auto download java
2025-01-16 20:03:26 -05:00
Alexandru Ionut Tripon 507faf9f00 Merge pull request #3150 from kthchew/fix/unneeded-hr-exceptions
Remove unnecessary hardened runtime exceptions on macOS
2024-12-14 19:30:11 +02:00
sshcrack cf2dcbd431 load meta first
Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com>
2024-12-08 18:27:57 +01:00
sshcrack dedb7a2343 change order of steps
Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com>
2024-12-08 14:39:06 +01:00
Kenneth Chew 884f15da1e Remove unnecessary hardened runtime exceptions
These are cruft from an older time when the launcher was ad-hoc signed, and the OS couldn't tell the libraries and launcher were signed by the same party.

Additionally, add a workaround to send the necessary library injection to the game if Steam overlay is used despite library validation being on for the launcher.

Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
2024-11-29 21:18:06 -05:00
Jan200101 514ec99a03 Integrate switcheroo-control for discrete GPU support
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
2024-11-25 22:29:39 +01:00
timoreo 736ecf266d Merge pull request #3019 from Trial97/task_parent
fixed double deletion for tasks
2024-11-15 06:19:40 +01:00
Trial97 2b590f24ed remove task parent from constuctor
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-11-01 00:11:45 +02:00
Trial97 0e80aae1b8 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into lambda 2024-10-30 19:35:25 +02:00
TheKodeToad c142d38f08 Merge pull request #1588 from TheKodeToad/resource-meta
Implement tracking and updates for files other than mods
2024-10-30 17:03:54 +00:00
Trial97 82bffabb69 do not capture by default all values in lambdas
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-30 18:16:43 +02:00
Trial97 0f42f3cc5c Added warning regarding maximized option
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-28 17:19:18 +02:00
Trial97 81c5866fa9 Made sure that the qt version check is in place
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-28 17:19:18 +02:00
Trial97 1be29076ea When java disappoints try C++
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-28 17:19:18 +02:00
TheKodeToad 1809858fc7 Ignore .index in ExportPackDialog
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-28 11:01:30 +00:00
TheKodeToad 6a6fe60a5b Revert "Use non-mod metadata in ModrinthPackExportTask"
Out-of-scope

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-28 10:29:49 +00:00
TheKodeToad 13e13ea8fc Use non-mod metadata in ModrinthPackExportTask
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-25 19:13:41 +01:00
TheKodeToad 3fae659b30 Merge remote-tracking branch 'upstream/develop' into resource-meta
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-08 17:15:42 +01:00
Trial97 e18e9b0509 fix server launch
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-13 22:57:08 +03:00
Trial97 14fb54afd9 Fix launch when no java is loaded
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-08 09:10:29 +03:00
Trial97 ca298d1ed5 add automatic java switch on minecraft version switch
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-20 01:08:03 +03:00