Trial97
|
9804996db6
|
Added resource packs to export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-24 14:37:02 +03:00 |
|
Trial97
|
b774817ada
|
Merge branch 'curse' of github.com:Trial97/PrismLauncher into curse
|
2023-06-24 13:24:54 +03:00 |
|
Trial97
|
8939096db6
|
Fixed windows build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-24 13:24:40 +03:00 |
|
Sefa Eyeoglu
|
df6d46de9e
|
Merge pull request #1261 from telans/modrinthexport-url
|
2023-06-24 10:51:14 +02:00 |
|
Alexandru Ionut Tripon
|
a325d814e2
|
Update launcher/modplatform/flame/FlamePackExportTask.cpp
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-06-24 11:13:08 +03:00 |
|
Trial97
|
cd1e8dc8cc
|
Removed modlist checkbox
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-24 11:12:23 +03:00 |
|
Trial97
|
377707d3db
|
Merge branch 'curse' of github.com:Trial97/PrismLauncher into curse
|
2023-06-24 11:02:40 +03:00 |
|
Trial97
|
7ebc8c48a8
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
|
2023-06-24 11:02:13 +03:00 |
|
Alexandru Ionut Tripon
|
42bc04a0d2
|
Update launcher/ui/MainWindow.cpp
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-06-24 11:01:23 +03: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 |
|
Trial97
|
cf94adb363
|
Added some warnings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-24 01:05:49 +03: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 |
|
Trial97
|
31aaa6d1da
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
|
2023-06-23 22:41:06 +03:00 |
|
Trial97
|
823cd3862d
|
Fixed hash checking
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-23 22:41:01 +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 |
|
Trial97
|
222a10891c
|
Fixed merge
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-23 19:41:55 +03:00 |
|
Trial97
|
cb2671a02c
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
|
2023-06-23 19:35:47 +03:00 |
|
Trial97
|
0a56631831
|
Added curseforge search
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-23 19:35:41 +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
|
90df092174
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
|
2023-06-23 17:29:58 +03: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 |
|
Alexandru Ionut Tripon
|
c5ea8367aa
|
Update launcher/ui/themes/CatPack.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-06-23 14:25:21 +03:00 |
|
Trial97
|
f8adb508ab
|
Made catpack id optional in catpack.json
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-23 11:44:40 +03:00 |
|
Trial97
|
6613deca0f
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks
|
2023-06-23 11:42:28 +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 |
|
Trial97
|
718aca3d06
|
Fixed date constructor
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-23 09:24:18 +03:00 |
|
Trial97
|
bf95cfb30e
|
Added CatPacks
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-23 01:37:28 +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 |
|
Trial97
|
85495c794d
|
changed map tipe
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-22 21:12:02 +03:00 |
|
Trial97
|
049b02cee4
|
finished up the curesforge export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-22 21:06:01 +03:00 |
|
Trial97
|
3c9c39cb89
|
Updated slug for url
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-22 20:04:23 +03:00 |
|
Trial97
|
377f27b16f
|
Updated slug for url
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-22 20:04:06 +03:00 |
|
Trial97
|
58321f3491
|
Added curseforge export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-22 20:03:44 +03:00 |
|
Trial97
|
4e07f9574a
|
Use slug for url
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-22 18:11:25 +03:00 |
|
Trial97
|
da6f846a49
|
Use slug for url
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-22 18:11:03 +03:00 |
|
Trial97
|
9ad356d66f
|
Added ExportModsToStringTask
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-22 17:44:12 +03:00 |
|
Trial97
|
836e8d2e28
|
Fixed code quality
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-22 17:39:57 +03:00 |
|
Trial97
|
b84dc8551a
|
Fixed trigger function
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-22 16:49:19 +03:00 |
|