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
e4ed3b4546
Merge branch 'PrismLauncher:develop' into data-packs
2025-06-01 07:54:16 +00:00
618e6bd96b
Merge remote-tracking branch 'upstream/develop' into rework-settings
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-05-22 23:04:57 +01:00
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
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
5c8481a118
chore: reformat
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-04-29 10:46:41 +03:00
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
f307340690
Fix formatting
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-18 11:32:50 -07:00
166b2cb286
Tweak log formatting
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-18 11:32:50 -07:00
45b6454222
feat(ansi-console): Format console with ansi excapes
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-04-18 00:39:19 -07:00
4a2b5c72dc
feat(color-console): support ansi colors in console
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2025-04-17 14:54:44 -07:00
211c71f84a
Merge remote-tracking branch 'upstream/develop' into rework-settings
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-04-15 11:38:31 +01:00
7d4034cfa5
Shorten LocalPeer socket names
...
On most systems supporting Unix sockets, the maximum length of a socket name is quite low (e.g. on macOS 104 characters and on Linux 108). If the name is too long, the sockets will not work and thus sending messages to a running instance of the launcher will not work.
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com >
2025-04-13 02:33:22 -04:00
0da645594f
Adjust instance view sorting mode to QComboBox and add renaming behavior
...
Signed-off-by: Yihe Li <winmikedows@hotmail.com >
2025-03-27 01:20:07 +08:00
6ab4fef0c5
Merge remote-tracking branch 'upstream/develop' into data-packs
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-24 21:11:46 +00:00
e2b85a2e2b
Clang format
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-24 17:24:18 +00:00
4e6bfde723
Revert sliders
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-24 11:59:29 +00:00
72b90cf7de
gay bowser
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-24 01:07:40 +00:00
0434cc648a
Rearrange settings categories
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-24 00:36:55 +00:00
3922136f6d
Rework Minecraft and Java settings
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-24 00:29:07 +00:00
adf2ed0849
Only fire apply event when settings are actually applied
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-23 15:22:17 +00:00
dced39cab0
Add appearance page
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-03-23 13:11:25 +00:00
14ab4055ff
Reduce app ID hardcoding
...
And rename the relevant build variable to make more sense
Signed-off-by: Echo J <tcg96nougat@gmail.com >
2025-03-09 14:16:48 +02:00
43385f22be
fix null mainwindow in case of login on setup ( #3464 )
2025-03-09 14:04:48 +02:00
7db717ee7c
fix null mainwindow in case of login on setup
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-03-03 23:55:44 +02:00
162bbcfe19
rename some variables
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2025-03-03 23:55:43 +02:00
5261b615d7
Default to Fusion based Dark/Bright themes on Windows
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-02-28 21:07:58 +00:00
68bf409a98
Fix formatting issues
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2025-01-27 19:14:57 +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
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
7dde35fef2
Add settings to control the if prism should move the downloaded mods
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-12-20 19:57:09 +02:00
736ecf266d
Merge pull request #3019 from Trial97/task_parent
...
fixed double deletion for tasks
2024-11-15 06:19:40 +01:00
1d9508c268
Merge pull request #3074 from Trial97/lock
...
Close the window using the invokeMethod to not block
2024-11-07 23:45:44 +02:00
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
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
e06b3e7a7a
Implement open global settings
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-11-07 00:47:32 +00:00
e6d4e5d78d
Unify instance and global settings pt.1
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2024-11-06 23:46:30 +00:00
2b590f24ed
remove task parent from constuctor
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-11-01 00:11:45 +02:00
887e4a964a
Merge pull request #3010 from Trial97/lock3
2024-10-30 21:56:17 +01:00
0e80aae1b8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into lambda
2024-10-30 19:35:25 +02:00
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
ced2f9d1a0
Applied clang formatting
...
Signed-off-by: Michael Tyson <michael@atastypixel.com >
2024-10-30 12:51:34 +11:00
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
afa1e0599a
Improved formatting
...
Signed-off-by: Michael Tyson <michael@atastypixel.com >
2024-10-30 12:34:33 +11:00
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
11d4d948aa
lock m_instanceExtras
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-27 12:36:14 +02:00
73d33f93b3
Replaced QSet with QHash
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-22 09:41:00 +03:00
562c301326
skip QSaveFile temprary files
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-22 01:22:31 +03:00
fcadbbb739
do not require java if auto-download is enabled
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2024-10-21 16:17:48 +03:00
38fa2e0cd4
style: format with clang-format
...
Signed-off-by: seth <getchoo@tuta.io >
2024-09-30 16:32:55 -04:00
