CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,990 Commits 10 Branches 30 Tags 34 MiB
03ad430699
Commit Graph

6990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sefa Eyeoglu
546d49e183
Merge pull request #1530 from Trial97/metadata_delete 2023-09-04 17:02:52 +02:00
renovate[bot]
7dd2530027
chore(deps): update actions/checkout action to v4 2023-09-04 15:02:01 +00:00
Sefa Eyeoglu
e9ecdd05b9
Merge pull request #1574 from Scrumplex/refactor-flake 2023-09-04 17:02:01 +02:00
Sefa Eyeoglu
ad6f15f293
Merge pull request #1604 from PrismLauncher/renovate/cachix-install-nix-action-23.x 2023-09-04 17:01:43 +02:00
TheKodeToad
94c1cd6bcf
CurseForge shader downloading 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-04 14:15:37 +01:00
renovate[bot]
e155844671
chore(deps): update cachix/install-nix-action action to v23 2023-09-04 10:22:11 +00:00
Sefa Eyeoglu
2918d61b16
refactor(nix): use pre-commit flake module 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-09-04 08:53:10 +02:00
seth
bbf4e3b04d
refactor(nix): use fixed points over rec 
Signed-off-by: seth <getchoo@tuta.io>
 2023-09-03 19:07:39 -04:00
Sefa Eyeoglu
caf925cbad
Merge pull request #1601 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2023-09-03 09:42:31 +02:00
github-actions[bot]
88f3e19f81 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/59cf3f1447cfc75087e7273b04b31e689a8599fb' (2023-08-01)
  → 'github:hercules-ci/flake-parts/7f53fdb7bdc5bb237da7fefef12d099e4fd611ca' (2023-09-01)
• Updated input 'flake-parts/nixpkgs-lib':
    'github:NixOS/nixpkgs/9e1960bc196baf6881340d53dccb203a951745a2?dir=lib' (2023-08-01)
  → 'github:NixOS/nixpkgs/3e52e76b70d5508f3cec70b882a29199f4d1ee85?dir=lib' (2023-08-31)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/cddebdb60de376c1bdb7a4e6ee3d98355453fe56' (2023-08-27)
  → 'github:nixos/nixpkgs/bfb7dfec93f3b5d7274db109f2990bc889861caf' (2023-09-02)
 2023-09-03 00:17:45 +00:00
TheKodeToad
c01e95b79c
Merge pull request #1592 from kumquat-ir/desktop-open-fix 
Fix opening files from curseforge:// and file:// links etc on linux
 2023-09-01 16:13:48 +01:00
kumquat-ir
984e870bca actually it can handle multiple files just fine 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-09-01 10:32:35 -04:00
kumquat-ir
eb66e37b83 fix opening files from curseforge: links on linux 
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
 2023-09-01 10:29:56 -04:00
Trial97
7e65aea2ef
format json 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-31 19:04:41 +03:00
Trial97
6cfe2dbc50
moved catpack data to testdata 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-31 17:34:05 +03:00
TheKodeToad
25ce11d85d
Merge pull request #1539 from Trial97/refactor_modpack_ux 
Improvements to modpack UX
 2023-08-31 14:58:54 +01:00
Sefa Eyeoglu
707da5a25a
fix(nix): include udev dependency 
See https://github.com/NixOS/nixpkgs/pull/252425

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-30 21:59:42 +02:00
seth
584e800279
fix: remove -Wextra-semi 
this flag is unavailable on gcc versions < 8. we could detect the
version of the compiler here, but i don't think we lose much in this
flags removal and this is a simpler option

Signed-off-by: seth <getchoo@tuta.io>
 2023-08-30 11:14:49 -04:00
