Rachel Powers
|
9499066375
|
Merge pull request #1350 from Trial97/fix_managed_pack_crash
fixed crash if no version is loaded on managed page
|
2023-07-12 09:55:31 -07:00 |
|
Sefa Eyeoglu
|
06a7d447f6
|
Merge pull request #1333 from Ryex/fix/null_instance_edit_crash
|
2023-07-12 15:53:46 +02:00 |
|
Trial97
|
766e833a73
|
fixed crash if no version is loaded
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-12 16:25:05 +03:00 |
|
seth
|
640aaa8c23
|
Merge pull request #1331 from TheKodeToad/hungry-trash
Fix updating trashing resources
|
2023-07-10 16:31:43 -04:00 |
|
Rachel Powers
|
1aa5fa03f9
|
Update launcher/ui/MainWindow.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-10 12:05:01 -07:00 |
|
Nathan
|
99ba02afb6
|
Shortcuts on macOS (#1081)
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-10 20:26:25 +02:00 |
|
TheKodeToad
|
9aedb5afff
|
Merge pull request #1334 from TheKodeToad/litemod-dl
LiteMod downloading
|
2023-07-10 16:42:38 +01:00 |
|
TheKodeToad
|
91c9082d19
|
Merge pull request #1249 from Trial97/curse
Curseforge modpack export
|
2023-07-10 14:20:29 +01:00 |
|
TheKodeToad
|
4f4ccdaa59
|
Merge pull request #1338 from Trial97/unlockVersionPage
feat:unlocked versions page
|
2023-07-10 13:06:32 +01:00 |
|
Rachel Powers
|
01e058d8c1
|
Merge pull request #1337 from getchoo/fix-flake-workflow
fix(actions): give update-flake content write perms
|
2023-07-09 14:11:33 -07:00 |
|
TheKodeToad
|
f816e3cd3f
|
Merge pull request #1241 from Trial97/settings
Allow editing of running instances
|
2023-07-09 22:10:43 +01:00 |
|
Rachel Powers
|
49109b9213
|
Merge pull request #1332 from TheKodeToad/widebar-pain
Fix crash when editing instance and prevent similar crashes in future
|
2023-07-09 14:07:34 -07:00 |
|
Rachel Powers
|
d43399c2b4
|
Merge pull request #1321 from TheKodeToad/mr-optional
Optional mods in mrpack export
|
2023-07-09 14:03:47 -07:00 |
|
Trial97
|
308877aa8f
|
removed redundant code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-09 23:18:38 +03:00 |
|
Trial97
|
159f14c076
|
feat:unlocked versions page
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-09 22:47:38 +03:00 |
|
seth
|
8e4de055b8
|
chore(actions): only run update-flake in our repo
Signed-off-by: seth <getchoo@tuta.io>
|
2023-07-09 15:43:54 -04:00 |
|
TheKodeToad
|
6e2fcc9e11
|
Replace string manipulation in favour of QFileInfo
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-09 12:08:15 +01:00 |
|
seth
|
0d31e31282
|
fix(actions): give update-flake content write perms
Signed-off-by: seth <getchoo@tuta.io>
|
2023-07-09 01:56:21 -04:00 |
|
TheKodeToad
|
d53d58a5d4
|
LiteMod downloading
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-08 22:16:43 +01:00 |
|
Rachel Powers
|
a54bbae622
|
fix(instance edit): don't allow editing if no selected instance or instance doesn't support editing
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-08 12:59:55 -07:00 |
|
TheKodeToad
|
08c140b9b4
|
Fix actionVisitItemPage insersion, and prevent widebar segfault
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-08 20:55:30 +01:00 |
|
TheKodeToad
|
0c6362f28d
|
Make trash hungry
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-08 18:51:28 +01:00 |
|
seth
|
67d473aab7
|
Merge pull request #1329 from Ryex/fix/progress_dialog_centering
fix(progress dialog): if there is a parent center on creation
|
2023-07-08 07:50:13 -04:00 |
|
Rachel Powers
|
20c781b23b
|
fix(progress dialog): if there is a parent center on creation
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-08 02:28:37 -07:00 |
|
Rachel Powers
|
3211b265d7
|
Merge pull request #1302 from Ryex/fix/progress-dialog-segfault
fix: segfault in progress dialog
|
2023-07-07 21:25:14 -07:00 |
|
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 |
|
TheKodeToad
|
8ae67b84db
|
Optional mods in mrpack export
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-06 20:04:26 +01: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 |
|
Trial97
|
908ac813e0
|
escaped modlist inner html
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-04 15:16:54 +03:00 |
|
Tayou
|
dedc9e4edc
|
Merge pull request #1127 from Trial97/scale_cat
|
2023-07-03 15:46:56 +02:00 |
|
Trial97
|
fa7cfc77d8
|
fixed template
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-03 16:08:20 +03: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 |
|