ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
8,634 Commits 4 Branches 5 Tags 40 MiB
0722dba820
Commit Graph

4036 Commits

Author SHA1 Message Date
Alexandru Ionut Tripon
d2daacf736
Merge pull request #2716 from Trial97/quickPlaySingleplayer 
add setting for quickplay singleplayer
 2024-08-12 11:25:25 +03:00
Tianhao Chai
c2192cfa98
mangohud support: getLibraryString should return absolute path when possible 
Some distros ship MangoHub vulkan layer json with bare shared object name
instead of an absolute path. This breaks environment config as
`MinecraftInstance::createLaunchEnvironment()` seems to require absolute
path of `libMangoHud.so`.

Since we already have `MangoHud::findLibrary()` lying around, use that to
figure out where `libMangoHud.so` really is. In case of a platform that
doesn't support `dlopen()`, fallback to old behavior and return the path
verbatim as it is recorded in vk layer json.

Signed-off-by: Tianhao Chai <cth451@gmail.com>
 2024-08-09 14:11:44 -04: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
a9c7e95c66
fix widebar action removal 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-08 19:39:32 +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
Kationor
659fa7fbfb
fix/windows: Check registry for per-user java installations 
Signed-off-by: Kationor <n96211028@gmail.com>
 2024-08-07 18:00:42 +02:00
Edgars Cirulis
ba7391308e
Restore connect line for device authorization in MSADeviceCodeStep 
Parent PRs: https://github.com/PrismLauncher/PrismLauncher/pull/2617

Fixes https://github.com/PrismLauncher/PrismLauncher/issues/2705

Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
 2024-08-05 22:12:18 +03:00
Trial97
fe23e76714
fix codeql 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-05 12:04:08 +03:00
Trial97
af65eb17cf
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-05 11:54:58 +03:00
Alexandru Ionut Tripon
9d684dcb82
Merge pull request #2617 from Trial97/clean_net 
remove duplicate code from net folder
 2024-08-05 10:56:40 +03:00
Alexandru Ionut Tripon
e4967f8d08
Merge pull request #2694 from Trial97/zip_folder_permissions 
ensure minimal folder permissions when extracting files
 2024-08-05 10:56:06 +03:00
Alexandru Ionut Tripon
5702b8e3c2
Merge pull request #2692 from srcres258/pr 
Fix a typo in comment
 2024-08-05 10:55:24 +03:00
Trial97
ca5df3ea60
ensure minimal folder permissions when extracting files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-30 01:32:46 +03:00
src_resources
61e62dce1b
Fix a typo in comment 
Signed-off-by: src_resources <src.res.211@gmail.com>
 2024-07-29 21:07:28 +08:00
Trial97
d5c5f5d4fc
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-24 11:47:45 +03:00
Trial97
2c0b17d107
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-24 11:40:23 +03:00
Trial97
0ac62f9ddf
Recommend java major 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-23 01:41:41 +03:00
Trial97
4928706d8c
Merge branch 'clean_net' of github.com:Trial97/PrismLauncher into clean_net 2024-07-22 22:06:27 +03:00
Trial97
63a380a039
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into clean_net 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-22 22:06:09 +03:00
Alexandru Ionut Tripon
33bf370d17
Update launcher/net/RawHeaderProxy.h 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-07-22 21:51:20 +03:00
Trial97
5d3549a5e9
Add tooltips and fix archive download task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-22 09:18:20 +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
Edgars Cirulis
fc2d013402
ui: swap timeoutSecondsLabel and numberOfManualRetriesLabel order 
fixes: 7a200a337f
conflicted with 6078a771c1

Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
 2024-07-20 01:55:23 +03:00
Trial97
c666d060fc
fix merge issue 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-19 17:10:04 +03:00
Trial97
cae1fbc171
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix/component-version-resolusion 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-19 15:59:43 +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
Alexandru Ionut Tripon
69c55d90ce
Merge pull request #2558 from Trial97/update_filters 
Resolve issue with multiple loaders during mod update
 2024-07-19 15:46:15 +03:00
Alexandru Ionut Tripon
ddcaf25149
Merge pull request #2650 from Trial97/help-pages 
fix a few missing help pages
 2024-07-19 15:45:57 +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
Tayou
dcc58c8b75
Merge pull request #2655 from Ryex/fix/json-parsing-validator-buffer-reset 
fix(net/validators): ensure buffers are cleared and reset;
 2024-07-18 09:11:29 +02:00
