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
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
TheKodeToad
68bf409a98
Fix formatting issues 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 19:14:57 +00:00
TheKodeToad
5d179671bf
Fix non-Linux build 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 18:55:24 +00:00
TheKodeToad
dc6f536843
Fix Qt 5 compilation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 18:04:41 +00:00
TheKodeToad
cc504f4a6c
Merge remote-tracking branch 'upstream/develop' into unify-mc-settings 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 17:02:50 +00:00
TheKodeToad
a92c68adbd
Remove duplicate console section 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 16:54:45 +00:00
TheKodeToad
7aaa9fa93c
Finish off MinecraftSettingsWidget implementation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 16:46:26 +00:00
TheKodeToad
81769b9047
Use MinecraftInstancePtr instance of InstancePtr 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 14:34:07 +00:00
TheKodeToad
147b315c14
Update thresholds when min. memory value is changed too 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 14:15:07 +00:00
TheKodeToad
9d0918a064
Remove outdated JavaWizardWidget comment 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 13:19:10 +00:00
TheKodeToad
98ab686348
Merge remote-tracking branch 'upstream/develop' into unify-mc-settings 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-27 13:18:19 +00:00
TheKodeToad
39ae2fbd4a
Fix tab inconsistencies 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-26 22:44:43 +00:00
TheKodeToad
36a35d7925
Fix tab order 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-26 22:36:48 +00:00
TheKodeToad
1b4b36df33
Unify Java page 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-01-26 22:25:26 +00: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
iTrooz
bb20848449
use more sensible protocol version 
Signed-off-by: iTrooz <hey@itrooz.fr>
 2025-01-25 21:01:21 +01:00
iTrooz
0b9d4784d8
Show socket error in McClient 
Signed-off-by: iTrooz <hey@itrooz.fr>
 2025-01-25 20:26:52 +01:00
iTrooz
b06c4341d8
update documentation 
Signed-off-by: iTrooz <hey@itrooz.fr>
 2025-01-25 20:22:09 +01:00
iTrooz
7c82cd82d7
use m_responseReadState to avoid calling parseResponse() (as a failsafe for malicious/bad server responses) 
Signed-off-by: iTrooz <hey@itrooz.fr>
 2025-01-25 20:19:19 +01:00
iTrooz
439c565961
forward McResolver error as Task error 
Signed-off-by: iTrooz <hey@itrooz.fr>
 2025-01-25 20:14:15 +01:00
iTrooz
cf2b413f29
forward McClient error as Task error 
Signed-off-by: iTrooz <hey@itrooz.fr>
 2025-01-25 20:10:31 +01:00
iTrooz
fe8f755b43
remove waitForConnected() and waitForReadyRead() and use signals ineatd 
Signed-off-by: iTrooz <hey@itrooz.fr>
 2025-01-25 20:08:44 +01:00
iTrooz
43376b1c40
remove unused defines in McClient.h 
Signed-off-by: iTrooz <hey@itrooz.fr>
 2025-01-25 19:06:52 +01:00
Trial97
255f27d419
virtual constructor 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-22 16:11:54 +02:00
Trial97
aeeb6f6bb6
fix build final 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-22 00:16:20 +02:00
Trial97
49d82ab528
fix build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-21 23:49:42 +02: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
Trial97
7010b8acb6
fix the freeze with openglwidget 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-01-21 23:36:40 +02:00
renovate[bot]
705375c0df
chore(deps): update determinatesystems/magic-nix-cache-action action to v9 2025-01-21 21:35:18 +00:00
Alexandru Ionut Tripon
38d3f14f06
Apply suggestions from code review 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2025-01-21 16:45:40 +02: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