CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,550 Commits 10 Branches 30 Tags 34 MiB
760b80934f
Commit Graph

2503 Commits

Author SHA1 Message Date
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
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
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
Sefa Eyeoglu
5ba13297c6
Merge pull request #1284 from Ryex/fix/properly-track-failed-copies-and-clones 2023-07-05 19:26:07 +02: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
Trial97
6d758795af
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-03 17:00:56 +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
Trial97
f0aab541f8
fixed typo 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-03 15:09:35 +03:00
Trial97
026293f773
updated option text 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-03 14:17:39 +03:00
Trial97
5d5f1b86fd
fixed logic regarding range over multiple years 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-03 09:21:25 +03:00
Trial97
ba159ba971
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks 2023-07-03 09:01:22 +03:00
Rachel Powers
e5b9bfb2e7
fix: update if new size is larger 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-02 22:30:25 -07:00
Rachel Powers
8cb8273e67
fix: update if new size is larger 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-02 22:29:45 -07:00
Rachel Powers
73d8343914
fix: header <qpoint.h> -> <QPoint> 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-02 22:27:24 -07:00
Rachel Powers
3960eb7d32
fix: properly calculate min size for progress dialog, apply it at creation 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-02 21:24:43 -07:00
Rachel Powers
4004e0faee
fix: segfault in progress dialog 
- dialog tries to resize after unhiding the subtask scroll area
- after resize attempts to recenter on parent
  - `calls parentWidget()->{x|y}()`
  - what if there is no parent? nullptr->() = segfault

- recenter on last pos, don't access parent

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-02 20:22:25 -07:00
Trial97
5f63c781b4
resolved local vaiables names 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-02 18:50:29 +03:00
TheKodeToad
43e6f05ed5
Merge pull request #1232 from telans/screenshots-update 
ScreenshotsPage fixes
 2023-07-02 16:44:54 +01:00
Trial97
aad5ca5474
fixed typos 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-02 16:45:15 +03:00
Trial97
cf2393a509
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings 2023-07-02 15:56:39 +03:00
Tayou
81c0a1c4bd
antialiasing for all painting, make hitbox fullwidth 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-07-02 14:01:56 +02:00
Trial97
6fc745e98c
Merge branch 'catpacks' of github.com:Trial97/PrismLauncher into catpacks 2023-07-02 13:34:41 +03:00
Trial97
7579fff532
Added more options for variants planing 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-02 13:34:04 +03:00
Trial97
7ac2a23bc8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks 2023-07-02 13:14:19 +03:00
Trial97
6c4cf085e0
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-02 12:50:45 +03:00
Finian Wright
3fe518ff2b Fix compiling on OpenBSD 
Signed-off-by: Finian Wright <turbowafflz@gmail.com>
 2023-07-02 00:36:21 -04:00
Trial97
18e628e873
removed extra condition 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-30 12:10:00 +03:00
Trial97
81207c6502
Made sure the logs are ignored when collecting files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-30 10:52:10 +03:00
Trial97
87efa700ab
Removed logs from instance export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-30 00:01:36 +03:00
Tayou
8211befc29
removed magic 5, removed unnecessary QPainter function calls 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-28 23:24:57 +02:00
Tayou
1dc7f80034
4 clang-tidy changes, update copyright info 
while already at it I updated all my emails to use one from my domain
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-28 23:08:04 +02:00
Tayou
534d156b12
format VisualGroup.cpp file 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-28 20:06:17 +02:00
Tayou
54d88e4dbf
use QString.isEmpty() 
oops
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-28 20:05:28 +02:00
Tayou
6b3b119db0
give ungrouped instances a group header 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-28 18:50:44 +02:00
Tayou
66461ac500
some positioning adjustments, deleted the line 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-28 18:42:49 +02:00
Tayou
7033e28572
update instance group header to more modern style 
Signed-off-by: Tayou <tayou@gmx.net>
 2023-06-28 18:00:40 +02:00
Trial97
0008b22d8b
Renamed function 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-28 18:41:47 +03:00
Trial97
8f9bd9617f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into scale_cat 2023-06-28 18:29:04 +03: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
Sefa Eyeoglu
faec21d572
Merge pull request #1266 from TheKodeToad/smol-tweaks 2023-06-28 08:47:53 +02:00
seth
213f03351f
Merge pull request #1280 from Trial97/shortcut 
Fixed illegal characters in shortcuts name
 2023-06-27 20:01:48 +00:00
Rachel Powers
00be211169
Update launcher/FileSystem.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-27 13:01:28 -07:00
Rachel Powers
23b3711f96
fix(filesystem): track failed copies and clones 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-27 12:41:36 -07:00
Trial97
54cb077b40
Added more information to the screenshot upload warning 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-27 19:31:36 +03:00
Trial97
92847b9774
omit icon remove on macos 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-27 19:15:20 +03:00
Trial97
6e5716f097
Fixed illegal characters in shortcuts name 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-27 19:05:32 +03:00
TheKodeToad
904b128afe
Merge pull request #1277 from Trial97/remove_mojang 
Removed unused files
 2023-06-26 23:09:27 +01:00
