fede/prismlauncher-crack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,823 Commits 1 Branch 0 Tags
0f9ea5c9498fcfe024034cad465b6be9908041b7
Commit Graph

396 Commits

Author SHA1 Message Date
timoreo 736ecf266d Merge pull request #3019 from Trial97/task_parent 
fixed double deletion for tasks
 2024-11-15 06:19:40 +01:00
Alexandru Ionut Tripon 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
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 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
Trial97 2b590f24ed remove task parent from constuctor 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-11-01 00:11:45 +02:00
Tayou 887e4a964a Merge pull request #3010 from Trial97/lock3 2024-10-30 21:56:17 +01:00
Trial97 0e80aae1b8 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into lambda 2024-10-30 19:35:25 +02: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
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
Trial97 11d4d948aa lock m_instanceExtras 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-27 12:36:14 +02:00
Trial97 73d33f93b3 Replaced QSet with QHash 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-22 09:41:00 +03:00
Trial97 562c301326 skip QSaveFile temprary files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-22 01:22:31 +03:00
Trial97 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
seth 38fa2e0cd4 style: format with clang-format 
Signed-off-by: seth <getchoo@tuta.io>
 2024-09-30 16:32:55 -04:00
Mason Rocha b9c19fd3f7 fix: don't annoy when java tmpdir jvmarg is set & /tmp is noexec 
Signed-off-by: Mason Rocha <mrocha@turretllc.us>

Got annoyed, didn't want to see it anymore.

Java tmpdir noexec warning modified to include information about
possible remedies available
 2024-09-27 16:42:59 -05:00
seth 48904c0d66 Merge pull request #2806 from Trial97/technic_client 
Add Technic client ID
 2024-09-24 19:55:21 -04:00
Trial97 312009513d add open java folder action 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-14 19:35:43 +03:00
Alexandru Ionut Tripon d20f24d96f Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-09-13 21:13:21 +03:00
Trial97 973b43ca7a Add techinc client ID 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-13 20:01:45 +03:00
Trial97 c85294af9d Improve wizzard page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-09-13 19:33:24 +03:00
Trial97 da7cc529f0 Enable auto-detect java if java path is not set 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-21 14:54:47 +03:00
Trial97 4d24213aa3 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-08-20 00:02:14 +03:00
Trial97 38b5ee198a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into validate_metadata 2024-08-18 22:39:46 +03:00
Trial97 b5bbe93775 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-17 00:20:40 +03:00
Trial97 dcca175b36 snake_case to m_camelCase 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-09 11:06:31 +03:00
Trial97 c9809fff6d add setting for quickplay singleplayer 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-08 16:53:26 +03:00
Trial97 29a6db171f Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-07-22 08:57:31 +03:00
Trial97 91d03b34ac Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into validate_metadata 2024-07-21 02:24:30 +03:00
Alexandru Ionut Tripon 0041d2a126 Merge pull request #2440 from Trial97/fix_retry_dialog 
update retry netjob dialog
 2024-07-19 15:47:12 +03:00
Ben Westover fb10cb5fdf Fix a few typos 
As part of packaging Prism Launcher for Debian, I have run a package linter
called lintian which found a few spelling errors throughout the source.

I am not a fan of contributions that only fix cosmetics like spelling errors,
but Debian encourages forwarding this stuff upstream instead of letting it get
fixed naturally over time.

Signed-off-by: Ben Westover <me@benthetechguy.net>
 2024-07-18 22:08:18 -04:00
Trial97 a09742a406 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-07-06 01:07:00 +03:00
Kationor 83a5fe1984 Rename setting to SkipModpackUpdatePrompt 
Was ModpackUpdatePromptDisabled

Signed-off-by: Kationor <n96211028@gmail.com>
 2024-07-03 23:13:39 +02:00
Kationor 9b172278f8 Add ModpackUpdatePromptDisabled setting 
When creating an instance of a modpack that's already associated with
another instance, the user gets asked if they want to update that
instance instead. This commit introduces a setting to suppress the
prompt and directly create the new instance.

Signed-off-by: Kationor <n96211028@gmail.com>
 2024-07-03 12:43:05 +02:00
Trial97 0f311453e1 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-30 22:54:23 +03:00
Trial97 4b4da8e6f6 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-30 22:41:49 +03:00
Alexandru Ionut Tripon fc445078cd Merge pull request #2415 from Trial97/configure_timeout 
Add config for transfer timeout
 2024-06-30 22:26:19 +03:00
Trial97 7a0b299be9 control Prism data directory via env variable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-29 18:08:28 +03:00
Trial97 2af6902b42 validate metadata on launch 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:51:26 +03:00
Trial97 515baffb8e Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog 2024-06-28 20:48:28 +03:00
Trial97 0b79abcdcd Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:45:30 +03:00
Alexandru Ionut Tripon 2cd0223cff Merge pull request #2578 from Trial97/clang-format 
chore:increment clang-tools version
 2024-06-28 19:33:18 +03:00
Trial97 147741e616 increment clang-tools version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 12:48:52 +03:00
seth 66e6fc04d3 Merge pull request #2520 from Trial97/metadata 2024-06-28 04:57:39 +00:00
Trial97 096266c141 fix update message 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-24 21:31:26 +03:00
Trial97 2108ddcc1d completly remove metadata on refresh 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 01:16:09 +03:00
Trial97 11ae169087 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-10 09:34:48 +03:00
Trial97 e63f25c9e4 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-10 09:01:01 +03:00