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
7,559 Commits 10 Branches 38 Tags
Commit Graph

7559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
github-actions[bot]
1b89c63ad4 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/6e2f00c83911461438301db0dba5281197fe4b3a' (2024-02-17)
  → 'github:nixos/nixpkgs/f63ce824cd2f036216eb5f637dfef31e1a03ee89' (2024-02-24)
 2024-02-25 00:18:54 +00:00
Sefa Eyeoglu
1cdb9bd5af
Merge pull request #2141 from crpz1/welcome_label_consistency 2024-02-22 12:36:00 +01:00
seth
02340f19a5
Merge pull request #2152 from PrismLauncher/getchoo-patch-1 
ci: fix permissions for backport workflow
 2024-02-22 06:15:57 -05:00
seth
f747ae949c
ci: fix permissions for backport workflow 
Signed-off-by: seth <getchoo@tuta.io>
 2024-02-22 06:13:27 -05:00
Sefa Eyeoglu
bff8d7220d
Merge pull request #2150 from DioEgizio/fix-ghactions-macos 2024-02-22 11:02:09 +01:00
DioEgizio
4421746c0e fix: fix sparkle signing 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-02-22 10:00:21 +01:00
DioEgizio
01c4e6a65c
Merge pull request #2137 from DioEgizio/zink 2024-02-21 17:42:11 +01:00
crpz1
9aa81cf005 Use empty list label code for welcome screen 
Signed-off-by: crpz1 <8588315+crpz1@users.noreply.github.com>
 2024-02-20 00:21:37 +11:00
DioEgizio
44327980db feat: add "use zink" button 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-02-18 13:30:55 +01:00
DioEgizio
99cbb5d0b2
Merge pull request #2110 from Trial97/fix_curseforge 2024-02-18 12:42:09 +01:00
DioEgizio
dbdd96edc3
Merge pull request #2130 from DioEgizio/updates 2024-02-18 12:41:49 +01:00
Sefa Eyeoglu
976f5f10cf
Merge pull request #2132 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-02-18 09:38:24 +01:00
github-actions[bot]
54bfbe562e chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/442d407992384ed9c0e6d352de75b69079904e4e' (2024-02-09)
  → 'github:nixos/nixpkgs/6e2f00c83911461438301db0dba5281197fe4b3a' (2024-02-17)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/0db2e67ee49910adfa13010e7f012149660af7f0' (2024-02-07)
  → 'github:cachix/pre-commit-hooks.nix/5df5a70ad7575f6601d91f0efec95dd9bc619431' (2024-02-15)
 2024-02-18 00:18:59 +00:00
seth
599a08d309
Merge pull request #2126 from TheComputerGuy96/mr/mangohud-fix 
Use absolute path to load MangoHUD library
 2024-02-16 19:57:12 -05:00
DioEgizio
25b69b4c0d fix: fix sparkle hash 
:/ oops

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-02-16 17:29:49 +01:00
DioEgizio
94b48e9702 fix: remove cmark_static 
cmark 0.31 removed CMARK_STATIC/CMARK_SHARED and replaced it with the native cmake BUILD_SHARED_LIBS

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-02-16 17:06:28 +01:00
DioEgizio
5d36067c74 chore: update libraries 
updated qt to 6.6.2
updated some submodules
updated sparkle framework to the latest version

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-02-16 16:21:53 +01:00
Echo J
01180c20e1 Use absolute path to load MangoHUD library 
This should finally fix the Arch Linux Java symbol issue with MangoHUD
enabled: https://bugs.archlinux.org/task/77183

Signed-off-by: Echo J <tcg96nougat@gmail.com>
 2024-02-14 10:11:49 +02:00
Sefa Eyeoglu
e738b78044
Merge pull request #2112 from TheKodeToad/log-performance 2024-02-13 09:15:47 +01:00
Sefa Eyeoglu
b02eef9358
Merge pull request #2116 from TheKodeToad/use-after-free 2024-02-13 09:14:34 +01:00
TheKodeToad
8cf2a04f31
Fix formatting issues 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-02-12 15:24:56 +00:00
TheKodeToad
7f4c74ffbe
Fix immediate free in Exception.h 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-02-11 22:16:03 +00:00
Trial97
fdaaee64d1
Fixed curseforge neoforge export for 1.20.1 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-11 21:49:28 +02:00
TheKodeToad
ff989b4305
Fix ResourceModel error display 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-02-11 15:43:36 +00:00
TheKodeToad
ded77e6183
Fix NetJob use-after-free 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-02-11 15:43:36 +00:00
Sefa Eyeoglu
b0b77c2178
Merge pull request #2114 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-02-11 09:57:06 +01:00
github-actions[bot]
0f254c8425 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/79a13f1437e149dc7be2d1290c74d378dad60814' (2024-02-03)
  → 'github:nixos/nixpkgs/442d407992384ed9c0e6d352de75b69079904e4e' (2024-02-09)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf' (2024-01-28)
  → 'github:cachix/pre-commit-hooks.nix/0db2e67ee49910adfa13010e7f012149660af7f0' (2024-02-07)
 2024-02-11 00:19:31 +00:00
