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,167 Commits 9 Branches 38 Tags
a2e44c0ef76a73befc9c31e243b675d8df6eb751
Commit Graph

9167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trial97
9601fbf2d5 Close the window using the invokeMethod to not block 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-11-07 15:07:17 +02:00
TheKodeToad
6e55239cec Merge pull request #3073 from TheKodeToad/fix-formatting-guidelines-oversight 
Fix formatting oversight
 2024-11-07 13:01:15 +00:00
TheKodeToad
900235642c Fix formatting oversight 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-11-07 12:16:22 +00:00
TheKodeToad
f667f56fb7 Merge pull request #3067 from TheKodeToad/updated-formatting-guidelines 
Updated formatting guidelines
 2024-11-07 11:43:12 +00:00
TheKodeToad
e06b3e7a7a Implement open global settings 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-11-07 00:47:32 +00:00
TheKodeToad
223b6b3b2b Fix non-Linux build 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-11-07 00:22:22 +00:00
TheKodeToad
71e55f8829 Add scrollbar to Settings -> Launcher -> Features 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-11-07 00:11:27 +00:00
TheKodeToad
e6d4e5d78d Unify instance and global settings pt.1 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-11-06 23:46:30 +00:00
TheKodeToad
8ecc21c093 Make Ryex's suggested change 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-11-06 22:12:22 +00:00
Sefa Eyeoglu
0a80da28fa chore: update Nix readme 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2024-11-06 19:29:57 +01:00
TheKodeToad
b67d400f60 Update formatting guidelines 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-11-06 16:27:03 +00:00
timoreo
1ab10bdd84 Merge pull request #3060 from Ryex/ci/bump_linux_qt 
ci: bump linux qt version
 2024-11-05 11:25:27 +01:00
Rachel Powers
ba6743d134 ci: libxcb-curcsor_dev ? 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-11-05 01:30:55 -07:00
Rachel Powers
d63a336411 ci: bump linux qt version 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-11-05 01:10:38 -07:00
Alexandru Ionut Tripon
4a92573235 Merge pull request #3042 from Trial97/isportable 
use isPortable to determine if the MSAStep should check for url handler
 2024-11-03 11:55:55 +02:00
Alexandru Ionut Tripon
db3d796275 Merge pull request #3045 from Trial97/ask_retry3 
disable retry for modrinth currentVersions API
 2024-11-03 11:55:37 +02:00
Trial97
6f2f3c2d3b disable retry for modrinth currentVersions API 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-11-01 17:34:29 +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
Trial97
670c932f32 Fix installed typo 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-31 14:51:18 +02:00
TheKodeToad
ba07a136dc Merge pull request #3035 from PrismLauncher/remove-BasicFolderLoadTask 
Remove BasicFolderLoadTask
 2024-10-31 09:17:27 +00:00
TheKodeToad
9ae16921bc Remove BasicFolderLoadTask 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-30 21:10:43 +00:00
Tayou
887e4a964a Merge pull request #3010 from Trial97/lock3 2024-10-30 21:56:17 +01:00
seth
8faff9ac6a Merge pull request #3030 from Trial97/sys 2024-10-30 15:16:38 -04: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
14c95b9d37 fix macos system detection 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-30 17:15:42 +02:00
Alexandru Ionut Tripon
b7598c6a41 Merge pull request #2331 from michaeltyson/develop 
Support for launching from command line in offline mode
 2024-10-30 09:49:33 +02:00
Michael Tyson
ced2f9d1a0 Applied clang formatting 
Signed-off-by: Michael Tyson <michael@atastypixel.com>
 2024-10-30 12:51:34 +11:00
Michael Tyson
5661444414 Removed “--name” flag in favour of specifying offline player name via “--offline” flag 
Signed-off-by: Michael Tyson <michael@atastypixel.com>
 2024-10-30 12:37:14 +11:00
Michael Tyson
afa1e0599a Improved formatting 
Signed-off-by: Michael Tyson <michael@atastypixel.com>
 2024-10-30 12:34:33 +11:00
Michael Tyson
43e4481b70 Support for launching from command line in offline mode 
This allows launching an offline instance with --offline --name=OfflineName. This is useful for playing split screen by creating two side-by-side instances, which is impossible online, unless one is using two separate paid accounts.

With this PR, it makes it possible to launch from a script - otherwise, one has to launch manually, which is a pain, or create offline profiles for each instance, which interferes with some functionality like skins (my autistic son takes great issue with his skin not being visible, when using offline profiles!).

Implementation is based on MultiMC, which supports this feature.

See also https://github.com/PrismLauncher/PrismLauncher/issues/1059 for discussion.

Signed-off-by: Michael Tyson <michael@atastypixel.com>
 2024-10-30 12:30:20 +11:00
Tayou
65b0fdf08d Merge pull request #3027 from benthetechguy/metadata 2024-10-29 23:06:01 +01:00
Ben Westover
f6511c601e Fix some typos 
Signed-off-by: Ben Westover <me@benthetechguy.net>
 2024-10-29 20:45:10 +00:00
Ben Westover
fd109c4740 Shorten metainfo.xml app summary 
Signed-off-by: Ben Westover <me@benthetechguy.net>
 2024-10-29 20:45:06 +00:00
TheKodeToad
2368521a9a Add missing semicolon 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-29 17:54:03 +00:00
TheKodeToad
d49e6187cd Make requested changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-29 17:17:51 +00:00
TheKodeToad
c1c198b84b Combine if statements 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-29 15:45:30 +00:00
TheKodeToad
e7ff3146fe Merge pull request #1953 from Trial97/account2 
Auto reauthenticate account if expired
 2024-10-29 14:08:50 +00:00
Trial97
8e7d84d05b fix leak on resource search 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-29 00:40:13 +02:00
TheKodeToad
d157159106 Fix license headers and formatting 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-28 22:29:43 +00:00
TheKodeToad
bd8b30c606 Implement link for InfoFrame::updateWithResource 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-28 22:17:16 +00:00
TheKodeToad
f56a8feade Merge pull request #2986 from Trial97/bump_10.x 
bump develop to 10
 2024-10-28 21:12:53 +00:00
TheKodeToad
f3cae427f1 Fix tests (make them green) 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-28 21:09:45 +00:00
Alexandru Ionut Tripon
51b7abec24 Merge pull request #3005 from Trial97/installed 
add installed text to version select
 2024-10-28 22:55:40 +02:00
Alexandru Ionut Tripon
d90ed89a30 Merge pull request #2989 from Trial97/what 
add extra protection against empty download link
 2024-10-28 22:55:21 +02:00
TheKodeToad
ad1d5ddcdf Revert unwise refactor 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-28 20:42:59 +00:00
Alexandru Ionut Tripon
2dee936246 Merge pull request #2837 from Trial97/translate_standeard_butons 
translate standard buttons
 2024-10-28 22:31:47 +02:00