Commit Graph

8384 Commits

Author SHA1 Message Date
Sefa Eyeoglu
f931890e95
Merge pull request #2029 from PrismLauncher/renovate/cachix-install-nix-action-25.x 2024-01-12 19:14:02 +01:00
renovate[bot]
9c610b616a
chore(deps): update cachix/install-nix-action action to v25 2024-01-12 18:02:43 +00:00
Sefa Eyeoglu
c38f584fe9
Merge pull request #2026 from PrismLauncher/renovate/actions-cache-3.x
chore(deps): update actions/cache action to v3.3.3
2024-01-11 23:22:42 +01:00
renovate[bot]
b0f65476d9
chore(deps): update actions/cache action to v3.3.3 2024-01-11 18:59:17 +00:00
Sefa Eyeoglu
7549bf7da6
Merge pull request #2024 from getchoo/flake-fixups 2024-01-11 09:43:58 +01:00
seth
839adfc90b
nix: add garnix cache to nixConfig
Signed-off-by: seth <getchoo@tuta.io>
2024-01-11 03:20:20 -05:00
seth
26474d1374
nix: deduplicate nixpkgs input
Signed-off-by: seth <getchoo@tuta.io>
2024-01-11 03:06:37 -05:00
Alexandru Ionut Tripon
dbdec15ddb
Merge pull request #1771 from Trial97/account
Try refreshing account on launch if needed
2024-01-10 16:07:09 +02:00
Trial97
a7d293b3f2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into deps_improve
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-01-10 09:17:52 +02:00
Trial97
a0ebd0714d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refresh_cats 2024-01-10 09:09:19 +02:00
Trial97
57913f1943
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into demo 2024-01-07 22:31:25 +02:00
Sefa Eyeoglu
43dd929214
Merge pull request #2016 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2024-01-07 09:43:56 +01:00
github-actions[bot]
2cb07d3e38 chore(nix): update lockfile
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5' (2023-12-01)
  → 'github:hercules-ci/flake-parts/88a2cd8166694ba0b6cb374700799cec53aef527' (2024-01-01)
• Updated input 'flake-parts/nixpkgs-lib':
    'github:NixOS/nixpkgs/e92039b55bcd58469325ded85d4f58dd5a4eaf58?dir=lib' (2023-11-29)
  → 'github:NixOS/nixpkgs/b0d36bd0a420ecee3bc916c91886caca87c894e9?dir=lib' (2023-12-30)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/e1fa12d4f6c6fe19ccb59cac54b5b3f25e160870' (2023-12-25)
  → 'github:nixos/nixpkgs/63143ac2c9186be6d9da6035fa22620018c85932' (2024-01-02)
2024-01-07 00:20:13 +00:00
Tayou
35ad4448d9
Merge pull request #2012 from Trial97/openal_settings
Fixed openAL placeholder
2024-01-07 00:21:21 +01:00
TheKodeToad
f285c3fe13
Merge pull request #1972 from lumiscosity/feature/cat_opacity
Add a cat opacity option
2024-01-06 19:42:17 +00:00
Trial97
219e2862f9
Fixed openAL placeholder
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-01-05 23:02:42 +02:00
TheKodeToad
d56d21f928
Merge pull request #1983 from tildejustin/develop
remove legacy processArguments code
2024-01-05 12:26:58 +00:00
seth
7783ef9285
Merge pull request #2005 from Trial97/develop
Format java code
2024-01-04 15:18:40 -05:00
Alexandru Ionut Tripon
b76c413936
Merge pull request #1 from theMackabu/refresh_cats
add: refresh on load
2024-01-03 22:56:43 +02:00
Trial97
048d34dc9d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refresh_cats 2024-01-03 22:53:36 +02:00
Trial97
786e03571b
Format java code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-01-03 22:50:55 +02:00
Alexandru Ionut Tripon
57a589367f
Merge pull request #1979 from lumiscosity/feature/mod_page_improvements
Mod downloader page improvements
2024-01-03 22:43:18 +02:00
Sefa Eyeoglu
9523a2d77b
Merge pull request #1999 from TheKodeToad/more-legacy-fixes 2024-01-03 18:16:41 +01:00
Sefa Eyeoglu
e5b608447a
chore: improve param name
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2024-01-03 18:15:03 +01:00
Sefa Eyeoglu
f454333cc5
Merge pull request #1998 from TheKodeToad/happy-new-year 2024-01-03 18:13:14 +01:00
TheKodeToad
345cdf5c9d
Pass proxy
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-01-02 19:10:41 +00:00
TheKodeToad
05e4533096
Add online mode fix for legacy versions; minor refactors in legacy
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-01-02 18:11:54 +00:00
TheKodeToad
1130fe8510
Happy new year :D
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-01-02 18:04:42 +00:00
Alexandru Ionut Tripon
0cf9b6537b
Merge pull request #1996 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x
chore(deps): update hendrikmuhs/ccache-action action to v1.2.11
2024-01-02 13:28:27 +02:00
renovate[bot]
73f956c897
chore(deps): update hendrikmuhs/ccache-action action to v1.2.11 2024-01-02 07:30:12 +00:00
Sefa Eyeoglu
b280a6d36d
Merge pull request #1991 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2023-12-31 12:28:20 +01:00
github-actions[bot]
ad01102bad chore(nix): update lockfile
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/d6863cbcbbb80e71cecfc03356db1cda38919523' (2023-12-21)
  → 'github:nixos/nixpkgs/e1fa12d4f6c6fe19ccb59cac54b5b3f25e160870' (2023-12-25)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/007a45d064c1c32d04e1b8a0de5ef00984c419bc' (2023-12-13)
  → 'github:cachix/pre-commit-hooks.nix/9d3d7e18c6bc4473d7520200d4ddab12f8402d38' (2023-12-30)
