Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-04-29 22:24:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,915 Commits 10 Branches 38 Tags
Commit Graph

8915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kolja
f1671e3ded
Add PackageManager category 
Signed-off-by: Kolja <razzeee@gmail.com>
 2025-02-01 20:25:01 +01:00
Alexandru Ionut Tripon
6404d81ada
Merge pull request #3373 from Trial97/fix_crash2 
Show warning when adding new resources with no instances
 2025-01-31 23:03:55 +02:00
Alexandru Ionut Tripon
d6eb96df5c
Merge pull request #3260 from Trial97/fix_modrinth_shapshot 
Map Minecraft snapshots to Modrinth
 2025-01-31 23:02:55 +02:00
Trial97
c5efe081b4
fix add resource with no instance 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-31 22:03:57 +02:00
Seth Flynn
a639bc019e
Merge pull request #3368 from getchoo-contrib/ci/print-nix-out-paths 2025-01-31 07:00:37 -05:00
Seth Flynn
588e0d6305
ci: add nix out paths to job summary 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-30 13:34:34 -05:00
Sefa Eyeoglu
d7eddedf41
Merge pull request #3359 from PrismLauncher/ci/flakehub 2025-01-30 16:06:58 +01:00
Alexandru Ionut Tripon
6ae9fa4df4
Merge pull request #3314 from Trial97/update_modules 
update submodules
 2025-01-29 23:35:08 +02:00
Seth Flynn
86cc6d3c5e
feat: publish on flakehub 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-29 16:34:31 -05:00
Seth Flynn
61d7f08883
ci: use generic workflow for publishing 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-29 16:34:27 -05:00
Seth Flynn
0deb5e20ae
Merge pull request #3362 from getchoo-contrib/ci/flakehub-cache 2025-01-29 16:34:02 -05:00
Alexandru Ionut Tripon
fcb3dd5e9d
Merge pull request #3346 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2025-01-29 23:33:01 +02:00
Seth Flynn
169f5728b1
ci: run nix workflow on pull_request_target 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-29 16:22:44 -05:00
Seth Flynn
8816be1668
ci: use flakehub cache 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-29 16:17:01 -05:00
Alexandru Ionut Tripon
bd752c025c
Merge pull request #3360 from getchoo-contrib/ci/split 
Split Flatpak and Nix CI jobs from main build workflow
 2025-01-29 22:51:07 +02:00
Seth Flynn
49d734f314
ci: separate flatpak job 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-29 08:32:49 -05:00
Seth Flynn
417688089d
ci: separate nix job 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-29 08:31:45 -05:00
Seth Flynn
de21b77ae1
Merge pull request #3334 from PrismLauncher/renovate/determinatesystems-magic-nix-cache-action-9.x 
chore(deps): update determinatesystems/magic-nix-cache-action action to v9
 2025-01-29 07:44:06 -05:00
github-actions[bot]
3d9e073721 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/5df43628fdf08d642be8ba5b3625a6c70731c19c?narHash=sha256-Tbk1MZbtV2s5aG%2BiM99U8FqwxU/YNArMcWAv6clcsBc%3D' (2025-01-16)
  → 'github:NixOS/nixpkgs/825479c345a7f806485b7f00dbe3abb50641b083?narHash=sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU%3D' (2025-01-24)
 2025-01-26 00:23:21 +00:00
Alexandru Ionut Tripon
fdb4159f2a
Merge pull request #3332 from eff3ry/modrinth-filter-tweak 
Update Modrinth Client/Server Filters to match Modrinth website & launcher.
 2025-01-21 23:42:37 +02:00
Alexandru Ionut Tripon
98be91c9d5
Merge pull request #3294 from Trial97/fix_flame_update 
Fix updating Curseforge mods with missing mod loader
 2025-01-21 23:40:21 +02:00
renovate[bot]
705375c0df
chore(deps): update determinatesystems/magic-nix-cache-action action to v9 2025-01-21 21:35:18 +00:00
TheKodeToad
8d3684c484
Merge pull request #1413 from Trial97/fix_curse_import 
feat: updated flame mod resolution
 2025-01-21 13:53:00 +00:00
Alexandru Ionut Tripon
0d4eeb9965
Merge pull request #3330 from getchoo-contrib/mingw-cfg 
Use better compile flags for MINGW
 2025-01-21 15:18:43 +02:00
Jeffery Tolmie
caccaefb39
Change "none" to "" 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: Jeffery Tolmie <jeffery.tolmie@gmail.com>
 2025-01-22 02:06:49 +13:00
