Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-05-02 15:44:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,123 Commits 10 Branches 38 Tags
Commit Graph

9123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trial97
cd0895b237
Add skin preview 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-10 00:54:14 +02:00
Alexandru Ionut Tripon
f4f1d5f0d7
Merge pull request #3228 from Trial97/delete_block 
Add settings to control the if prism should move the downloaded mods
 2025-01-09 00:12:12 +02:00
Alexandru Ionut Tripon
fbd886e9db
Merge pull request #3255 from Trial97/propagate_load 
propagate load component error
 2025-01-09 00:11:48 +02:00
Alexandru Ionut Tripon
0fb99d837f
Merge pull request #3230 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2025-01-09 00:11:24 +02:00
Alexandru Ionut Tripon
cb8320ca41
Merge pull request #3278 from Trial97/remove_drop 
remove drop label
 2025-01-09 00:10:50 +02:00
Alexandru Ionut Tripon
33981b9870
Merge pull request #3215 from Trial97/fix_custom_instance_icons 
Fix curseforge/modrinth instance icons
 2025-01-09 00:10:39 +02:00
Alexandru Ionut Tripon
07a0a15457
Merge pull request #3277 from Trial97/drop_file 
fix drop file on resource page
 2025-01-08 10:46:55 +02:00
Trial97
0f9ea5c949
remove drop label 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-08 01:55:45 +02:00
Trial97
d40c8b704c
fix drop file on resource page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-08 01:52:11 +02:00
github-actions[bot]
82a500f4e8 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/5d67ea6b4b63378b9c13be21e2ec9d1afc921713?narHash=sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g%3D' (2024-12-11)
  → 'github:NixOS/nixpkgs/6df24922a1400241dae323af55f30e4318a6ca65?narHash=sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk%3D' (2025-01-02)
 2025-01-05 00:25:34 +00:00
Trial97
4358e28d7e
improve profile setup error message 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-12-31 14:33:36 +02:00
Trial97
6ebfcb91cf
propagate load component error 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-12-31 13:44:22 +02:00
Trial97
e01df73deb
remove EditAccountDialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-12-31 11:13:01 +02:00
Trial97
7dde35fef2
Add settings to control the if prism should move the downloaded mods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-12-20 19:57:09 +02:00
Alexandru Ionut Tripon
0b6ce5525d
Merge pull request #3216 from Trial97/fix_auto_mod_provider 
Fix automatically choose mod provider option
 2024-12-19 09:16:59 +02:00
timoreo
f17faadf8a
Merge pull request #3174 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-12-18 19:54:44 +01:00
timoreo
c7b6977692
Merge pull request #3043 from Trial97/fix_flame_loader_match 
fix the flame loaders match
 2024-12-18 19:53:22 +01:00
timoreo
423d72a6e8
Merge pull request #3197 from Trial97/fix_curseforge_import 
Do not fail curseforge import if modrinth file check fails
 2024-12-18 19:48:05 +01:00
timoreo
2a2ed9f8bd
Merge pull request #3214 from kthchew/fix/manifest-symlink 
Correct symbolic link destination on manifest (Mojang) Java download
 2024-12-18 19:42:25 +01:00
Trial97
0412ed3f78
Fix automatically choose mod provider option 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-12-16 14:51:59 +02:00
Trial97
f4d93a08ba
Fix curseforge/modrinth instance icons 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-12-16 13:27:44 +02:00
Kenneth Chew
8d53242952
Correct symbolic link destination on manifest Java download 
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
 2024-12-16 03:30:09 -05:00
github-actions[bot]
706e263050 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'flake-compat':
    'github:edolstra/flake-compat/9ed2ac151eada2306ca8c418ebd97807bb08f6ac?narHash=sha256-HRJ/18p%2BWoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg%3D' (2024-11-27)
  → 'github:edolstra/flake-compat/ff81ac966bb2cae68946d5ed5fc4994f96d0ffec?narHash=sha256-NeCCThCEP3eCl2l/%2B27kNNK7QrwZB1IJCrXfrbv5oqU%3D' (2024-12-04)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/970e93b9f82e2a0f3675757eb0bfc73297cc6370?narHash=sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE%3D' (2024-11-28)
  → 'github:NixOS/nixpkgs/5d67ea6b4b63378b9c13be21e2ec9d1afc921713?narHash=sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g%3D' (2024-12-11)
 2024-12-15 00:27:47 +00:00
Alexandru Ionut Tripon
507faf9f00
Merge pull request #3150 from kthchew/fix/unneeded-hr-exceptions 
Remove unnecessary hardened runtime exceptions on macOS
 2024-12-14 19:30:11 +02:00
Alexandru Ionut Tripon
c0803365ef
Merge pull request #3202 from kthchew/chore/bump-sparkle 
[macOS] Update Sparkle to v2.6.4
 2024-12-14 18:18:04 +02:00