2023-12-31 00:20:06 +00:00
timoreo
0ce0769842
Merge pull request #1978 from Trial97/double_links 2023-12-28 19:48:34 +01:00
tildejustin
eca5d88576 remove legacy processArguments code
Signed-off-by: tildejustin <spacepepper3.14@gmail.com>
2023-12-24 22:20:06 -05:00
Sajjaad Farzad
b0a4af7412
Merge branch 'PrismLauncher:develop' into refresh_cats 2023-12-24 16:03:13 -08:00
Sefa Eyeoglu
dbbbf5aa93
Merge pull request #1980 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2023-12-24 11:22:58 +01:00
github-actions[bot]
ea38f8168a chore(nix): update lockfile
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/aa9d4729cbc99dabacb50e3994dcefb3ea0f7447' (2023-12-14)
  → 'github:nixos/nixpkgs/d6863cbcbbb80e71cecfc03356db1cda38919523' (2023-12-21)
2023-12-24 00:19:31 +00:00
lumiscosity
c29af83dc3 fix styling
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
2023-12-23 14:16:29 +01:00
lumiscosity
1e48bf838d move simplify call to drawing
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
2023-12-23 12:05:07 +01:00
lumiscosity
1bf386603d Strip newlines in mod descriptions
Mirrors Modrinth page behaviour.

Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
2023-12-23 11:27:19 +01:00
Trial97
9a33bdcf50
Fixed openURL cast for resource
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-12-23 01:02:04 +02:00
Trial97
526e580fbb
Force clear the resource selection
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-12-23 00:33:38 +02:00
Trial97
13d29ac6f4
Updated the size sort code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-12-22 23:35:48 +02:00
lumiscosity
358cf5b348 add archived project warning
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
2023-12-22 22:04:33 +01:00
lumiscosity
43306350e0 Add cat opacity
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
2023-12-22 15:02:41 +01:00
TheKodeToad
e39a03421a
Merge pull request #1964 from Scrumplex/fix/dont-log-katabasis
Don't log Microsoft refresh tokens
2023-12-19 11:24:45 +00:00
Sefa Eyeoglu
a1e3901b3f
fix: don't log katabasis by default
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-12-17 12:39:17 +01:00
Sefa Eyeoglu
2993306226
Merge pull request #1963 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2023-12-17 10:19:15 +01:00
github-actions[bot]
74e2e49134 chore(nix): update lockfile
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/09dc04054ba2ff1f861357d0e7e76d021b273cd7' (2023-12-08)
  → 'github:nixos/nixpkgs/aa9d4729cbc99dabacb50e3994dcefb3ea0f7447' (2023-12-14)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/e5ee5c5f3844550c01d2131096c7271cec5e9b78' (2023-11-25)
  → 'github:cachix/pre-commit-hooks.nix/007a45d064c1c32d04e1b8a0de5ef00984c419bc' (2023-12-13)
2023-12-17 00:20:10 +00:00
Sefa Eyeoglu
e227826a90
Merge pull request #1955 from PrismLauncher/renovate/actions-download-artifact-4.x
chore(deps): update actions/download-artifact action to v4
2023-12-16 17:27:02 +01:00