eff3ry
532fec7748 DCO Remediation Commit 
DCO Remediation Commit for eff3ry <jeffery.tolmie@gmail.com>

I, eff3ry <jeffery.tolmie@gmail.com>, hereby add my Signed-off-by to this commit: 2a403b3bfe9f4c79c38c33e80515a232576f6018
I, eff3ry <jeffery.tolmie@gmail.com>, hereby add my Signed-off-by to this commit: 4ba3fd559d2664099524848825adb6f5a60650ab

Signed-off-by: eff3ry <jeffery.tolmie@gmail.com>
 2025-01-22 01:48:04 +13:00
eff3ry
4ba3fd559d Update Filter Checks 
Updates the filter checks so that options both and none can be differentiated.

Signed-off-by: Jeffery Tolmie Jeffery.tolmie@gmail.com
 2025-01-22 01:40:59 +13:00
eff3ry
2a403b3bfe Edit Modrinth search faucets 
Edit Modrinth search faucets to alter the client and server filters to be more in-line with the Modrinth website and Launcher, making it easier to find client-side only mods etc.

Signed-off-by: Jeffery Tolmie Jeffery.tolmie@gmail.com
 2025-01-22 01:39:28 +13:00
Seth Flynn
f8a504e254
Merge pull request #3299 from Trial97/appimage2 
Use Ubuntu 22.04 for Linux builds
 2025-01-20 23:43:45 -05:00
Seth Flynn
e66f447ce5
feat: use better compile flags for mingw 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-01-20 20:36:48 -05:00
Seth Flynn
67b218b1f3
Merge pull request #2895 from Edgars-Cirulis/qt-6.8 
chore: update to qt 6.8.x
 2025-01-20 18:53:05 -05:00
Alexandru Ionut Tripon
db766574a4
Update .github/workflows/build.yml 
Co-authored-by: Seth Flynn <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2025-01-21 01:38:13 +02:00
timoreo
18da01c9a6
Merge pull request #3320 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2025-01-20 09:48:11 +01:00
Alexandru Ionut Tripon
c79ad73311
Merge pull request #3319 from getchoo-contrib/flatpak-arm 
Build Flatpaks for ARM
 2025-01-19 10:16:41 +02:00
Sefa Eyeoglu
fb3926a85d
Merge pull request #3318 from getchoo-contrib/nix-arm 
Build Nix packages for aarch64-linux
 2025-01-19 09:08:17 +01:00
github-actions[bot]
8d4f279539 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/bffc22eb12172e6db3c5dde9e3e5628f8e3e7912?narHash=sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc%2Bc2c%3D' (2025-01-08)
  → 'github:NixOS/nixpkgs/5df43628fdf08d642be8ba5b3625a6c70731c19c?narHash=sha256-Tbk1MZbtV2s5aG%2BiM99U8FqwxU/YNArMcWAv6clcsBc%3D' (2025-01-16)
 2025-01-19 00:24:56 +00:00
Alexandru Ionut Tripon
1b5d3c2bf9
Update .github/workflows/build.yml 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2025-01-19 02:03:21 +02:00
Trial97
be3eca8c97
remove specific step for qt6 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-19 01:05:06 +02:00
seth
66f0397087
ci: build flatpaks for arm 
Signed-off-by: seth <getchoo@tuta.io>
 2025-01-18 17:16:02 -05:00
seth
8e8538b506
ci: build nix packages for aarch64-linux 
Signed-off-by: seth <getchoo@tuta.io>
 2025-01-18 16:55:38 -05:00
Trial97
dc00c47f2e
update submodules 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-18 13:27:18 +02:00
Trial97
7d3238d234
rename variables 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-17 21:09:44 +02:00
Alexandru Ionut Tripon
f17599c8b8
Merge pull request #1689 from Trial97/progrss_bar_interaction 
Added mouse interactions for labels in ProgressDialog
 2025-01-17 20:59:52 +02:00
Trial97
8e5a7c6e33
ensure that the snapshot mapping is on all apis 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-17 10:35:13 +02:00
Trial97
1d8bf1d5a7
map modrinth snapshots 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-17 09:19:39 +02:00
Alexandru Ionut Tripon
c2f4389e5f
Merge pull request #3254 from Trial97/remove_multimc 
remove EditAccountDialog
 2025-01-17 08:51:44 +02:00
Alexandru Ionut Tripon
b7d117cc77
Merge pull request #2737 from maskersss/log-upload 
Truncate logs for mclo.gs to fit 25k line limit
 2025-01-17 08:49:49 +02:00
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