TheKodeToad
8a3aba1634
Fix Open Global Settings, why not
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-24 23:30:51 +01:00
TheKodeToad
bb8e6ef35e
Fix flat white launcher icon
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-24 23:27:01 +01:00
TheKodeToad
529e2054ea
A few tweaks, with inspiration from Zeke :3
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-24 23:26:27 +01:00
TheKodeToad
bcf45c74a1
Merge pull request #986 from Trial97/develop
...
Mod dependencies
2023-06-24 14:04:27 +01:00
Trial97
8b576fd2bd
Added translation
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-24 15:59:55 +03:00
Trial97
7fdd68d768
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
2023-06-24 15:58:55 +03:00
Sefa Eyeoglu
df6d46de9e
Merge pull request #1261 from telans/modrinthexport-url
2023-06-24 10:51:14 +02:00
Rachel Powers
4322222acc
Merge pull request #1255 from Trial97/export4
...
Added Thumbs.db to excluded files in MrPackExport
2023-06-23 21:40:55 -07:00
seth
cce6a54701
Merge pull request #1258 from leo78913/resources-pack-page-crash-fix
...
fix: fix crash when hiding columns on resource packs page
2023-06-24 00:39:47 -04:00
Rachel Powers
68865353cf
Merge pull request #1259 from PrismLauncher/update-devs
...
Update developers
2023-06-23 21:38:16 -07:00
James Beddek
20ba6e5fb5
modrinth: use encoded url when exporting pack
...
Ensures that necessary url components such as spaces are encoded.
Prevents an error when submitting the resulting file to modrinth.
See https://discord.com/channels/734077874708938864/1120070731242410024
Fixes : #1226
Signed-off-by: James Beddek <telans@posteo.de>
2023-06-24 15:42:58 +12:00
TheKodeToad
d74a23d5b2
Update developers
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-23 21:00:55 +01:00
leo78913
750209b8bb
fix: fix crash when hiding columns on resource packs page
...
Signed-off-by: leo78913 <leo3758@riseup.net>
2023-06-23 16:55:51 -03:00
TheKodeToad
741c23a72a
Merge pull request #1256 from Trial97/fix11
...
Fixed hashers
2023-06-23 19:53:44 +01:00
Trial97
28de461067
Fixed hashers
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-23 21:38:41 +03:00
Trial97
69c709b05a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-23 20:01:17 +03:00
Rachel Powers
046d510134
Merge pull request #1200 from Trial97/net_job_crash
...
Made ByteSynkArray to use shared_ptr
2023-06-23 09:13:52 -07:00
Trial97
85bbab0e92
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash
2023-06-23 14:38:30 +03:00
Trial97
67db141203
Renamed getResults to resultsReady
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-23 14:38:23 +03:00
Trial97
763b3c3236
Added Thumbs.db to excluded files in MrPackExport
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-23 10:38:26 +03:00
seth
8df5ab8aa7
Merge pull request #1251 from getchoo/github-clarify
...
chore: add 'suggest a feature' message in help
2023-06-22 17:13:00 -04:00
seth
83efdccfe1
Merge pull request #1252 from getchoo/import-hehe
...
chore: avoid confusion in file/url import dialog
2023-06-22 17:12:35 -04:00
Rachel Powers
f1ebec641a
Merge pull request #1058 from Ryex/feature/images-for-resource-page
...
Feature: image coumn for Mod, Resource Pack, and Texturepack pages
2023-06-22 13:26:47 -07:00
seth
a4521ac0bb
chore: avoid confusion in file/url import dialog
...
Signed-off-by: seth <getchoo@tuta.io>
2023-06-22 16:15:03 -04:00
Tayou
c5f16276d7
Merge pull request #1235 from ChrisLane/java-check-debug-msg-fix
2023-06-22 22:03:30 +02:00
seth
03361e51ef
chore: add 'suggest a feature' message in help
...
Signed-off-by: seth <getchoo@tuta.io>
2023-06-22 15:58:53 -04:00
Sefa Eyeoglu
05a8232a8f
Merge pull request #1243 from Trial97/export
...
Added regex expresion to exclude .DS_Store files
2023-06-22 08:09:31 +02:00
Trial97
2e82c1d40c
Added regex expresion to exclude .DS_Store files
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-21 23:22:25 +03:00
TheKodeToad
0975dbc3dd
Merge pull request #1228 from Trial97/curent_pack_crash
...
Fixes #1212
2023-06-21 15:35:09 +01:00
DioEgizio
8aa02320e0
Merge pull request #1231 from telans/modrinth-default-icon
...
Modrinth: use default icon for non-managed packs
2023-06-21 12:25:26 +02:00
Rachel Powers
470518eb3a
fix: resize columns on hide ^& uniform heights
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-21 02:31:40 -07:00
seth
ca659136e2
Merge pull request #1119 from Trial97/mods_txt
...
Added dynamic page extra info
2023-06-20 19:56:38 -04:00
seth
f1a6dc5332
Merge pull request #1184 from clickdevin/develop
...
Fix bugs when updating curseforge modpacks
2023-06-20 19:55:48 -04:00
seth
4eaa7dc8b1
Merge pull request #1234 from Szowisz/develop
...
Fix compiling on FreeBSD
2023-06-20 19:55:03 -04:00
Chris Lane
9ad29e8d85
Remove extra spaces in one more Java checker debug
...
Signed-off-by: Chris Lane <git@chrislane.com>
2023-06-20 15:51:31 +01:00
Chris Lane
07f3d27fb8
Clean up 'Running java checker' debug msg code
...
Signed-off-by: Chris Lane <git@chrislane.com>
2023-06-20 15:36:25 +01:00
Chris Lane
f2692e60f3
Add missing space in java checker debug message
...
Signed-off-by: Chris Lane <git@chrislane.com>
2023-06-20 12:44:44 +01:00
James Beddek
009623823d
Modrinth: use default icon for non-managed packs
...
Fixes : #317
Signed-off-by: James Beddek <telans@posteo.de>
2023-06-20 23:00:13 +12:00
Jakub Wroński
a32a3e25ad
Fix compiling on FreeBSD
...
Signed-off-by: Jakub Wroński <kubawronski161@gmail.com>
2023-06-20 12:59:47 +02:00
Trial97
3e3be9ae6f
Added fallback for quilt if the API or Kotilin is not present
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-20 13:28:57 +03:00
TheKodeToad
3c648ff9fd
Merge pull request #1233 from p2js/ui-consistency-fix
...
Remove inconsistent/unneeded question marks in UI
2023-06-20 11:05:26 +01:00
Alfio
f769b0b4c6
Remove inconsistent/unneeded question marks in UI
...
Signed-off-by: P2 <tomarchioalfio5@gmail.com>
2023-06-20 10:40:27 +02:00
James Beddek
75bd626f33
Screenshots: do not retry image thumbnailing on null result
...
This causes the thumbnailing thread pool to spend a lot of time attempting to
retry an image that failed. A null result is common where the image is too large
to be allocated (>128MiB alloc).
The repeated retries continue after page delete, causing hangs if a user
tries to exit the application.
Fixes : #1201
Signed-off-by: James Beddek <telans@posteo.de>
2023-06-20 16:59:59 +12:00
James Beddek
f2471f0f68
Screenshots: clear the thumbnailing pool on page delete
...
Removes pending QThreadPool jobs which linger after page delete.
May help with #1201 by allowing the pool to finish earlier.
Signed-off-by: James Beddek <telans@posteo.de>
2023-06-20 16:54:15 +12:00
James Beddek
d9b24f7705
Screenshots: remove path from watcher if it no longer exists
...
Signed-off-by: James Beddek <telans@posteo.de>
2023-06-20 16:52:57 +12:00
Trial97
b62e4c0cc7
Fixed build
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-19 21:32:19 +03:00
Trial97
f6f0fbbd9f
Fixed removeIf
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-19 21:23:48 +03:00
Trial97
c13a90540c
Added overide for Quilt/Fabric
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-19 21:20:35 +03:00
Trial97
6fd729e285
Fixed regresion regarding modrinth project_id in dependence array
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-19 17:42:16 +03:00
Trial97
8ad9692daa
Changed qWarning to qDebug for raw data
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-19 14:10:29 +03:00