9353 Commits

Author SHA1 Message Date
seth
1cce582d56
Merge pull request #3292 from Trial97/fix_modrinth_link
fix modrinth link
2025-01-16 20:42:00 -05:00
seth
867aaf881e
Merge pull request #3286 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
2025-01-16 20:40:44 -05:00
seth
14b348ffe7
Merge pull request #3285 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x
chore(deps): update hendrikmuhs/ccache-action action to v1.2.16
2025-01-16 20:40:17 -05:00
Edgars Cīrulis
181610a8c1
Merge branch 'PrismLauncher:develop' into qt-6.8 2025-01-17 03:04:43 +02:00
seth
b7f2175718
Merge pull request #3179 from sshcrack/fix-inst-java
Fix $INST_JAVA not being set for auto download java
2025-01-16 20:03:26 -05:00
seth
7a1dc0e9c9
Merge pull request #1555 from Trial97/env_vars
correctly expand env vars for pre/post launch commands
2025-01-16 19:45:31 -05:00
Trial97
9317a675ed
removed unused type
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-16 17:07:44 +02:00
Trial97
7cb8deeb90
feat: updated flame mod resolution
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-16 17:05:36 +02:00
Trial97
797cacf804
refactor to remove code duplication
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-16 17:04:53 +02:00
Trial97
d2516cbecc
use YCbCr for chesboard pattern
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-16 14:11:56 +02:00
Trial97
bca517b8d3
fix appimage
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-16 12:10:19 +02:00
Trial97
aa6518410e
fix build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-15 23:04:47 +02:00
Trial97
9d25680587
remove defaults blocked list
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-15 22:35:47 +02:00
Trial97
82e59658d5
uniform ignoreFilesWithPath
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-15 21:59:31 +02:00
Trial97
a6f5858dac
Fix ignore for modrinth/flame export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-15 21:54:02 +02:00
Trial97
c0525ebf4e
add wheel support for zoom
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-15 17:59:45 +02:00
Trial97
dbeb987978
improve skin preview
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-15 17:59:24 +02:00
Trial97
f6622a4cbb
implement packignore for curseforge/modrinth export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-14 18:48:41 +02:00
Trial97
2292df16cc
some renames
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-14 18:48:20 +02:00
Trial97
e4ad4051c8
fix curseforge with empty loader as newest version
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-13 13:56:55 +02:00
Trial97
3ee73916ca
fix modrinth link
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-13 08:16:12 +02:00
github-actions[bot]
03834e1455 chore(nix): update lockfile
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/6df24922a1400241dae323af55f30e4318a6ca65?narHash=sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk%3D' (2025-01-02)
  → 'github:NixOS/nixpkgs/bffc22eb12172e6db3c5dde9e3e5628f8e3e7912?narHash=sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc%2Bc2c%3D' (2025-01-08)
2025-01-12 00:26:01 +00:00
renovate[bot]
54da41c625
chore(deps): update hendrikmuhs/ccache-action action to v1.2.16 2025-01-11 22:11:18 +00:00
Trial97
1b98c69948
generate skin preview
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-10 17:30:00 +02:00
Trial97
5ba4b3a32f
add licence header
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-10 15:31:57 +02:00
Trial97
059c03c655
fix qt5 build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-10 15:03:53 +02:00
Trial97
87ec7cdd39
move background to vertex buffer
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-10 14:54:40 +02:00
Trial97
0219c11a73
Fix build CI
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-10 11:48:21 +02:00
Trial97
6fc386cfe9
Move shaders to separate files
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-01-10 11:40:38 +02:00
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
Trial97
23ffc4d8b9
Refactor ResourcePack
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-12-19 10:42:42 +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