391 Commits

Author SHA1 Message Date
TheKodeToad
9ae16921bc
Remove BasicFolderLoadTask
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-30 21:10:43 +00:00
TheKodeToad
d49e6187cd
Make requested changes
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-29 17:17:51 +00:00
TheKodeToad
d157159106
Fix license headers and formatting
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-28 22:29:43 +00:00
TheKodeToad
f3cae427f1
Fix tests (make them green)
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-28 21:09:45 +00:00
TheKodeToad
ad1d5ddcdf
Revert unwise refactor
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-28 20:42:59 +00:00
TheKodeToad
2b22a1aebe
Reimplement View Homepage
I removed it for some reason, but now it's back for all pages!

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-28 20:14:56 +00:00
TheKodeToad
354a0ed46e
Fix column sizes
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-28 18:01:01 +00:00
TheKodeToad
5eff9b0934
Fix column crashes
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-24 01:23:11 +01:00
TheKodeToad
89a327d363
Merge remote-tracking branch 'upstream/develop' into resource-meta
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-23 14:19:07 +01:00
Trial97
562c301326
skip QSaveFile temprary files
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-22 01:22:31 +03:00
Trial97
2030041fcc
Fix tests segfault
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-19 21:42:14 +03:00
Rachel Powers
09c9da268f
fix: prevent inf recursion when mod icon load fails; cut max pixmapcache to 1/4 previous value
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2024-10-11 13:26:20 -07:00
TheKodeToad
3fae659b30
Merge remote-tracking branch 'upstream/develop' into resource-meta
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-08 17:15:42 +01:00
Trial97
af65eb17cf
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-05 11:54:58 +03:00
Trial97
d5c5f5d4fc
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-07-24 11:47:45 +03:00
Trial97
2c0b17d107
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-07-24 11:40:23 +03:00
Alexandru Ionut Tripon
69c55d90ce
Merge pull request #2558 from Trial97/update_filters
Resolve issue with multiple loaders during mod update
2024-07-19 15:46:15 +03:00
Trial97
06add2b0a8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_filters
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-28 20:55:16 +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
55f740453c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 2024-06-28 20:34:59 +03:00
Trial97
72dd3dfba5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-28 20:30:05 +03:00
Trial97
09d258670a
create mod meta information when importing curseforge pack
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-28 19:26:11 +03:00
Trial97
147741e616
increment clang-tools version
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-28 12:48:52 +03:00
seth
3f3351f89e
Merge pull request #1892 from Trial97/change_version
Added mod reinstall dialog
2024-06-27 02:12:00 +00:00
Trial97
00b83efb9a
fix build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-24 20:12:40 +03:00
Alexandru Ionut Tripon
8014283bf4
Merge pull request #2536 from Trial97/refactor_hash
Refactor hash task
2024-06-18 22:55:32 +03:00
Alexandru Ionut Tripon
5f3d3c3294
Merge pull request #2534 from DioEgizio/dataresourceupdate
fix: update datapack and resourcepack versions
2024-06-18 21:06:31 +03:00
DioEgizio
a63842c727 fix: add more datapack formats and clang-format it
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2024-06-18 18:05:34 +02:00
Trial97
766ddc80e3
refactored hassing task
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-18 16:51:26 +03:00
DioEgizio
c07e791d7f chore: clang-format ResourcePack.cpp
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2024-06-18 10:17:48 +02:00
DioEgizio
6af52c97c2 fix: update datapack and resourcepack versions
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2024-06-18 09:47:07 +02:00
Cart
c9827f8085
Spelling mistake
in m_column_names and translated it is Miecraft and not Minecraft

Signed-off-by: Cart <81428538+Cartrigger@users.noreply.github.com>
2024-06-17 23:12:07 -04:00
Trial97
5fbbdb9707
fix merge issues
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-16 00:31:31 +03:00
Trial97
f1d1c9e22c
forget sort keys
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-15 11:06:20 +03:00
Trial97
a121bfbb15
add size back to texture view
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-15 10:43:21 +03:00
Trial97
8cdaf5d05f
fix tests
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 23:27:27 +03:00
Trial97
1a84dc9bca
no need for extra exist check
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 22:47:42 +03:00
Trial97
b872f88617
do not double rename
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 22:46:39 +03:00
Trial97
d2510b851b
mark files as duplicate
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 22:45:15 +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
6607c3bfa4
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-10 09:04:09 +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
Alexandru Ionut Tripon
55b6490530
Merge pull request #1617 from cullvox/components-resource-pack-fix
added functionality for components in resource pack descriptions.
2024-06-09 16:03:19 +03:00
Trial97
5a598db608
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 2024-05-18 17:40:54 +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