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

9353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trial97
ef825a7bc5
update stale action 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-02-06 09:58:41 +02:00
Alexandru Ionut Tripon
8d143c7b95
Fixed when game crashes, it doesn't log any time played (#3392) 2025-02-06 09:35:23 +02:00
Riley Richard
9ea33e0651 DCO Remediation Commit for Riley Richard <bubbalou112@gmail.com> 
I, Riley Richard <bubbalou112@gmail.com>, hereby add my Signed-off-by to this commit: cb83f8e52db1046173a8def2f216cfcf1518b91f

Signed-off-by: Riley Richard <bubbalou112@gmail.com>
 2025-02-05 18:10:31 -05:00
Trial97
f1209c1279
Increase the stale operations 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-02-05 23:43:38 +02:00
Riley Richard
17e95c0d07 forgot to sign 
Signed-off-by: Riley Richard <bubbalou112@gmail.com>
 2025-02-05 16:33:15 -05:00
Riley Richard
cb83f8e52d fixed thing 2025-02-05 16:13:22 -05:00
Alexandru Ionut Tripon
7d202e348d
Use the same UI for instance and global settings (#3341) 2025-02-05 23:04:54 +02:00
Alexandru Ionut Tripon
364b5be856
Add stale workflow (#3389) 2025-02-05 23:04:38 +02:00
TheKodeToad
e1896d5b6b
Update launcher/ui/pages/global/MinecraftPage.h 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-02-05 13:45:49 +00:00
TheKodeToad
6e3dd04a1f
Update launcher/ui/pages/global/MinecraftPage.h 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-02-05 12:09:32 +00:00
TheKodeToad
f7a401ab22
Update launcher/ui/pages/instance/InstanceSettingsPage.h 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-02-05 12:09:26 +00:00
TheKodeToad
9ed6801b15
Update launcher/ui/pages/global/JavaPage.h 
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-02-05 12:09:12 +00:00
TheKodeToad
06b50dfd33
Fix more header mistakes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-02-05 11:11:45 +00:00
TheKodeToad
5a76d9b7e1
Make requested changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-02-05 10:58:06 +00:00
Alexandru Ionut Tripon
34438824c1
Update .github/workflows/stale.yml 
Co-authored-by: Seth Flynn <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2025-02-04 23:15:18 +02:00
Alexandru Ionut Tripon
ac598740b3
Update .github/workflows/stale.yml 
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2025-02-04 22:08:46 +02:00
Alexandru Ionut Tripon
85c2710e33
Apply suggestions from code review 
Co-authored-by: Seth Flynn <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2025-02-04 22:08:16 +02:00
Alexandru Ionut Tripon
afe6d4836d
Update .github/workflows/stale.yml 
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2025-02-04 17:41:36 +02:00
Trial97
9c26ba5932
add stale workflow 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-02-04 16:13:55 +02:00
renovate[bot]
2a987b5a4a
chore(deps): update hendrikmuhs/ccache-action action to v1.2.17 2025-02-03 22:11:56 +00:00
Alexandru Ionut Tripon
1a375dc243
Merge pull request #3382 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2025-02-03 00:28:59 +02:00
Alexandru Ionut Tripon
ab3792b080
Merge pull request #3381 from razzeee/patch-1 
Add PackageManager category
 2025-02-03 00:28:42 +02:00
Seth Flynn
f9dcc31843
Merge pull request #3374 from getchoo-contrib/ci/fix-nix-out-paths 
Fix Nix workflow
 2025-02-02 17:18:03 -05:00
Seth Flynn
989e6c6cb6
ci: directly print nix out paths to step summary 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-02-01 22:55:39 -05:00
Seth Flynn
138684a84f
Revert "ci: add nix out paths to job summary" 
This reverts commit 588e0d6305e673fc4e5eceebfe2692d30b8e876a.

Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-02-01 22:54:26 -05:00
github-actions[bot]
faf7e6b06e chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/825479c345a7f806485b7f00dbe3abb50641b083?narHash=sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU%3D' (2025-01-24)
  → 'github:NixOS/nixpkgs/3a228057f5b619feb3186e986dbe76278d707b6e?narHash=sha256-xvTo0Aw0%2Bveek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc%3D' (2025-02-01)
 2025-02-02 00:24:39 +00:00
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
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