Alexandru Ionut Tripon
02e527c15b
Merge pull request #3199 from kthchew/fix/launcher-settings-tab 
Fix tab order in launcher settings
 2024-12-14 18:17:08 +02:00
Alexandru Ionut Tripon
5659dad23d
Merge pull request #3198 from kthchew/fix/local-net-use-desc 
[macOS] Add local network usage description
 2024-12-14 18:16:34 +02:00
Alexandru Ionut Tripon
647bb04a0d
Merge pull request #3181 from Trial97/fix_mrpack_crash 
fix crash with invalid mrpack format
 2024-12-14 18:15:50 +02:00
Kenneth Chew
b6cd46ad27
Update Sparkle to v2.6.4 
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
 2024-12-14 00:42:08 -05:00
Kenneth Chew
c3712ba648
Fix tab order in launcher settings 
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
 2024-12-12 14:53:39 -05:00
Kenneth Chew
c3e44554ab
Add local network usage description 
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
 2024-12-12 14:43:28 -05:00
Trial97
a1c1c0b769
Do not fail curseforge import if modrinth file check fails 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-12-12 17:29:46 +02:00
Alexandru Ionut Tripon
15e58589d5
Merge pull request #3170 from leia-uwu/fix-icon-theme-path 
[Linux] Don't use fallback icon search paths
 2024-12-09 09:14:25 +02:00
Edgars Cirulis
eb8c375ec5
chore: update Qt to 6.8.1 
Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
 2024-12-09 00:40:05 +02:00
Trial97
1dd0728a58
fix crash with invalid mrpack format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-12-08 22:04:16 +02:00
sshcrack
cf2dcbd431
load meta first 
Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com>
 2024-12-08 18:27:57 +01:00
sshcrack
dedb7a2343
change order of steps 
Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com>
 2024-12-08 14:39:06 +01:00
leia uwu
614574f15c
fix icon theme search paths 
using fallback search paths breaks qadwaitadecorations

Signed-off-by: leia uwu <leia@tutamail.com>
 2024-12-06 23:26:46 -03:00
Alexandru Ionut Tripon
28a471777a
Merge pull request #2800 from QazCetelic/advanced-icon-dialog 
Add search and support for subdirectories to icon picker
 2024-12-06 12:37:45 +02:00
Alexandru Ionut Tripon
93526637cb
Merge pull request #3166 from PrismLauncher/renovate/actions-cache-4.x 
chore(deps): update actions/cache action to v4.2.0
 2024-12-06 08:47:04 +02:00
renovate[bot]
94c893bd86
chore(deps): update actions/cache action to v4.2.0 2024-12-05 20:29:11 +00:00
iTrooz
f9e450ace2
do not destroy the ping ConcurrentTask directly at the end of the task 
Signed-off-by: iTrooz <hey@itrooz.fr>
 2024-12-05 20:43:40 +01:00
iTrooz
4e48015868
currentQueryTask -> m_currentQueryTask 
Signed-off-by: iTrooz <hey@itrooz.fr>
 2024-12-05 20:43:40 +01:00
Alexandru Ionut Tripon
c99876f3d7
Merge pull request #3154 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-12-03 16:17:50 +02:00
Alexandru Ionut Tripon
a3b2f1a931
Merge pull request #3119 from guihkx/flathub-manifest-sync 
Sync Flatpak manifest with Flathub's
 2024-12-02 17:30:19 +02:00
TheKodeToad
488dc7815c
Merge pull request #3135 from Trial97/italic 
Make FTB Import note italic to match others
 2024-12-02 14:07:42 +00:00
Tayou
dbee4bee14
Merge pull request #3152 from leia-uwu/fix-system-icons 
Fix system icons on Linux
 2024-12-02 15:00:43 +01:00
github-actions[bot]
2cfd116947 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'flake-compat':
    'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33?narHash=sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U%3D' (2023-10-04)
  → 'github:edolstra/flake-compat/9ed2ac151eada2306ca8c418ebd97807bb08f6ac?narHash=sha256-HRJ/18p%2BWoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg%3D' (2024-11-27)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/23e89b7da85c3640bbc2173fe04f4bd114342367?narHash=sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w%3D' (2024-11-19)
  → 'github:NixOS/nixpkgs/970e93b9f82e2a0f3675757eb0bfc73297cc6370?narHash=sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE%3D' (2024-11-28)
 2024-12-01 00:30:03 +00:00
leia uwu
3f67ef968b
fix: icon search paths memory leak 
Signed-off-by: leia uwu <leia@tutamail.com>
 2024-11-30 12:51:39 -03:00
leia uwu
fd9c80db62
fix: fix system icons 
This sets the fallback icon theme to the current(system default) icon theme before
launcher specific themes are applied

And removes `Inherits` line of multimc/legacy icon theme because it can end up making it
inherit a default theme set from /usr/share/icons/default/index.theme
instead of the user configured theme (probably a qt bug?)

Signed-off-by: leia uwu <leia@tutamail.com>
 2024-11-30 11:35:41 -03:00