TheKodeToad
f23a8e4b4b
Enable antialiasing for mod and pack icons 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-29 23:34:19 +01:00
Sefa Eyeoglu
b83fdbd1b7
Merge pull request #1575 from TheKodeToad/more-pack-export-fixes 2023-08-28 22:18:58 +02:00
TheKodeToad
0e67686295
Hide index folder in pack export dialog 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-28 17:25:07 +01:00
TheKodeToad
e98bca4749
Fix cancelling pack save 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-28 17:09:40 +01:00
Sefa Eyeoglu
bdc2fca711
refactor(nix): don't instantiate nixpkgs 
See https://zimbatm.com/notes/1000-instances-of-nixpkgs

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-28 15:18:10 +02:00
Trial97
311e36b5d6
added new line 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-28 11:52:26 +03:00
Sefa Eyeoglu
fbf6833124
Merge pull request #1519 from TheKodeToad/better-export-pack 2023-08-28 10:29:32 +02:00
Sefa Eyeoglu
e4e4c4a430
Merge pull request #1573 from PrismLauncher/renovate/lock-file-maintenance 2023-08-28 10:14:45 +02:00
Sefa Eyeoglu
97d932db62
Revert "chore(deps): enable nix lockfile maintenance for renovate" 
This reverts commit 5d14724e66.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-28 10:14:21 +02:00
renovate[bot]
66cbbfec0c
chore(deps): lock file maintenance 2023-08-28 00:23:14 +00:00
Trial97
07d8598638
added catpacks tests 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 23:40:32 +03:00
Trial97
0680d2dceb
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 20:41:56 +03:00
TheKodeToad
9110fbf282
Merge pull request #1560 from Trial97/curse_multiple_loaders2 
Add suport for flame multiple loaders
 2023-08-27 18:21:14 +01:00
TheKodeToad
e3b04d10cf
Merge pull request #1536 from Trial97/time3 
Allow showing playtime in hours
 2023-08-27 18:14:04 +01:00
Trial97
8c607ae734
removed extra if 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 20:02:12 +03:00
Trial97
c5aac24a93
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse_multiple_loaders2 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 15:53:35 +03:00
Trial97
4036cecfc0
Added progress widget to some modpack providers 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-27 15:04:42 +03:00
Sefa Eyeoglu
df14f88307
Merge pull request #1532 from Trial97/curseforge-url-handle 2023-08-27 12:26:57 +02:00
seth
29736b3b1f
Merge pull request #1570 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2023-08-27 01:47:58 -04:00
github-actions[bot]
9735e46a7e chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/ca3c9ac9f4cdd4bea19f592b32bb59b74ab7d783' (2023-08-19)
  → 'github:nixos/nixpkgs/c66ccfa00c643751da2fd9290e096ceaa30493fc' (2023-08-26)
 2023-08-27 00:17:22 +00:00
Trial97
288d0d1fd4
Added back api loader filtering if just one is selected 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-26 22:26:01 +03:00
Trial97
abfd1a4205
minor dependency crash fix 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-25 18:35:25 +03:00
Sefa Eyeoglu
094cee8ec6
Merge pull request #1561 from Scrumplex/nix-miscs 2023-08-25 10:08:53 +02:00
Trial97
c54fecf5d9
added condition for empty loader type 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-25 09:05:04 +03:00
Trial97
172680abf8
removed aditional header 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-24 13:42:36 +03:00
Trial97
5f3e9672cd
made the loaders check more generic 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-24 13:31:57 +03:00
Sefa Eyeoglu
3e448904a3
Merge pull request #1562 from PrismLauncher/renovate/determinatesystems-update-flake-lock-20.x 
chore(deps): update determinatesystems/update-flake-lock action to v20
 2023-08-24 08:11:30 +02:00
renovate[bot]
783af2c06a
chore(deps): update determinatesystems/update-flake-lock action to v20 2023-08-24 04:32:25 +00:00
Trial97
6c0492c0d1
return 0 for any 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 21:09:32 +03:00
Trial97
1515607060
updated getMappedModLoader 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 20:16:51 +03:00
Sefa Eyeoglu
41bd008f5d
chore(nix): remove pre-commit tools from shell 
use `pre-commit` CLI instead!

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-23 13:49:10 +02:00
Sefa Eyeoglu
d7b6450613
fix(nix): reload direnv if parts change 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-23 13:47:04 +02:00