Rachel Powers
cb65f6dfb5
fix(net/validators): ensure buffers are cleared and reset; 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-07-17 23:05:45 -07:00
UnownPlain
e6019ab396
Fix dead link to Modrinth authentication docs 
Signed-off-by: UnownPlain <38232575+UnownPlain@users.noreply.github.com>
 2024-07-17 23:04:52 -04:00
Trial97
6d425717e9
fix a few missing help pages 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-16 14:42:23 +03:00
izder456
0a543cb66b FIX launcher/java/JavaUtils.cpp to properly autodetect JVM paths on OpenBSD and FreeBSD 
Signed-off-by: izder456 <izder456@disroot.org>
 2024-07-11 20:32:04 -05:00
Trial97
b989c5a36c
refactor MinecraftUpdate Task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-10 16:24:31 +03:00
Trial97
061fdc1ada
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into clean_net 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-09 18:36:23 +03:00
Alexandru Ionut Tripon
5f345cedea
Merge pull request #2596 from TayouVR/more-system-themes 
Display all system themes in widget theme selector
 2024-07-09 12:55:22 +03:00
timoreo
39b4293a62
Merge pull request #1752 from Trial97/fix_duplicate_mod 2024-07-09 10:32:56 +02:00
timoreo
ebd7974fcc
Merge pull request #2416 from Trial97/retry_auth 2024-07-09 09:57:32 +02:00
Trial97
71c7dd1c5d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-08 21:51:34 +03:00
Alexandru Ionut Tripon
aeb7f29a5b
Update launcher/InstanceList.cpp 
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-07-08 15:04:27 +03:00
Trial97
fdcd1068f3
remove some poly mentions from the code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-08 14:53:39 +03:00
Trial97
c07260e836
remove duplicate code from net folder 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-07 02:49:27 +03:00
Trial97
a6ae078e7e
add docs to Library.cpp 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-06 09:30:26 +03:00
Trial97
c886111e18
format the code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-06 09:09:54 +03:00
Trial97
a09742a406
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-07-06 01:07:00 +03:00
Alexandru Ionut Tripon
5973c1c45e
Merge pull request #2607 from Kationor/noupdateprompt 
Add ModpackUpdatePromptDisabled setting
 2024-07-06 00:49:06 +03:00
Alexandru Ionut Tripon
9596e6fb01
Merge pull request #2609 from Trial97/crash_hash 
fix crash with hash task
 2024-07-06 00:48:19 +03:00
Trial97
5d8d1c4b90
transform hashFile to lambda 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-04 16:47:27 +03:00
Trial97
1dd21a5e4a
fix crash with hash task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-07-04 16:38:40 +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
timoreo
219de66783
Merge pull request #2567 from Ryex/feat/ungrouped-group-persist-state 2024-07-03 18:21:54 +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
Tayou
dbcfefca1b fix system theme 
Signed-off-by: Tayou <git@tayou.org>
 2024-07-01 23:05:54 +02:00
Tayou
d70be5121c tooltips 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 23:27:45 +02:00
Tayou
4f795eb6ef format 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 22:06:01 +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
Tayou
7104f8909d another oop 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 21:52:26 +02:00
Tayou
a184b26a00 #ifdef, not #if... I'm smort 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 21:47:52 +02: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
Tayou
f0c9b52055 oop 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 21:41:37 +02:00
Tayou
046e3588af more system themes initial changes 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-30 21:35:03 +02: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
Alexandru Ionut Tripon
7ff173d72a
Merge pull request #2173 from Trial97/dependency_removal 
Remove dependencies if review mods is rejected
 2024-06-30 22:21:38 +03:00
Alexandru Ionut Tripon
aa24d70a24
Merge pull request #2590 from Trial97/env_dir 
control Prism data directory via env variable
 2024-06-30 20:45:22 +03:00
Alexandru Ionut Tripon
80243ab554
Merge pull request #2588 from Ryex/fix/updater-support-linux-nonportable 
Fix linux non portable update
 2024-06-30 07:54:05 +03:00
Alexandru Ionut Tripon
5d9f4f9ee7
Merge pull request #2589 from Trial97/portabledatadir2 
make sure updater take into consideration UserData
 2024-06-30 07:53:54 +03:00