Alexandru Ionut Tripon
29bf6cc68c
Update launcher/modplatform/flame/FlameInstanceCreationTask.cpp 
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2024-02-10 23:15:26 +02:00
Trial97
830ce246e1
Fixed curseforge neoforge import for 1.20.1 versions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-10 13:48:02 +02:00
TheKodeToad
7cac8ad2b4
Use QTextFragment for inserting log lines 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-02-06 20:42:18 +00:00
Sefa Eyeoglu
6935c0dc3b
Merge pull request #2089 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-02-04 10:01:20 +01:00
github-actions[bot]
15670cc27b chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/07f6395285469419cf9d078f59b5b49993198c00' (2024-01-11)
  → 'github:hercules-ci/flake-parts/b253292d9c0a5ead9bc98c4e9a26c6312e27d69f' (2024-02-01)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/4fddc9be4eaf195d631333908f2a454b03628ee5' (2024-01-25)
  → 'github:nixos/nixpkgs/79a13f1437e149dc7be2d1290c74d378dad60814' (2024-02-03)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/f56597d53fd174f796b5a7d3ee0b494f9e2285cc' (2024-01-20)
  → 'github:cachix/pre-commit-hooks.nix/7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf' (2024-01-28)
 2024-02-04 00:19:10 +00:00
Tayou
5d223f6f93
Merge pull request #2050 from TheKodeToad/default-game-dir 
Use `minecraft` instead of `.minecraft` for better accessibility
 2024-02-01 18:16:14 +01:00
seth
b0a473a5ce
Merge pull request #2073 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-01-27 23:34:12 -05:00
github-actions[bot]
901cc4e4dd chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/e5d1c87f5813afde2dda384ac807c57a105721cc' (2024-01-19)
  → 'github:nixos/nixpkgs/4fddc9be4eaf195d631333908f2a454b03628ee5' (2024-01-25)
 2024-01-28 00:19:08 +00:00
Alexandru Ionut Tripon
cff2f4b6ff
Merge pull request #2070 from PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x 
chore(deps): update hendrikmuhs/ccache-action action to v1.2.12
 2024-01-26 09:57:49 +02:00
renovate[bot]
ab4974629c
chore(deps): update hendrikmuhs/ccache-action action to v1.2.12 2024-01-26 07:12:13 +00:00
Alexandru Ionut Tripon
1c3d63981b
Merge pull request #2063 from DioEgizio/no-alpha-mr 
fix: remove alpha notice on modrinth packs
 2024-01-24 18:13:15 +02:00
DioEgizio
8de1060bfb fix: remove alpha notice on modrinth packs 
with the modrinth app being released for quite a while now it's weird to still have this (tbh they've never been truly alpha)

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2024-01-24 16:43:38 +01:00
seth
1075a94034
Merge pull request #2040 from getchoo/nix/filesets 
[Linux/MacOS] Replace nix-filter with lib.fileset
 2024-01-24 03:05:30 -05:00
seth
8312713dc2
refactor(nix): nix-filter -> lib.fileset 
with our own use of `map`, this is basically a drop-in replacement for
nix-filter, but already in nixpkgs!

Signed-off-by: seth <getchoo@tuta.io>
 2024-01-23 16:10:41 -05:00
Sefa Eyeoglu
7bce88e83e
Merge pull request #2060 from PrismLauncher/renovate/korthout-backport-action-2.x 2024-01-23 20:45:36 +01:00
renovate[bot]
72e6218df9
chore(deps): update korthout/backport-action action to v2.4.1 2024-01-23 19:21:30 +00:00
Sefa Eyeoglu
e60235cb88
Merge pull request #2053 from Trial97/fix_open_path_take_two 2024-01-23 09:29:57 +01:00
Sefa Eyeoglu
913f6d8563
Merge pull request #2052 from PrismLauncher/renovate/korthout-backport-action-2.x 2024-01-22 22:32:38 +01:00
Trial97
12bf913764
Fixed open path a second time 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-22 20:36:57 +02:00
renovate[bot]
0dc4a10f48
chore(deps): update korthout/backport-action action to v2.4.0 2024-01-22 17:26:37 +00:00
Sefa Eyeoglu
78482d0d3e
Merge pull request #2049 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-01-21 08:28:49 +01:00
TheKodeToad
f54ac25614
Use minecraft instead of .minecraft for better accessibility 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-01-21 02:28:55 +00:00
github-actions[bot]
c7cd8b7877 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nix-filter':
    'github:numtide/nix-filter/c843418ecfd0344ecb85844b082ff5675e02c443' (2023-12-04)
  → 'github:numtide/nix-filter/3449dc925982ad46246cfc36469baf66e1b64f17' (2024-01-15)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/eabe8d3eface69f5bb16c18f8662a702f50c20d5' (2024-01-09)
  → 'github:nixos/nixpkgs/e5d1c87f5813afde2dda384ac807c57a105721cc' (2024-01-19)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/274ae3979a0eacae422e1bbcf63b8b7a335e1114' (2024-01-12)
  → 'github:cachix/pre-commit-hooks.nix/f56597d53fd174f796b5a7d3ee0b494f9e2285cc' (2024-01-20)
• Updated input 'pre-commit-hooks/flake-utils':
    'github:numtide/flake-utils/a1720a10a6cfe8234c0e93907ffe81be440f4cef' (2023-05-31)
  → 'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04)
• Updated input 'pre-commit-hooks/gitignore':
    'github:hercules-ci/gitignore.nix/a20de23b925fd8264fd7fad6454652e142fd7f73' (2022-08-14)
  → 'github:hercules-ci/gitignore.nix/43e1aa1308018f37118e34d3a9cb4f5e75dc11d5' (2023-12-29)
 2024-01-21 00:20:26 +00:00