Commit Graph

8668 Commits

Author SHA1 Message Date
d56d21f928 Merge pull request #1983 from tildejustin/develop
remove legacy processArguments code
2024-01-05 12:26:58 +00:00
7783ef9285 Merge pull request #2005 from Trial97/develop
Format java code
2024-01-04 15:18:40 -05:00
b76c413936 Merge pull request #1 from theMackabu/refresh_cats
add: refresh on load
2024-01-03 22:56:43 +02:00
048d34dc9d Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refresh_cats 2024-01-03 22:53:36 +02:00
786e03571b Format java code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-01-03 22:50:55 +02:00
57a589367f Merge pull request #1979 from lumiscosity/feature/mod_page_improvements
Mod downloader page improvements
2024-01-03 22:43:18 +02:00
9523a2d77b Merge pull request #1999 from TheKodeToad/more-legacy-fixes 2024-01-03 18:16:41 +01:00
e5b608447a chore: improve param name
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2024-01-03 18:15:03 +01:00
f454333cc5 Merge pull request #1998 from TheKodeToad/happy-new-year 2024-01-03 18:13:14 +01:00
345cdf5c9d Pass proxy
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-01-02 19:10:41 +00:00
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
1130fe8510 Happy new year :D
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-01-02 18:04:42 +00:00
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
73f956c897 chore(deps): update hendrikmuhs/ccache-action action to v1.2.11 2024-01-02 07:30:12 +00:00
b280a6d36d Merge pull request #1991 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2023-12-31 12:28:20 +01:00
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
0ce0769842 Merge pull request #1978 from Trial97/double_links 2023-12-28 19:48:34 +01:00
eca5d88576 remove legacy processArguments code
Signed-off-by: tildejustin <spacepepper3.14@gmail.com>
2023-12-24 22:20:06 -05:00
b0a4af7412 Merge branch 'PrismLauncher:develop' into refresh_cats 2023-12-24 16:03:13 -08:00
dbbbf5aa93 Merge pull request #1980 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2023-12-24 11:22:58 +01:00
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
c29af83dc3 fix styling
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
2023-12-23 14:16:29 +01:00
1e48bf838d move simplify call to drawing
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
2023-12-23 12:05:07 +01:00
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
9a33bdcf50 Fixed openURL cast for resource
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-12-23 01:02:04 +02:00
526e580fbb Force clear the resource selection
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-12-23 00:33:38 +02:00
13d29ac6f4 Updated the size sort code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-12-22 23:35:48 +02:00
358cf5b348 add archived project warning
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
2023-12-22 22:04:33 +01:00
43306350e0 Add cat opacity
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
2023-12-22 15:02:41 +01:00
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
a1e3901b3f fix: don't log katabasis by default
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-12-17 12:39:17 +01:00
2993306226 Merge pull request #1963 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2023-12-17 10:19:15 +01:00
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
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
211e62cedb Merge pull request #1956 from PrismLauncher/renovate/actions-upload-artifact-4.x
chore(deps): update actions/upload-artifact action to v4
2023-12-16 17:26:28 +01:00
7382d33430 Merge pull request #1961 from PrismLauncher/renovate/korthout-backport-action-2.x
chore(deps): update korthout/backport-action action to v2.3.0
2023-12-16 17:25:53 +01:00
1fcf405c88 Merge pull request #1960 from lumiscosity/fix/minor_spelling
Minor spelling fixes
2023-12-16 16:34:21 +01:00
8f29cdf195 chore(deps): update korthout/backport-action action to v2.3.0 2023-12-16 15:27:48 +00:00
a8220cd296 chore: remove unused methods
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-12-16 13:12:12 +01:00
213963257c chore: remove maybe_unused
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-12-16 13:11:24 +01:00
eb8e150fa8 one more
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
2023-12-16 13:00:22 +01:00
56397446db Update ModFolderPage.cpp
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
2023-12-16 12:53:59 +01:00
8cbdecc454 Update GetModDependenciesTask.cpp
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
2023-12-16 12:52:59 +01:00
317d52b44a chore(deps): update actions/upload-artifact action to v4 2023-12-14 20:23:30 +00:00
d0fe700b53 chore(deps): update actions/download-artifact action to v4 2023-12-14 20:23:26 +00:00
0ccdcd23e3 fix: open paths directly
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-12-14 13:02:29 +01:00
f33110ee0c Renamed function
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-12-14 00:19:22 +02:00
9580f16c33 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into netjob_retry
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-12-14 00:16:29 +02:00
400b518bc2 Removed auto reauthenticate
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-12-14 00:02:15 +02:00
32a9c37ecd Merge pull request #1951 from guihkx/sync-flatpak 2023-12-13 19:32:56 +01:00