Rachel Powers
8488d11c69
review suggestions + spelling 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 20:34:10 -07:00
Trial97
492c78a570
format the code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-29 20:34:10 -07:00
Rachel Powers
c4cc1cfe4f
Warn about known conflicting modloaders 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 20:34:10 -07:00
Rachel Powers
4ed92a95c2
fix segfaults consistently set component problems 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 20:34:09 -07:00
Rachel Powers
a85d6cb1f2
move resolution into update actions in task. 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 20:34:09 -07:00
Trial97
474effe7c7
clang-format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-29 20:34:09 -07:00
Rachel Powers
cf319649f9
fix qt5 lwjgl recommend + spelling 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 20:34:09 -07:00
Rachel Powers
a94a081b9c
add better profile logging properly resolve important dependencies 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 20:34:08 -07:00
Rachel Powers
ce280c2d04
fix misepellings 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 20:34:08 -07:00
Rachel Powers
a791e22853
fix(instance components): resolve instance componants when changing minecraft version 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 20:34:08 -07:00
Rachel Powers
44bf0315ad
feat(components) recomend the correct lwjgl version for the minecraft version 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 20:33:51 -07:00
Trial97
25bae20db4
trim input from import page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-30 00:17:25 +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
Rachel Powers
ae3e4ed528
fix Build Artifact Checks 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 04:29:19 -07:00
Rachel Powers
b4f5c3d241
Update launcher/updater/prismupdater/PrismUpdater.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 04:21:13 -07:00
Rachel Powers
9d1fffff27
reject zsync file as valid build artifact 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 04:21:13 -07:00
Rachel Powers
41bcfb3c07
Fix #2586 
non portable linux update technically works even if not genraly a good idea.

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-29 04:21:06 -07:00
Alexandru Ionut Tripon
e6234b5086
Merge pull request #2504 from Trial97/auth3 
update login flow
 2024-06-29 14:09:49 +03:00
Trial97
eab53c6e42
make sure updater take into consideration UserData 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-29 14:02:09 +03:00
Trial97
f1a4a1e8ee
increase 'or' font size for login dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-29 08:41:35 +03:00
Alexandru Ionut Tripon
196b2b5a3e
Merge pull request #2580 from Trial97/silent_background_update_check 
do not display message that no update is avvailable if the check was …
 2024-06-28 23:27:00 +03:00
Trial97
ebad11d34f
made sure const method is respected 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 22:04:11 +03:00
Trial97
06add2b0a8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:55:16 +03:00
Trial97
9d903175ab
format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:51:52 +03:00
Trial97
cf220356b1
fixed panic with recursive eventloop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:51:28 +03:00
Trial97
715c99636d
fix offline mode for meta 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:51:28 +03:00
Trial97
0a95b57c0a
moved QEventLoops inside functions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:51:28 +03:00
Trial97
06e1cab41f
force online in case the offline load failed 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:51: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
4f8b20437f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3 2024-06-28 20:49:37 +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
4ad19cded5
format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:45:54 +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
Trial97
90e756c041
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into coremods 2024-06-28 20:41:48 +03:00
Trial97
ddf1ea014c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod 2024-06-28 20:39:37 +03:00
Alexandru Ionut Tripon
4aa2e5b85d
Merge pull request #2571 from Trial97/account_refresh 
refresh account if it should refresh on instance launch
 2024-06-28 20:38:05 +03:00
Trial97
55f740453c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 2024-06-28 20:34:59 +03:00
Trial97
72dd3dfba5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:30:05 +03:00
Trial97
1021222c95
create mod meta information when importing modrinth pack 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 20:28:52 +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
09d258670a
create mod meta information when importing curseforge pack 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 19:26:11 +03:00
Trial97
2c02d02214
do not display message that no update is avvailable if the check was done in the background 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-28 14:11:27 +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
9d7c36c2fc
made identty certain if the login ended 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-27 15:35:44 +03:00
Alexandru Ionut Tripon
5928bc30e1
Merge pull request #2572 from Trial97/sdkman_macos 
fix sdkman on macos
 2024-06-27 13:20:10 +03:00
Alexandru Ionut Tripon
68292aff6c
Merge pull request #2574 from ajerick/develop 
fix non-persistent user icon selection in NewInstanceDialog.cpp
 2024-06-27 08:38:46 +03:00
seth
3f3351f89e
Merge pull request #1892 from Trial97/change_version 
Added mod reinstall dialog
 2024-06-27 02:12:00 +00:00
Aiden J Erickson
37388e1d48
fix non-persistent user icon selection in NewInstanceDialog.cpp 
Signed-off-by: Aiden J Erickson <aiden.j.erickson@gmail.com>
 2024-06-26 20:54:04 -04:00
Trial97
3b473b24d8
fix sdkman on macos 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-26 10:16:27 +03:00
Trial97
b1a86bec34
refresh account if it should refresh on instance launch 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-26 09:51:12 +03:00
Alexandru Ionut Tripon
3aaa36a2bc
Merge pull request #2566 from Trial97/mod_warning 
add warnning when user closes the resource download dialog with selec…
 2024-06-26 08:17:16 +03:00
