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

371 Commits

Author SHA1 Message Date
Trial97
015f88bf83
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-18 23:46:19 +03:00
Trial97
b0940d696b
Added QFutureWatcher 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

abort

forgot

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-17 17:52:00 +03:00
Trial97
cadb7142f0
Added progress bar to Prism instance export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-16 20:57:57 +03:00
Trial97
251055302e
format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-16 20:53:58 +03:00
Alexandru Ionut Tripon
da87e825a1
Update launcher/ui/dialogs/ExportToModListDialog.ui 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-07-15 15:59:19 +03:00
Trial97
ab10524cd7
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:45:40 +03:00
Trial97
1ccfba13eb
renames 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:41:51 +03:00
Trial97
b9ed8283b7
Added buttons 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:41:45 +03:00
Trial97
1495bfb73e
Made custom template enabled all time 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:41:37 +03:00
Trial97
9a3931dac6
Added json and csv format 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:34:21 +03:00
Trial97
515197fba2
fix: html sintax for modlist export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-14 23:34:03 +03:00
Trial97
843c2d67eb
Added FTBAPP Import 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-13 18:41:29 +03:00
TheKodeToad
9aedb5afff
Merge pull request #1334 from TheKodeToad/litemod-dl 
LiteMod downloading
 2023-07-10 16:42:38 +01:00
TheKodeToad
91c9082d19
Merge pull request #1249 from Trial97/curse 
Curseforge modpack export
 2023-07-10 14:20:29 +01:00
TheKodeToad
d53d58a5d4 LiteMod downloading 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-08 22:16:43 +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
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
aad5ca5474
fixed typos 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-02 16:45:15 +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
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
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
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
Trial97
84c63f4f01
Added plantxt export 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 14:11:41 +03:00
Trial97
ef0752972a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into export 2023-06-25 12:26:54 +03: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
81c1a95166
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse 2023-06-24 20:04:56 +03:00
Trial97
7fdd68d768
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-06-24 15:58:55 +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
30ef5475c7
Made sure CurseForge string is corect 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 14:50:05 +03:00
Trial97
cd1e8dc8cc
Removed modlist checkbox 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 11:12:23 +03:00
Trial97
7ebc8c48a8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse 2023-06-24 11:02:13 +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
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
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
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
85bbab0e92
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash 2023-06-23 14:38:30 +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