Trial97
dffffc784e
Removed unused files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-26 22:33:10 +03:00
Sefa Eyeoglu
fce000206f
feat: print build platform in application log 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-06-26 11:55:23 +02:00
Sefa Eyeoglu
f5e4171df4
feat: print build platform in log 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-06-26 11:54:22 +02:00
Sefa Eyeoglu
0aaec9ae4f
chore: remove obsolete macOS warning 
We don't support that macOS version. This check also never worked, as we
never set the platform to that value.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-06-26 11:53:48 +02:00
Sefa Eyeoglu
d25452a64e
Merge pull request #1274 from TheKodeToad/java-signature 2023-06-26 11:19:53 +02:00
Alexandru Ionut Tripon
22bb260ae3
Update launcher/ui/dialogs/ExportToModListDialog.cpp 
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-06-26 11:45:26 +03:00
Alexandru Ionut Tripon
d82ae31fc1
Update launcher/ui/dialogs/ExportToModListDialog.cpp 
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-06-26 11:45:05 +03:00
Alexandru Ionut Tripon
cf5c01a5b1
Update launcher/ui/dialogs/ExportToModListDialog.cpp 
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-06-26 11:44:55 +03:00
Alexandru Ionut Tripon
f2015eee80
Update launcher/ui/MainWindow.ui 
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-06-26 11:44:47 +03:00
Sefa Eyeoglu
4d49486cc9
Merge pull request #1065 from leo78913/gamescope-close-button 2023-06-26 08:45:28 +02:00
TheKodeToad
8bebd7f042 Generate special signature ✨ composed of multiple elements instead of relying on timestamp for Java version cache invalidation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-26 01:30:47 +01:00
seth
903fae94be
Merge pull request #1272 from Trial97/fix_selected 
fix: Page container extra info set on logs page
 2023-06-25 21:16:18 +00:00
Trial97
6d0e255ca1
fix: Page container extra info set on logs page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 22:00:33 +03:00
Trial97
87155e346c
Complicated a little task progress 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 19:44:18 +03:00
Trial97
52dd09bdf7
Merge branch 'curse' of github.com:Trial97/PrismLauncher into curse 2023-06-25 17:51:30 +03:00
Trial97
d344ffe370
Removed some setProgress calls 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 17:50:56 +03:00
TheKodeToad
4745ab64cd Deduplicate launcher icon 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 15:02:25 +01:00
TheKodeToad
288ea3d19b Remove metaurl function 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 14:52:33 +01:00
TheKodeToad
8ade44c9a3 Simplify 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 14:40:22 +01:00
Trial97
fa3a46498f
Removed dupliacte code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 16:23:50 +03:00
Leo
953a2590e2
Add fixme comment for no SSD detection 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Leo <leo3758@riseup.net>
 2023-06-25 10:11:58 -03:00
TheKodeToad
02b628653b Fix markdown header 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 13:43:03 +01:00
Trial97
3546f57a42
Use internal markdown implementation 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 15:17:09 +03:00
Trial97
8d3bc6b6b9
Added markdown QT version check 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 14:58:54 +03:00
TheKodeToad
c75ba0f855
Fix big mistake :iea: 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 12:46:07 +01:00
Trial97
d1603f1945
Made it more similar to mrpack export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 14:43:11 +03:00
Trial97
84c63f4f01
Added plantxt export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 14:11:41 +03:00
TheKodeToad
514080653f Fix unsafe usage of std::optional::value in FlameAPI 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 11:56:28 +01:00
TheKodeToad
603ed22015 Replace accidental usages of QAbstractButton::pressed 
This signal is not usually what you want, and creates an inconsistent experience.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 10:36:54 +01:00
Trial97
ef0752972a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into export 2023-06-25 12:26:54 +03:00
Trial97
fd5b155ee7
Added error message when exporting snapshots with curseforge 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 12:24:59 +03:00
Trial97
40fbae8ff6
Fixed links tooltip 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 11:36:37 +03:00
Trial97
ce4a86fbcd
Made custom url function 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 10:41:29 +03:00
Trial97
54d7477679
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into visit_mod_page 2023-06-25 10:12:29 +03:00
TheKodeToad
5eb71fc6a9 Revert "feat(Mods): hide 'Provider' column when no mods have providers" 
With Ryex's change, this causes issues. Apparently you need to sign off reverts! That's just weird...

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-24 23:36:32 +01:00
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
Trial97
932531c8ba
fixed authors 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 23:48:18 +03:00
Trial97
69c21454ec
removed projectID 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 22:15:18 +03:00
Trial97
f0e4e07c05
Updated url function 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 20:43:45 +03:00
Trial97
df932c6587
Updated authors string in modlist 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 20:22:18 +03:00
Trial97
81c1a95166
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse 2023-06-24 20:04:56 +03: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
Trial97
f825d7753a
Updated copyright headers 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 15:11:15 +03:00
Trial97
19cb6ad588
Updated Modrinth esport messages 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 15:04:18 +03:00
Trial97
4a84084d9d
Added condition for modlist 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 15:02:00 +03:00
Trial97
25579fbedc
Renamed ExportMrPackDialog to ExportPackDialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 14:54:39 +03:00
Trial97
59e1e51903
Removed unused files 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 14:51:12 +03:00
Trial97
30ef5475c7
Made sure CurseForge string is corect 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 14:50:05 +03:00
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
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
823cd3862d
Fixed hash checking 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-23 22:41:01 +03: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
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