porter milton
2958691857
add ~/Library/Java/JavaVirtualMachines/* to java installation detection 
Signed-off-by: porter milton <57007161+porterporter@users.noreply.github.com>
 2024-06-25 23:16:26 +00:00
Trial97
7c38edc93d
Apply suggestion from code review 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-25 16:10:05 +03:00
Alexandru Ionut Tripon
555c4a7c59
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-06-25 15:33:11 +03:00
Alexandru Ionut Tripon
4e9e7212a6
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-06-25 15:22:30 +03:00
Alexandru Ionut Tripon
52839774e6
Apply suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-06-25 15:19:23 +03:00
Alexandru Ionut Tripon
1a66db78a9
Apply text change suggestions from code review 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-06-25 15:17:51 +03:00
Rachel Powers
14b09549e1
feat(instanceList) persist "ungrouped" hidden state 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-06-25 01:55:54 -07:00
Trial97
2f88da9de2
add warnning when user closes the resource download dialog with selection 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-25 09:50:33 +03:00
Alexandru Ionut Tripon
12db1efd20
Merge pull request #2561 from Trial97/fix_curseforge_logo 
fix missing curseforge logo
 2024-06-25 00:01:03 +03:00
Tayou
6b1c16b01a
Merge pull request #2562 from Trial97/fix_update_message 
fix update message
 2024-06-24 22:17:48 +02:00
Alexandru Ionut Tripon
1fcad8d427
Merge pull request #1886 from Trial97/time4 
Fixed playtime recording
 2024-06-24 23:07:41 +03:00
Trial97
096266c141
fix update message 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-24 21:31:26 +03:00
Trial97
73db320bff
fix missing curseforge logo 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-24 21:13:21 +03:00
Trial97
00b83efb9a
fix build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-24 20:12:40 +03:00
Trial97
e57c2180da
Resolve issue with multiple loaders during update 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-24 03:06:10 +03:00
Trial97
bb48d1ec9d
made sure that the retry dialog is not displayed offline 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-24 00:29:21 +03:00
Trial97
c04031ff00
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog 2024-06-23 23:40:12 +03:00
seth
92b9f1a3e3
Merge pull request #2515 from Trial97/size_for_skin 
force aspect ratio for skin preview
 2024-06-22 19:21:59 -04:00
seth
e0063b1ee7
Merge pull request #2429 from Richard-Rogalski/GENTOOweloveyou 
[Linux] Auto-detect Gentoo installed JDKs
 2024-06-22 19:14:46 -04:00
Alexandru Ionut Tripon
369d7d83f5
Merge pull request #2542 from leia-uwu/perf/async-print-servers 
perf: print api servers asynchronously on instance launch
 2024-06-23 01:51:53 +03:00
Trial97
2ac89c2378
add more states for account refresh fail 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-23 01:49:37 +03:00
Trial97
b0386a4c2f
added better error handling 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-23 00:47:48 +03:00
Trial97
24aa337a64
fixed offline accounts 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-23 00:27:49 +03:00
Trial97
27ee8374e7
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3 2024-06-22 22:54:38 +03:00
Tayou
178bd4a9c3 don't tr() file types on file save/open, etc. dialogs 
Signed-off-by: Tayou <git@tayou.org>
 2024-06-22 17:28:59 +02:00
leia uwu
c1d0560524
perf: print api servers asynchronously on instance launch 
Doing this on the main thread can cause the launcher to freeze for up to
5 seconds when launching an instance on my system
so i moved it to a launch step where it gets all the servers info
asynchronously to print

Signed-off-by: leia uwu <leia@tutamail.com>
 2024-06-20 17:58:00 -03:00
Alexandru Ionut Tripon
8014283bf4
Merge pull request #2536 from Trial97/refactor_hash 
Refactor hash task
 2024-06-18 22:55:32 +03:00
Trial97
888b22b4c7
rename variable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-18 22:36:39 +03:00
Alexandru Ionut Tripon
5f3d3c3294
Merge pull request #2534 from DioEgizio/dataresourceupdate 
fix: update datapack and resourcepack versions
 2024-06-18 21:06:31 +03:00
DioEgizio
a63842c727 fix: add more datapack formats and clang-format it 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-06-18 18:05:34 +02:00
Trial97
ac8c7baff2
fix tipo 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-18 17:49:07 +03:00
Trial97
9cbdbddb08
made hasing task async 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-18 17:27:17 +03:00
Trial97
766ddc80e3
refactored hassing task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-18 16:51:26 +03:00
Alexandru Ionut Tripon
3f68b68691
Merge pull request #2531 from Trial97/relax_fat 
relax fat FS filename restrictions
 2024-06-18 12:51:22 +03:00
DioEgizio
c07e791d7f chore: clang-format ResourcePack.cpp 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-06-18 10:17:48 +02:00
DioEgizio
6af52c97c2 fix: update datapack and resourcepack versions 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-06-18 09:47:07 +02:00
Cart
c9827f8085
Spelling mistake 
in m_column_names and translated it is Miecraft and not Minecraft

Signed-off-by: Cart <81428538+Cartrigger@users.noreply.github.com>
 2024-06-17 23:12:07 -04:00
Trial97
a587de8553
relax fat FS filename restrictions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-17 13:35:23 +03:00
Trial97
2fb3e12492
fix auto java install 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 17:54:13 +03:00
Trial97
8d3e6667cd
fix java download tasks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 15:09:49 +03:00
Trial97
94fd02a34f
fix java download button 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 14:26:19 +03:00
Trial97
bbf52e3549
renamed dialog and button action 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 01:59:50 +03:00
Trial97
d0584684f2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-06-16 01:17:01 +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
5fbbdb9707
fix merge issues 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 00:31:31 +03:00
Trial97
c01f3107a4
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into change_version 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-16 00:18:11 +03:00
Trial97
f1d1c9e22c
forget sort keys 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-15 11:06:20 +03:00
Trial97
a121bfbb15
add size back to texture view 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-15 10:43:21 +03:00
Trial97
98f8bc526d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-06-15 10:21:53 +03:00
Trial97
d5fb9f0935
force aspect ratio for skin preview 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-15 10:21:21 +03:00
Trial97
8cdaf5d05f
fix tests 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 23:27:27 +03:00
Trial97
cfdf4a9e1f
Merge branch 'develop' of github.com:Trial97/PrismLauncher into feature/java-downloader 2024-06-14 22:50:20 +03:00
Trial97
1a84dc9bca
no need for extra exist check 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 22:47:42 +03:00
Trial97
b872f88617
do not double rename 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 22:46:39 +03:00
Trial97
d2510b851b
mark files as duplicate 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 22:45:15 +03:00
Trial97
2d51008304
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod 2024-06-14 21:05:11 +03:00
Alexandru Ionut Tripon
3c4eed13a3
Merge pull request #1829 from Trial97/demo 
Fixed demo mode
 2024-06-14 18:41:02 +03:00
Trial97
9d16557328
simplify constructor 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 16:40:27 +03:00
Trial97
863ebe421c
randomize server port 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 16:38:41 +03:00
Trial97
52490743b4
revert desktop file creation 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 14:16:23 +03:00
Trial97
164d31dcb1
fix win build take#2 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 13:09:22 +03:00
Trial97
3db4f4dc2b
fix build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 13:00:59 +03:00
Trial97
8db0b5f421
Register mime-type on the fly 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 12:48:37 +03:00
Trial97
f60d0135f7
made login link to open browser 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 12:47:44 +03:00
Trial97
1bd4e60e99
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3 2024-06-14 11:23:52 +03:00
Trial97
c35461b314
remove aspect ratio 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 11:23:14 +03:00
Trial97
014721ca10
remove unused import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 11:19:54 +03:00
Trial97
712fbc3a4b
reverse login layout 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-14 11:15:40 +03:00
Trial97
6e8dc6ccc0
add mouse interaction on microsoft link 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-13 19:20:32 +03:00
Alexandru Ionut Tripon
3fc5f56ed6
Merge pull request #2405 from Trial97/fix_missing_manifest 
Fix portable if manifest is missing
 2024-06-13 19:16:12 +03:00
Alexandru Ionut Tripon
ce5b2c54c5
Merge pull request #2439 from Trial97/fix_vanila_technic 
fix vanilla technic modpacks
 2024-06-13 19:15:43 +03:00
Trial97
7fdc65eda8
add tooltip to url button 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-13 08:51:11 +03:00
Trial97
2b229d7326
increase qr code size 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-13 00:20:16 +03:00
Trial97
80ea67f7cf
finish login dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-13 00:00:08 +03:00
Alexandru Ionut Tripon
a74bebb358
Merge pull request #2499 from Trial97/imgur3 
update imgur upload
 2024-06-12 23:45:17 +03:00
Trial97
125fb2eaf2
remove png qr code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-12 19:34:58 +03:00
Trial97
5f5296ef5e
update ui once again 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-12 19:34:19 +03:00
Trial97
bbbe7c879e
update callback 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-12 12:35:02 +03:00
Trial97
df142550fe
update Add account question 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-12 11:55:56 +03:00
Trial97
c4a65dd861
update login flow 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-06-12 00:34:39 +03:00