Commit Graph

8441 Commits

Author SHA1 Message Date
Alexandru Ionut Tripon 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
Alexandru Ionut Tripon b17a688237 Merge pull request #2771 from Kurumi78/develop
Add webp to validIconExtensions
2024-09-10 12:27:02 +03:00
TheKodeToad e3f78e0205 Merge pull request #2798 from QazCetelic/chronological-screenshot-list
Sort screenshots chronologically in descending order
2024-09-10 09:38:11 +01:00
QazCetelic 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
QazCetelic 7fbf0d3bf3 Sort files chronologically in descending order
Signed-off-by: Qaz <dev@malplena.net>
2024-09-09 15:40:31 +02:00
Trial97 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
TheKodeToad 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
Trial97 14fb54afd9 Fix launch when no java is loaded
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-08 09:10:29 +03:00
Alexandru Ionut Tripon 42eedd1afa Merge pull request #2784 from Trial97/ensure_desktop
ensure that the shortcut destination exists
2024-09-08 08:52:53 +03:00
Rachel Powers 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
Trial97 166207753c ensure that the shortcut destination exists
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-05 09:36:45 +03:00
Kurumi78 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
timoreo 828acef7e9 Merge pull request #2760 from Trial97/mangohid
fix mangohud detection for absolute path
2024-08-29 06:24:09 +02:00
Alexandru Ionut Tripon 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
Alexandru Ionut Tripon 74acb483af Merge pull request #2757 from Trial97/hash_maybe
Add checksum validator to resource download
2024-08-26 23:54:29 +03:00
Alexandru Ionut Tripon cf12365358 Merge pull request #2755 from Trial97/fix_java_typo
fix java 64 bit condition
2024-08-26 23:49:35 +03:00
Edgars Cirulis 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
Trial97 034e2a44ad update thresholds each time java result changes
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-26 17:43:49 +03:00
Trial97 c64b7cd693 fix mangohud detection for absolute path
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-26 09:00:46 +03:00
Trial97 430013737a add checksum validator
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-26 00:27:23 +03:00
Trial97 d55ebefac3 fix java 64 bit condition
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-25 21:42:40 +03:00
TheKodeToad 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
timoreo 70a0a71f10 Merge pull request #2753 from TheKodeToad/modrinth-hashes-parse-fix 2024-08-25 13:34:54 +02:00
TheKodeToad ff9fa6aa4f Stop accepting malformed hashes object
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-08-25 11:45:45 +01:00
seth faf9086705 Merge pull request #2750 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2024-08-25 05:12:32 -04:00
Alexandru Ionut Tripon 44f589817f Merge pull request #2749 from TheKodeToad/theme-bugfixes
Fix system theme detection
2024-08-25 08:58:42 +03:00
Alexandru Ionut Tripon 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
ZekeZ 1bb7f35ddb Merge pull request #2751 from Ryex/security/modrith-hash-priority
Prefer stronger hashes from Modrinth
2024-08-25 13:53:04 +10:00
Rachel Powers 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
github-actions[bot] 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
TheKodeToad cbdacf81ee Fix system theme detection
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-08-24 22:50:51 +01:00
TheKodeToad 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
Sefa Eyeoglu fac28a81ae Merge pull request #2738 from getchoo/nix-omnibus 2024-08-23 10:08:59 +02:00
Trial97 575cdb043b Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix/component-version-resolusion
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-23 08:29:43 +03:00
Alexandru Ionut Tripon eae5d70385 Merge pull request #2069 from Trial97/feature/java-downloader
Feature/java downloader
2024-08-23 08:17:15 +03:00
Trial97 92495494ca Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-23 08:16:59 +03:00
Alexandru Ionut Tripon e4be8f97cd Merge pull request #2740 from TheKodeToad/themeable-logs
Allow themes to modify log colours
2024-08-23 08:12:34 +03:00
seth fd14d3e9b0 Merge pull request #2745 from TheKodeToad/fix-java-message
Fix invalid Java path message
2024-08-22 21:33:24 -04:00
seth 11927e9bf2 Merge pull request #2739 from PrismLauncher/renovate/korthout-backport-action-3.x
chore(deps): update korthout/backport-action action to v3.1.0
2024-08-22 21:32:03 -04:00
TheKodeToad 89ed85182c Fix invalid Java path message
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-08-22 19:07:15 +01:00
Trial97 5f64d7dc47 update adoptium icon
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-22 20:38:08 +03:00
Trial97 0b05c7cb07 fix bug with buton not updating corectly for java dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-22 18:59:09 +03:00
Trial97 7d9e47ac18 Change major java column name
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-22 18:58:38 +03:00
Trial97 aa3a4585ee Add icons
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-22 18:58:04 +03:00
TheKodeToad 2ad34c724e Make log colours themeable
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-08-21 22:19:50 +01:00
renovate[bot] 7472233033 chore(deps): update korthout/backport-action action to v3.1.0 2024-08-21 17:22:09 +00:00
Trial97 26ae608685 fix initial java dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-21 15:01:42 +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
seth 99ecab01fc ci(garnix): explicitly declare systems
as we now create outputs for each system in `lib.systems.flakeExposed`,
we should ensure garnix only builds the systems we officially support

dev shells are also no longer built as they really don't need to be
"built" on the developer's machine in any case; everything should be
cached

Signed-off-by: seth <getchoo@tuta.io>
2024-08-21 04:02:48 -04:00
seth a49a58bc45 Revert "refactor(nix): nix-filter -> lib.fileset"
This reverts commit 8312713dc2.

See nix#9428. Path coercion like `"${./.}"` in flakes causes the path to
be copied to the store twice; using the `self` argument works around
this. However, as `lib.fileset` doesn't support using `self`, so we need
to go back to `nix-filter`

Signed-off-by: seth <getchoo@tuta.io>
2024-08-21 04:01:32 -04:00