Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-11 20:57:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,476 Commits 9 Branches 38 Tags
9f1ee3594e557e830fa689f1e86a8ec815bf39df
Commit Graph

1016 Commits

Author SHA1 Message Date
Jan200101
514ec99a03 Integrate switcheroo-control for discrete GPU support 
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
 2024-11-25 22:29:39 +01:00
Kationor
b40a1973bf Improve MANIFEST.MF parsing 
Previously, we would only properly parse LF-encoded manifests, and even
those only if they used the recommended casing.

This commit allows the parser to recognise CR and CRLF newlines, and
also makes the name comparison case insensitive to align with the
specification. (Though not completely: we still don't support multiline
values)

Signed-off-by: Kationor <n96211028@gmail.com>
 2024-11-24 19:30:59 +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
172e43cd3f Fix warnings regarding Resource static cast 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-11-13 23:11:33 +02:00
Alexandru Ionut Tripon
7d03cb114d Merge pull request #3031 from Trial97/lambda 
do not capture by default all values in lambdas
 2024-11-07 23:45:31 +02:00
Trial97
f77f0207f7 fix the flame loaders match 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-11-01 14:30:47 +02:00
Trial97
99cfb62370 use isPortable to determine if the MSAStep should check for url handler 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-11-01 11:03:47 +02:00
Trial97
2b590f24ed remove task parent from constuctor 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-11-01 00:11:45 +02:00
TheKodeToad
9ae16921bc Remove BasicFolderLoadTask 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-30 21:10:43 +00: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
Ben Westover
f6511c601e Fix some typos 
Signed-off-by: Ben Westover <me@benthetechguy.net>
 2024-10-29 20:45:10 +00:00
TheKodeToad
d49e6187cd Make requested changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-29 17:17:51 +00:00
TheKodeToad
d157159106 Fix license headers and formatting 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-28 22:29:43 +00:00
TheKodeToad
f3cae427f1 Fix tests (make them green) 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-28 21:09:45 +00:00
TheKodeToad
ad1d5ddcdf Revert unwise refactor 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-28 20:42:59 +00:00
TheKodeToad
2b22a1aebe Reimplement View Homepage 
I removed it for some reason, but now it's back for all pages!

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-28 20:14:56 +00:00
TheKodeToad
354a0ed46e Fix column sizes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-28 18:01:01 +00: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
Trial97
09a118e85e expand env from wrapped cmd 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-28 16:23:33 +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
seth
6a2ed4a631 Merge pull request #2982 from TheKodeToad/launcher-level-autoinstalljava 
Use Launcher log level in AutoInstallJava
 2024-10-25 02:23:02 -04:00
TheKodeToad
d8702e1357 Use Launcher log level in AutoInstallJava 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-24 12:46:01 +01:00
TheKodeToad
5eff9b0934 Fix column crashes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-24 01:23:11 +01:00
Rachel Powers
7bd04ae928 fix don't hang the ui for a full version load 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-10-23 16:23:10 -07:00
TheKodeToad
89a327d363 Merge remote-tracking branch 'upstream/develop' into resource-meta 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-23 14:19:07 +01:00
Trial97
562c301326 skip QSaveFile temprary files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-22 01:22:31 +03:00
Alexandru Ionut Tripon
9a161a0335 Merge pull request #2930 from Trial97/fixes 
Fix tests segfault
 2024-10-19 22:32:51 +03:00
Trial97
2030041fcc Fix tests segfault 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-19 21:42:14 +03:00
Trial97
7519c63f2e Replace http with https on skins 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-19 01:11:27 +03:00
Rachel Powers
09c9da268f fix: prevent inf recursion when mod icon load fails; cut max pixmapcache to 1/4 previous value 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-10-11 13:26:20 -07:00
TheKodeToad
98adcc60a3 Use UTF-8 to decode logs on Java 18 or newer 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-09 17:15:53 +01:00
TheKodeToad
909114bf2a Change LaunchTask to only accept MinecraftInstance 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-09 15:07:09 +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
timoreo
dc67807894 Merge pull request #2825 from Trial97/skin_fix 2024-09-17 08:50:19 +02:00
Alexandru Ionut Tripon
926a6bc72a Merge pull request #2583 from Trial97/metadata2 
Generate updater metadata for mods added/updated using modpack updater/installer
 2024-09-17 08:45:09 +03:00
Alexandru Ionut Tripon
53c3d99bdd Merge pull request #2828 from Trial97/cmake_fields 
Allow configuring more URLs through CMake
 2024-09-17 08:44:24 +03:00
Trial97
3ca67cc388 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2 2024-09-16 20:08:43 +03:00
Trial97
b4ecb38ae5 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into cmake_fields 2024-09-16 20:06:18 +03:00
Trial97
f36cfaf878 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_fix 2024-09-16 20:05:44 +03:00
Trial97
aab82705cd Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mac_java 2024-09-16 20:05:18 +03:00
seth
8faebe320e Merge pull request #2807 from Trial97/fix_server_launch 
fix server launch
 2024-09-16 09:42:54 -04:00
Alexandru Ionut Tripon
db3c7d01fd Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-09-16 16:36:05 +03:00
Trial97
ca6b62c773 move some URLs in cmake 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 15:51:51 +03:00
Trial97
d38e7fa142 Add more null protection for skin management 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-16 12:41:33 +03:00