Commit Graph

9213 Commits

Author SHA1 Message Date
Alexandru Ionut Tripon
1c3d63981b
Merge pull request #2063 from DioEgizio/no-alpha-mr
fix: remove alpha notice on modrinth packs
2024-01-24 18:13:15 +02:00
DioEgizio
8de1060bfb fix: remove alpha notice on modrinth packs
with the modrinth app being released for quite a while now it's weird to still have this (tbh they've never been truly alpha)

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2024-01-24 16:43:38 +01:00
seth
1075a94034
Merge pull request #2040 from getchoo/nix/filesets
[Linux/MacOS] Replace nix-filter with lib.fileset
2024-01-24 03:05:30 -05:00
seth
8312713dc2
refactor(nix): nix-filter -> lib.fileset
with our own use of `map`, this is basically a drop-in replacement for
nix-filter, but already in nixpkgs!

Signed-off-by: seth <getchoo@tuta.io>
2024-01-23 16:10:41 -05:00
BatteredBunny
187475e35f Adjusted AuthServerColumn to return authlibInjectorUrl instead of authServerUrl, make the column auto-resize
Signed-off-by: BatteredBunny <ayes2022@protonmail.com>
2024-01-23 22:38:41 +02:00
Sefa Eyeoglu
7bce88e83e
Merge pull request #2060 from PrismLauncher/renovate/korthout-backport-action-2.x 2024-01-23 20:45:36 +01:00
renovate[bot]
72e6218df9
chore(deps): update korthout/backport-action action to v2.4.1 2024-01-23 19:21:30 +00:00
Sefa Eyeoglu
2fd5635b2d
Merge pull request #2057 from PrismLauncher/backport-2053-to-release-8.x 2024-01-23 09:30:59 +01:00
Trial97
bc63e1906f Fixed open path a second time
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 12bf913764)
2024-01-23 08:30:16 +00:00
Sefa Eyeoglu
e60235cb88
Merge pull request #2053 from Trial97/fix_open_path_take_two 2024-01-23 09:29:57 +01:00
Sefa Eyeoglu
913f6d8563
Merge pull request #2052 from PrismLauncher/renovate/korthout-backport-action-2.x 2024-01-22 22:32:38 +01:00
Trial97
6b637a8797
Display minecraft version if not mentioned for modrinth packs
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-01-22 22:32:42 +02:00
Trial97
9bbeb5ef3a
Made updater interval configurable
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-01-22 21:26:46 +02:00
Trial97
12bf913764
Fixed open path a second time
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-01-22 20:36:57 +02:00
renovate[bot]
0dc4a10f48
chore(deps): update korthout/backport-action action to v2.4.0 2024-01-22 17:26:37 +00:00
Trial97
f77749e448
Resized Refresh theme button
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-01-21 21:24:47 +02:00
Sefa Eyeoglu
78482d0d3e
Merge pull request #2049 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2024-01-21 08:28:49 +01:00
Alexandru Ionut Tripon
e4306d5cb6
Update launcher/ui/themes/CatPack.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2024-01-21 08:52:49 +02:00
TheKodeToad
f54ac25614
Use minecraft instead of .minecraft for better accessibility
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-01-21 02:28:55 +00:00
github-actions[bot]
c7cd8b7877 chore(nix): update lockfile
Flake lock file updates:

• Updated input 'nix-filter':
    'github:numtide/nix-filter/c843418ecfd0344ecb85844b082ff5675e02c443' (2023-12-04)
  → 'github:numtide/nix-filter/3449dc925982ad46246cfc36469baf66e1b64f17' (2024-01-15)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/eabe8d3eface69f5bb16c18f8662a702f50c20d5' (2024-01-09)
  → 'github:nixos/nixpkgs/e5d1c87f5813afde2dda384ac807c57a105721cc' (2024-01-19)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/274ae3979a0eacae422e1bbcf63b8b7a335e1114' (2024-01-12)
  → 'github:cachix/pre-commit-hooks.nix/f56597d53fd174f796b5a7d3ee0b494f9e2285cc' (2024-01-20)
• Updated input 'pre-commit-hooks/flake-utils':
    'github:numtide/flake-utils/a1720a10a6cfe8234c0e93907ffe81be440f4cef' (2023-05-31)
  → 'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04)
• Updated input 'pre-commit-hooks/gitignore':
    'github:hercules-ci/gitignore.nix/a20de23b925fd8264fd7fad6454652e142fd7f73' (2022-08-14)
  → 'github:hercules-ci/gitignore.nix/43e1aa1308018f37118e34d3a9cb4f5e75dc11d5' (2023-12-29)
2024-01-21 00:20:26 +00:00
erik.lundstedt
30913fdb2b fix a minor spelling misstake in Mod.cpp
closes https://github.com/PrismLauncher/PrismLauncher/issues/2047

