Evan Goode
|
491cb1e5a2
|
Merge remote-tracking branch 'prismlauncher/release-9.x' into develop
|
2025-01-12 12:46:48 -06:00 |
|
Luna
|
41e90afbab
|
Revert "Merge in Changes from Prism 9.2"
This reverts commit b4b9051793.
|
2025-01-11 14:19:46 -06:00 |
|
Luna
|
b4b9051793
|
Merge in Changes from Prism 9.2
|
2025-01-11 13:58:12 -06:00 |
|
Trial97
|
2030041fcc
|
Fix tests segfault
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-10-19 21:42:14 +03:00 |
|
Trial97
|
ddf1ea014c
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod
|
2024-06-28 20:39:37 +03:00 |
|
Trial97
|
147741e616
|
increment clang-tools version
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-28 12:48:52 +03:00 |
|
Trial97
|
2d51008304
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod
|
2024-06-14 21:05:11 +03:00 |
|
Trial97
|
2ffabbdc6d
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-10 10:00:52 +03:00 |
|
Trial97
|
29d32f0d9a
|
Update size order for folders
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-10 00:18:21 +03:00 |
|
Trial97
|
242ddbb7e1
|
fix size column sorting
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-09 23:53:40 +03:00 |
|
Trial97
|
34e1a5e660
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size
|
2024-06-09 22:18:40 +03:00 |
|
Trial97
|
6a99312df5
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2024-06-09 19:57:16 +03:00 |
|
Trial97
|
5bd28e2cc8
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2024-05-18 17:11:41 +03:00 |
|
Trial97
|
e42dfbc391
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod
|
2024-05-18 17:02:10 +03:00 |
|
Trial97
|
477d1408ad
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size
|
2024-05-18 16:53:14 +03:00 |
|
Trial97
|
ba947993c2
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
|
2024-05-18 12:47:01 +03:00 |
|
Trial97
|
031a9f4738
|
Replaced QFile::remove with FS::deletePath
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-02-10 11:03:51 +02:00 |
|
Trial97
|
2db5677281
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2023-11-23 23:57:44 +02:00 |
|
Trial97
|
e0d776e551
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod
|
2023-11-23 23:29:10 +02:00 |
|
Trial97
|
b47ec7f2dc
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size
|
2023-11-23 17:14:50 +02:00 |
|
Trial97
|
2318a83881
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader
|
2023-11-23 16:33:57 +02:00 |
|
Sefa Eyeoglu
|
a966289944
|
Merge pull request #1852 from Trial97/war_ning
|
2023-11-23 11:01:53 +01:00 |
|
Trial97
|
f18f7147b5
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into war_ning
|
2023-11-23 10:44:49 +02:00 |
|
Sefa Eyeoglu
|
b42434bcb6
|
Merge remote-tracking branch 'upstream/develop' into const-in-declarations
|
2023-11-23 09:06:23 +01:00 |
|
Trial97
|
85b4e1f24f
|
Made column hidden by default
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-22 19:23:24 +02:00 |
|
Trial97
|
26931475ae
|
made folder size reflect the number of elements
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-19 15:58:30 +02:00 |
|
Trial97
|
6b777653a5
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-17 22:38:17 +02:00 |
|
Trial97
|
4d93f4adb1
|
Fixed folder size
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-15 12:10:47 +02:00 |
|
Trial97
|
890965746f
|
Added warning on mods update while running
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-15 11:07:46 +02:00 |
|
Trial97
|
361329d5d1
|
Made resource columns resizable
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-14 23:21:53 +02:00 |
|
Trial97
|
463608b289
|
fixed shader packs detection
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-10 19:37:11 +02:00 |
|
Trial97
|
3cbc63bb9f
|
added size column
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-02 12:18:24 +02:00 |
|
LocalSpook
|
0de4d8902e
|
Remove top-level const qualifiers in function declarations
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
|
2023-10-28 22:12:09 -07:00 |
|
Trial97
|
3d84635b24
|
Remove file on mod duplication
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-26 20:09:12 +03:00 |
|
Trial97
|
cf27d2f9ab
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 12:49:21 +03:00 |
|
Sefa Eyeoglu
|
91ba4cf75e
|
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-14 18:16:53 +02:00 |
|
Sefa Eyeoglu
|
ef6f9487f4
|
Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings
|
2023-08-10 20:38:32 +02:00 |
|
Sefa Eyeoglu
|
2090f958c8
|
Merge pull request #1324 from leia-uwu/ui-tweaks
|
2023-08-10 12:24:41 +02:00 |
|
Trial97
|
b2fdd83594
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-05 19:09:10 +03:00 |
|
Sefa Eyeoglu
|
1d468ac35a
|
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-02 18:35:35 +02:00 |
|
Trial97
|
149b6d59cf
|
fixed tests
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 23:22:11 +03:00 |
|
Trial97
|
db9f5f44e0
|
Split in two the options
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 22:26:22 +03:00 |
|
Rachel Powers
|
520594e529
|
Merge branch 'develop' into chore/add-compiler-warnings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-13 20:05:16 -07:00 |
|
seth
|
640aaa8c23
|
Merge pull request #1331 from TheKodeToad/hungry-trash
Fix updating trashing resources
|
2023-07-10 16:31:43 -04:00 |
|
TheKodeToad
|
0c6362f28d
|
Make trash hungry
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-08 18:51:28 +01:00 |
|
leo78913
|
d1cceac7d1
|
disable hiding enable and name columns on folder models
Signed-off-by: leo78913 <leo3758@riseup.net>
|
2023-07-07 12:37:24 -03:00 |
|
Rachel Powers
|
8d7dcdfc5b
|
chore: fix shadowed member and signed/unsigned mismatch
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: supress unused with [[maybe_unused]]
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: unshadow ^&^& static_cast implicit return
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: deshadow and mark unused in parse task
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: mark unused in folder models
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: deshadow and mark unused with instances
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: more deshadow and unused
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: remove uneeded simicolons
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: mark unused
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: prevent shadow
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-01 23:39:38 -07: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 |
|
Trial97
|
0d2105dec4
|
Made buttons on ModsFolderPage enabled all the time
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-21 21:34:40 +03:00 |
|