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

8568 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
2a86ceb5d6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2 2024-08-23 08:34:15 +03: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
seth
13eedbb7de
doc(nix): prefer packages output 
overlays can cause issues we don't run into upstream, especially when
used on stable channels for example. preferring the pure `packages`
output also encourages the use of our binary cache by users, who
probably don't like building the launcher all too much

Signed-off-by: seth <getchoo@tuta.io>
 2024-08-21 04:01:32 -04:00
seth
e29ea4efb0
build(nix): add formatting checks 
Signed-off-by: seth <getchoo@tuta.io>
 2024-08-21 04:01:32 -04:00
seth
0ae421c265
chore(nix): drop flake-parts 
The primary goals here include making the flake easier to contribute to
by having it follow the standard boilerplate, while also limiting the
size of our flake.lock to lower the chance of duplicate inputs for users

Signed-off-by: seth <getchoo@tuta.io>
 2024-08-21 04:01:30 -04:00
seth
e85b364748
refactor(nix): use final in overlay 
this allows to implictly pass `prismlauncher-unwrapped`
it won't have an effect on our package set as directly inheriting from
the scope we create filters out the extra attributes usually introduced
with a scope

Signed-off-by: seth <getchoo@tuta.io>
 2024-08-21 03:49:37 -04:00
seth
271c38bc56
doc(nix): update package names and params 
Signed-off-by: seth <getchoo@tuta.io>
 2024-08-21 03:49:36 -04:00
seth
7a83d0cea0
ci(nix): drop pre-commit-hooks 
Signed-off-by: seth <getchoo@tuta.io>
 2024-08-21 03:49:36 -04:00
seth
4c81d8c53d
style(nix): format with nixfmt 
Signed-off-by: seth <getchoo@tuta.io>
 2024-08-21 03:49:36 -04:00
seth
7dff77ca35
style(nix): alejandra -> nixfmt-rfc-style 
Signed-off-by: seth <getchoo@tuta.io>
 2024-08-21 03:49:36 -04:00
seth
1edfbeec8d
Merge pull request #2732 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-08-20 22:36:33 -04:00
timoreo
7f594a342e
Merge pull request #2735 from Trial97/force_load_java 2024-08-20 08:04:21 +02:00
Trial97
002fc71b8d
allways load java list on autodetect 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-20 01:18:37 +03:00
Trial97
ca298d1ed5
add automatic java switch on minecraft version switch 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-20 01:08:03 +03:00
Trial97
7a66276838
fix conflicts 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-20 01:07:23 +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
23c06f23c3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix/component-version-resolusion 2024-08-19 22:35:11 +03:00
Alexandru Ionut Tripon
1b756b99bb
Merge pull request #2528 from Trial97/validate_metadata 
validate metadata on instance launch
 2024-08-19 22:34:13 +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
6bd8b72f68
fix meta not validating for specific versions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-18 22:38:45 +03:00
Alexandru Ionut Tripon
efac063797
Merge pull request #2729 from Trial97/currentTextChanged 
replaced currentTextChanged with currentIndexChanged
 2024-08-18 19:00:29 +03:00
TheKodeToad
e9791d6bc1
Merge pull request #2633 from Trial97/refactor_minecraft_update 
refactor MinecraftUpdate Task
 2024-08-18 11:44:44 +01:00
github-actions[bot]
91d6465d45 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/5e0ca22929f3342b19569b21b2f3462f053e497b?narHash=sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI%3D' (2024-08-09)
  → 'github:NixOS/nixpkgs/c3aa7b8938b17aebd2deecf7be0636000d62a2b9?narHash=sha256-med8%2B5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c%3D' (2024-08-14)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/c7012d0c18567c889b948781bc74a501e92275d1?narHash=sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q%3D' (2024-08-09)
  → 'github:cachix/pre-commit-hooks.nix/bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba?narHash=sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc%3D' (2024-08-16)
 2024-08-18 00:22:22 +00: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
b0cd412926 use index instead of currentIndex function 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-16 15:41:31 +03:00
Trial97
e6bc61d6d0 add overload for qt5 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-16 14:44:57 +03:00
Trial97
6de026bfcf replaced currentTextChanged with currentIndexChanged 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-08-16 14:34:28 +03:00
Sefa Eyeoglu
d6a825dd47
Merge pull request #2707 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x 2024-08-12 10:40:26 +02:00
Sefa Eyeoglu
3d4be7ac8c
Merge pull request #2669 from PrismLauncher/update_flake_lock_action 2024-08-12 10:40:00 +02:00
Sefa Eyeoglu
af83fc84a7
Merge pull request #2585 from PrismLauncher/renovate/determinatesystems-update-flake-lock-23.x 2024-08-12 10:39:19 +02:00
Alexandru Ionut Tripon
6b07e8e72d
Merge pull request #2718 from cthbleachbit/develop 
mangohud support: MangoHud::getLibraryString should return absolute path
 2024-08-12 11:26:30 +03:00