Commit Graph

8458 Commits

Author SHA1 Message Date
db3c7d01fd Apply suggestions from code review
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2024-09-16 16:36:05 +03:00
ca6b62c773 move some URLs in cmake
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-16 15:51:51 +03:00
bee59c904a Merge pull request #2773 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2024-09-15 08:49:07 +03:00
8932a42644 chore(nix): update lockfile
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/c374d94f1536013ca8e92341b540eba4c22f9c62?narHash=sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh%2BaRKoCdaAv5fiO0%3D' (2024-08-21)
  → 'github:NixOS/nixpkgs/4f807e8940284ad7925ebd0a0993d2a1791acb2f?narHash=sha256-IiA3jfbR7K/B5%2B9byVi9BZGWTD4VSbWe8VLpp9B/iYk%3D' (2024-09-11)
2024-09-15 00:24:43 +00:00
6492ad7076 Merge pull request #2813 from Trial97/fix_java_autodetect
fix java autodetect when instance settings are open
2024-09-14 20:19:15 +03:00
ad786fb983 Merge pull request #2811 from Trial97/fix_java_abort
fix download java abort being stuck
2024-09-14 20:19:02 +03:00
281621cfc0 Merge pull request #2808 from Trial97/fix_java_download_crash
fix java crash on refresh
2024-09-14 20:18:51 +03:00
5073fc19d4 fix java autodetect when instance settings are open
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-14 00:36:31 +03:00
22ebf7e961 fix download java abort being stuck
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-14 00:13:16 +03:00
6706317f20 fix java crash on refresh
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-13 23:26:04 +03:00
f46b73acb5 Merge pull request #2789 from Trial97/fix_concurrent_task
Remove all the slowdown code from CocurrentTask
2024-09-13 21:10:30 +02:00
40b10ecf30 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_concurrent_task 2024-09-13 21:38:29 +03:00
ef76894587 Merge pull request #2799 from PrismLauncher/renovate/determinatesystems-update-flake-lock-24.x
chore(deps): update determinatesystems/update-flake-lock action to v24
2024-09-13 14:03:42 -04:00
f1ef243617 Merge pull request #2803 from Trial97/java_setup
Improve wizzard page
2024-09-13 21:01:02 +03:00
c85294af9d Improve wizzard page
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-13 19:33:24 +03:00
fa68428a90 Merge pull request #2795 from Trial97/fix_mc_launch
Fix launch when no java is loaded
2024-09-10 18:57:09 +03:00
b17a688237 Merge pull request #2771 from Kurumi78/develop
Add webp to validIconExtensions
2024-09-10 12:27:02 +03:00
e3f78e0205 Merge pull request #2798 from QazCetelic/chronological-screenshot-list
Sort screenshots chronologically in descending order
2024-09-10 09:38:11 +01:00
7e49fa0426 chore(deps): update determinatesystems/update-flake-lock action to v24 2024-09-09 19:05:56 +00:00
e2ef280da9 DCO Remediation Commit for QazCetelic <qaz.cetelic@protonmail.com>
I, QazCetelic <qaz.cetelic@protonmail.com>, hereby add my Signed-off-by to this commit: 7fbf0d3bf3

Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com>
2024-09-09 16:24:40 +02:00
7fbf0d3bf3 Sort files chronologically in descending order
Signed-off-by: Qaz <dev@malplena.net>
2024-09-09 15:40:31 +02:00
2622d3daa9 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_mc_launch
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-09 08:11:11 +03:00
01015a7345 Merge pull request #2547 from Ryex/fix/component-version-resolusion
Component version resolusion on Minecraft version change
2024-09-08 23:44:07 +01:00
14fb54afd9 Fix launch when no java is loaded
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-08 09:10:29 +03:00
42eedd1afa Merge pull request #2784 from Trial97/ensure_desktop
ensure that the shortcut destination exists
2024-09-08 08:52:53 +03:00
c2a2e95183 fix: Forge and neoforge conflict with quilt, not fabric twice
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2024-09-07 21:35:01 -07:00
c5592a446a Remove all the slowdown code from CocurrentTask
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-06 21:47:35 +03:00
166207753c ensure that the shortcut destination exists
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-05 09:36:45 +03:00
4ea7132bdf Add webp validIconExtensions
Add webp to list of valid file extensions for Icons

Signed-off-by: Kurumi78 <30587387+Kurumi78@users.noreply.github.com>
2024-08-30 02:08:07 -05:00
828acef7e9 Merge pull request #2760 from Trial97/mangohid
fix mangohud detection for absolute path
2024-08-29 06:24:09 +02:00
685519d12f Merge pull request #2758 from Edgars-Cirulis/improvements/instanceview-navigation
Improve left and right cursor navigation in Instances
2024-08-26 23:55:03 +03:00
74acb483af Merge pull request #2757 from Trial97/hash_maybe
Add checksum validator to resource download
2024-08-26 23:54:29 +03:00
cf12365358 Merge pull request #2755 from Trial97/fix_java_typo
fix java 64 bit condition
2024-08-26 23:49:35 +03:00
630df29010 feat: Improve left and right cursor navigation in Instances
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
2024-08-26 22:45:01 +03:00
034e2a44ad update thresholds each time java result changes
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-26 17:43:49 +03:00
c64b7cd693 fix mangohud detection for absolute path
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-26 09:00:46 +03:00
430013737a add checksum validator
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-26 00:27:23 +03:00
d55ebefac3 fix java 64 bit condition
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-25 21:42:40 +03:00
23c69e7f94 Merge pull request #2018 from Trial97/coremods
Ensure that core mods tab is visible on correct versions
2024-08-25 13:01:27 +01:00
70a0a71f10 Merge pull request #2753 from TheKodeToad/modrinth-hashes-parse-fix 2024-08-25 13:34:54 +02:00
ff9fa6aa4f Stop accepting malformed hashes object
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-08-25 11:45:45 +01:00
faf9086705 Merge pull request #2750 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2024-08-25 05:12:32 -04:00
44f589817f Merge pull request #2749 from TheKodeToad/theme-bugfixes
Fix system theme detection
2024-08-25 08:58:42 +03:00
aa206f4c89 Merge pull request #2748 from TheKodeToad/gentoo-java-perf
Improve Java checking speed by using startsWith for gentoo paths
2024-08-25 08:58:22 +03:00
1bb7f35ddb Merge pull request #2751 from Ryex/security/modrith-hash-priority
Prefer stronger hashes from Modrinth
2024-08-25 13:53:04 +10:00
5f874330d5 security(modrinth) reorder hash algo priority, prefer stronger hashes.
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2024-08-24 20:24:35 -07:00
96414d7153 chore(nix): update lockfile
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/c3aa7b8938b17aebd2deecf7be0636000d62a2b9?narHash=sha256-med8%2B5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c%3D' (2024-08-14)
  → 'github:NixOS/nixpkgs/c374d94f1536013ca8e92341b540eba4c22f9c62?narHash=sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh%2BaRKoCdaAv5fiO0%3D' (2024-08-21)
2024-08-25 00:22:51 +00:00
cbdacf81ee Fix system theme detection
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-08-24 22:50:51 +01:00
d2304b6698 Improve Java checking speed by using startsWith for gentoo paths
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-08-24 22:13:18 +01:00
fac28a81ae Merge pull request #2738 from getchoo/nix-omnibus 2024-08-23 10:08:59 +02:00