Signed-off-by: erik.lundstedt <erik@lundstedt.it>
2024-01-21 00:31:00 +01:00
Trial97
0303b1cc7f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refresh_cats 2024-01-20 00:27:30 +02:00
BatteredBunny
5c95f10f64 Add auth server column to account list
Signed-off-by: BatteredBunny <ayes2022@protonmail.com>
2024-01-19 00:40:35 +02:00
Alexandru Ionut Tripon
a8b168dc1f
Merge pull request #2043 from PrismLauncher/backport-1913-to-release-8.x
[Backport release-8.x] Fixed askIfShouldUpdate dialog on mac
2024-01-18 22:06:12 +02:00
Trial97
fce2163350 Fixed askIfShouldUpdate dialog on mac
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 577c737d68)
2024-01-18 20:05:30 +00:00
Alexandru Ionut Tripon
4cda04271f
Merge pull request #1913 from Trial97/dialog
Fixed askIfShouldUpdate dialog on mac
2024-01-18 22:02:04 +02:00
Sefa Eyeoglu
5d0c83dec2
Merge pull request #1768 from Trial97/toggle_deps2 2024-01-18 18:19:17 +01:00
Sefa Eyeoglu
557fce577a
Merge pull request #1825 from Trial97/ftb_import 2024-01-18 18:19:17 +01:00
Sefa Eyeoglu
bc75bcdcca
Merge pull request #1768 from Trial97/toggle_deps2 2024-01-18 18:18:31 +01:00
Sefa Eyeoglu
a62eaba702
Merge pull request #1825 from Trial97/ftb_import 2024-01-18 18:18:17 +01:00
Sefa Eyeoglu
bcb5b9c9c2
Merge pull request #2034 from Scrumplex/feat/macos-signing 2024-01-18 17:00:00 +01:00
Sefa Eyeoglu
2c0274159f
Merge pull request #2034 from Scrumplex/feat/macos-signing 2024-01-18 16:56:39 +01:00
Sefa Eyeoglu
b2c2bf1460
Merge pull request #2039 from PrismLauncher/renovate/actions-cache-4.x
chore(deps): update actions/cache action to v4
2024-01-17 23:48:16 +01:00
renovate[bot]
bfd1262c14
chore(deps): update actions/cache action to v4 2024-01-17 20:29:50 +00:00
Sefa Eyeoglu
428260b91f
Merge pull request #2035 from PrismLauncher/backport-1954-to-release-8.x 2024-01-17 15:19:48 +01:00
Sefa Eyeoglu
fec1a00dc8 fix: simplify openPath calls
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 67d088dc53)
2024-01-17 14:19:03 +00:00
Sefa Eyeoglu
8dd898f895 chore: improve param name
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit e5b608447a)
2024-01-17 14:19:03 +00:00
Sefa Eyeoglu
f8585602d9 chore: remove unused methods
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit a8220cd296)
2024-01-17 14:19:03 +00:00
Sefa Eyeoglu
0ec3b9ce0e chore: remove maybe_unused
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 213963257c)
2024-01-17 14:19:03 +00:00
Sefa Eyeoglu
6f5d074b4b fix: open paths directly
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 0ccdcd23e3)
2024-01-17 14:19:03 +00:00
Sefa Eyeoglu
0b3e91ac62
Merge pull request #1954 from Scrumplex/fix/open-paths-immediately 2024-01-17 15:18:46 +01:00
Sefa Eyeoglu
de9232783e
chore: remove cachix auth token secret
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2024-01-17 13:12:38 +01:00
Sefa Eyeoglu
27c52eff8b
feat: add macOS notarization
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2024-01-17 13:12:36 +01:00
Sefa Eyeoglu
baebef982e
feat: add macOS code signing
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2024-01-17 13:10:14 +01:00
Sefa Eyeoglu
67d088dc53
fix: simplify openPath calls
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2024-01-14 11:36:17 +01:00
Sefa Eyeoglu
5a0240e709
Merge pull request #2030 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2024-01-14 09:50:59 +01:00
github-actions[bot]
96c714de6e chore(nix): update lockfile
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/88a2cd8166694ba0b6cb374700799cec53aef527' (2024-01-01)
  → 'github:hercules-ci/flake-parts/07f6395285469419cf9d078f59b5b49993198c00' (2024-01-11)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/63143ac2c9186be6d9da6035fa22620018c85932' (2024-01-02)
  → 'github:nixos/nixpkgs/eabe8d3eface69f5bb16c18f8662a702f50c20d5' (2024-01-09)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/9d3d7e18c6bc4473d7520200d4ddab12f8402d38' (2023-12-30)
  → 'github:cachix/pre-commit-hooks.nix/274ae3979a0eacae422e1bbcf63b8b7a335e1114' (2024-01-12)
2024-01-14 00:20:26 +00:00
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