CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,187 Commits 10 Branches 30 Tags 34 MiB
7b62d14683
Commit Graph

7187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
seth
4cb424470b
Merge pull request #1619 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2023-09-10 15:57:03 -04:00
Trial97
9445a555e4
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into packwiz 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-10 16:24:59 +03:00
Trial97
47d1f23568
added side for modrinth mods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-10 16:22:57 +03:00
github-actions[bot]
82a0a5bca1 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/bfb7dfec93f3b5d7274db109f2990bc889861caf' (2023-09-02)
  → 'github:nixos/nixpkgs/b200e0df08f80c32974a6108ce431d8a8a5e6547' (2023-09-07)
 2023-09-10 00:17:57 +00:00
seth
10192c540b
feat(nix): add source filtering 
this - along with garnix - should mostly eliminate unneeded (re)builds

Signed-off-by: seth <getchoo@tuta.io>
 2023-09-09 15:25:41 -04:00
seth
6aa821df9c
refactor(nix): match inputs value in flake 
Signed-off-by: seth <getchoo@tuta.io>
 2023-09-09 15:25:39 -04:00
seth
89e434bd5b
refactor(nix): don't concat final attr in fixed point 
Signed-off-by: seth <getchoo@tuta.io>
 2023-09-09 15:25:33 -04:00
Sefa Eyeoglu
78f8a31cd6
Merge pull request #1613 from PrismLauncher/renovate/actions-cache-3.x 2023-09-08 23:28:03 +02:00
renovate[bot]
e7d6be531f
chore(deps): update actions/cache action to v3.3.2 2023-09-08 17:22:12 +00:00
Sefa Eyeoglu
ba3a1b6280
Merge pull request #1606 from PrismLauncher/renovate/actions-checkout-4.x 2023-09-04 17:11:45 +02:00
Sefa Eyeoglu
d483b613b1
Merge pull request #1578 from TheKodeToad/antialiasing 2023-09-04 17:05:29 +02:00
Sefa Eyeoglu
cf599865f6
Merge pull request #1581 from getchoo/old-gcc 2023-09-04 17:04:10 +02:00
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
19b5a5e00b
Remove final conflict - kept by mistake 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-02 22:38:14 +01:00
TheKodeToad
347228a246
Legacy settings override default -> false 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-02 22:29:26 +01:00
TheKodeToad
1213a5ab46
Merge remote-tracking branch 'upstream/develop' into skinfix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-02 22:27:57 +01:00
Trial97
17f696bffc
small tweaks to atl icons 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-01 22:25:15 +03:00
Trial97
e095780cc3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into modrinth_pack 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-01 21:36:28 +03: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
30ff417074
fix: make cached instead of file for ftb pack import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-01 16:25:49 +03: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
befa3baa6a
Merge branch 'develop' into feat/launcher-updater 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-30 11:47:33 +01: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
TheKodeToad
8c30cb3706
Fix CI 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-29 13:27:06 +01:00
TheKodeToad
c1855c6ce3
Merge branch 'develop' into rename-groups 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-29 12:41:40 +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
Trial97
5d70f4dbca
removed if 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-28 08:50:10 +03:00
renovate[bot]
66cbbfec0c
chore(deps): lock file maintenance 2023-08-28 00:23:14 +00:00