Trial97
|
bc2940e16a
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-08 00:14:05 +03:00 |
|
Tayou
|
1131038fdb
|
Merge pull request #1120 from Trial97/visit_mod_page
|
2023-07-07 22:23:59 +02:00 |
|
seth
|
d1528c1044
|
Merge pull request #1325 from Scrumplex/validate-meta-url
Validate Meta URL
|
2023-07-07 14:31:22 -04:00 |
|
Sefa Eyeoglu
|
51e62761ee
|
fix: improve QUrl construction
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-07-07 19:25:12 +02:00 |
|
TheKodeToad
|
b8482a5d89
|
Update ModFolderPage.cpp
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-07 15:53:50 +01:00 |
|
Trial97
|
3139af8487
|
Made action text simpler
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-07 17:12:10 +03:00 |
|
Sefa Eyeoglu
|
6fcdac0d36
|
fix: reset invalid meta url on launch
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-07-07 15:57:25 +02:00 |
|
Sefa Eyeoglu
|
073cb91f88
|
fix(ui): validate meta override url
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-07-07 15:56:07 +02:00 |
|
Sefa Eyeoglu
|
e225a72180
|
Merge pull request #1128 from pandaninjas/fix-implicit-fallthrough
|
2023-07-07 15:19:00 +02:00 |
|
Trial97
|
93870c315f
|
better url handling
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-06 18:46:59 +03:00 |
|
PandaNinjas
|
13d67c6524
|
Keep formatting consistent
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
|
2023-07-06 08:51:42 -04:00 |
|
seth
|
2cb22ad280
|
Merge pull request #1310 from getchoo/autoupdate-flake
feat(actions): add update-flake-lock
|
2023-07-05 23:25:12 +00:00 |
|
Sefa Eyeoglu
|
5ba13297c6
|
Merge pull request #1284 from Ryex/fix/properly-track-failed-copies-and-clones
|
2023-07-05 19:26:07 +02:00 |
|
seth
|
24b9ed106f
|
feat(actions): add update-flake-lock
Signed-off-by: seth <getchoo@tuta.io>
|
2023-07-04 18:49:22 -04:00 |
|
seth
|
7c8a010378
|
Merge pull request #1304 from Scrumplex/chore-flake-update-1
flake.lock: Update
|
2023-07-04 22:43:00 +00:00 |
|
PandaNinjas
|
817ecf8225
|
Fix VersionProxyModel.cpp
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
|
2023-07-04 17:19:08 -04:00 |
|
PandaNinjas
|
4509fde410
|
Merge branch 'develop' into fix-implicit-fallthrough
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
|
2023-07-04 16:41:34 -04:00 |
|
PandaNinjas
|
34cf28712c
|
Replace break with return true;
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
|
2023-07-04 16:39:24 -04:00 |
|
PandaNinjas
|
1fbc17d275
|
Remove break and add fallthrough comment in WorldListPage.cpp
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
|
2023-07-04 16:38:04 -04:00 |
|
Tayou
|
dedc9e4edc
|
Merge pull request #1127 from Trial97/scale_cat
|
2023-07-03 15:46:56 +02:00 |
|
Sefa Eyeoglu
|
14692eed40
|
flake.lock: Update
Flake lock file updates:
• Updated input 'flake-parts':
'github:hercules-ci/flake-parts/006c75898cf814ef9497252b022e91c946ba8e17' (2023-05-08)
→ 'github:hercules-ci/flake-parts/267149c58a14d15f7f81b4d737308421de9d7152' (2023-07-01)
• Updated input 'flake-parts/nixpkgs-lib':
'github:NixOS/nixpkgs/da45bf6ec7bbcc5d1e14d3795c025199f28e0de0?dir=lib' (2023-04-30)
→ 'github:NixOS/nixpkgs/4bc72cae107788bf3f24f30db2e2f685c9298dc9?dir=lib' (2023-06-29)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/aeb75dba965e790de427b73315d5addf91a54955' (2023-05-25)
→ 'github:nixos/nixpkgs/cd99c2b3c9f160cd004318e0697f90bbd5960825' (2023-07-01)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/61e567d6497bc9556f391faebe5e410e6623217f' (2023-05-23)
→ 'github:cachix/pre-commit-hooks.nix/42587d3414d1747999a5f71e92a83cf6547b62da' (2023-07-03)
• Updated input 'pre-commit-hooks/flake-utils':
'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02)
→ 'github:numtide/flake-utils/a1720a10a6cfe8234c0e93907ffe81be440f4cef' (2023-05-31)
• Added input 'pre-commit-hooks/flake-utils/systems':
'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09)
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-07-03 14:27:02 +02:00 |
|
Trial97
|
f0aab541f8
|
fixed typo
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-03 15:09:35 +03:00 |
|
Trial97
|
026293f773
|
updated option text
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-03 14:17:39 +03:00 |
|
TheKodeToad
|
43e6f05ed5
|
Merge pull request #1232 from telans/screenshots-update
ScreenshotsPage fixes
|
2023-07-02 16:44:54 +01:00 |
|
Trial97
|
cf2393a509
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings
|
2023-07-02 15:56:39 +03:00 |
|
Sefa Eyeoglu
|
b51f1f1d41
|
Merge pull request #1298 from TurboWafflz/develop
|
2023-07-02 09:52:59 +02:00 |
|
Finian Wright
|
3fe518ff2b
|
Fix compiling on OpenBSD
Signed-off-by: Finian Wright <turbowafflz@gmail.com>
|
2023-07-02 00:36:21 -04:00 |
|
seth
|
c523765c19
|
Merge pull request #1292 from Trial97/export5
Removed logs from instance export
|
2023-07-01 04:14:35 +00:00 |
|
Trial97
|
18e628e873
|
removed extra condition
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-30 12:10:00 +03:00 |
|
Trial97
|
81207c6502
|
Made sure the logs are ignored when collecting files
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-30 10:52:10 +03:00 |
|
Trial97
|
87efa700ab
|
Removed logs from instance export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-30 00:01:36 +03:00 |
|
Trial97
|
0008b22d8b
|
Renamed function
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-28 18:41:47 +03:00 |
|
Trial97
|
8f9bd9617f
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into scale_cat
|
2023-06-28 18:29:04 +03:00 |
|
Trial97
|
0f64ee6a5f
|
Added warnings for running instances
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-28 18:28:25 +03:00 |
|
Trial97
|
c23bf2fd22
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings
|
2023-06-28 17:46:01 +03:00 |
|
Sefa Eyeoglu
|
faec21d572
|
Merge pull request #1266 from TheKodeToad/smol-tweaks
|
2023-06-28 08:47:53 +02:00 |
|
seth
|
213f03351f
|
Merge pull request #1280 from Trial97/shortcut
Fixed illegal characters in shortcuts name
|
2023-06-27 20:01:48 +00:00 |
|
Rachel Powers
|
00be211169
|
Update launcher/FileSystem.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-06-27 13:01:28 -07:00 |
|
seth
|
90fc720190
|
Merge pull request #1281 from Trial97/screenshot
Added more information to the screenshot upload warning
|
2023-06-27 20:01:18 +00:00 |
|
Rachel Powers
|
23b3711f96
|
fix(filesystem): track failed copies and clones
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-06-27 12:41:36 -07:00 |
|
Trial97
|
54cb077b40
|
Added more information to the screenshot upload warning
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-27 19:31:36 +03:00 |
|
Trial97
|
92847b9774
|
omit icon remove on macos
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-27 19:15:20 +03:00 |
|
Trial97
|
6e5716f097
|
Fixed illegal characters in shortcuts name
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-27 19:05:32 +03:00 |
|
TheKodeToad
|
904b128afe
|
Merge pull request #1277 from Trial97/remove_mojang
Removed unused files
|
2023-06-26 23:09:27 +01:00 |
|
Trial97
|
dffffc784e
|
Removed unused files
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-26 22:33:10 +03:00 |
|
Sefa Eyeoglu
|
d25452a64e
|
Merge pull request #1274 from TheKodeToad/java-signature
|
2023-06-26 11:19:53 +02:00 |
|
Sefa Eyeoglu
|
41d0f74750
|
Merge pull request #1275 from Scrumplex/git-blame-ignore
|
2023-06-26 10:56:26 +02:00 |
|
Sefa Eyeoglu
|
f8f1c3cf23
|
chore: add Git Blame ignore file
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-06-26 09:08:03 +02:00 |
|
Sefa Eyeoglu
|
ed4dce2fb6
|
fix: install logo to multimc theme in genicons.sh
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-06-26 08:59:48 +02:00 |
|
Sefa Eyeoglu
|
4d49486cc9
|
Merge pull request #1065 from leo78913/gamescope-close-button
|
2023-06-26 08:45:28 +02:00 |
|