Edgars Cirulis
e5b1fa1e3a
readme: build instructions
...
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
2024-07-09 22:15:52 +03:00
Alexandru Ionut Tripon
ca2dda5547
Merge pull request #2626 from Trial97/remove_poly
...
remove some poly mentions from the code
2024-07-08 21:46:39 +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
Alexandru Ionut Tripon
08cab11cfe
Merge pull request #2554 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-07-07 08:01:42 +03:00
github-actions[bot]
e49e2622fc
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8?narHash=sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw%3D' (2024-06-01)
→ 'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7?narHash=sha256-pQMhCCHyQGRzdfAkdJ4cIWiw%2BJNuWsTX7f0ZYSyz0VY%3D' (2024-07-03)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/3f84a279f1a6290ce154c5531378acc827836fbb?narHash=sha256-u1fA0DYQYdeG%2B5kDm1bOoGcHtX0rtC7qs2YA2N1X%2B%2BI%3D' (2024-06-13)
→ 'github:NixOS/nixpkgs/9f4128e00b0ae8ec65918efeba59db998750ead6?narHash=sha256-rwz8NJZV%2B387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ%3D' (2024-07-03)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/cc4d466cb1254af050ff7bdf47f6d404a7c646d1?narHash=sha256-7XfBuLULizXjXfBYy/VV%2BSpYMHreNRHk9nKMsm1bgb4%3D' (2024-06-06)
→ 'github:cachix/pre-commit-hooks.nix/0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07?narHash=sha256-F1h%2BXIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4%3D' (2024-06-24)
2024-07-07 00:21:50 +00:00
Tayou
330c95e55b
Merge pull request #2612 from Trial97/lib_doc
...
add docs to Library.cpp
2024-07-06 14:21:28 +02:00
Trial97
a6ae078e7e
add docs to Library.cpp
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-07-06 09:30:26 +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
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
Alexandru Ionut Tripon
de9df31efa
Merge pull request #2592 from Trial97/import_whitespace
...
trim input from import page
2024-06-30 07:53:39 +03: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
4f8b20437f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3
2024-06-28 20:49: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
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
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
bac678a7fc
format files outside launcher
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-28 12:54:37 +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
Alexandru Ionut Tripon
8e2bb21e23
Merge pull request #2570 from porterporter/patch-1
...
add ~/Library/Java/JavaVirtualMachines/* to java installation detection
2024-06-26 08:16:37 +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
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
