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

2386 Commits

Author SHA1 Message Date
Trial97
1e9a596908
simplified code in cat packs 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-16 14:18:17 +03:00
Trial97
35ccfdb799
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-10 16:25:15 +03:00
TheKodeToad
91c9082d19
Merge pull request #1249 from Trial97/curse 
Curseforge modpack export
 2023-07-10 14:20:29 +01:00
TheKodeToad
4f4ccdaa59
Merge pull request #1338 from Trial97/unlockVersionPage 
feat:unlocked versions page
 2023-07-10 13:06:32 +01:00
TheKodeToad
f816e3cd3f
Merge pull request #1241 from Trial97/settings 
Allow editing of running instances
 2023-07-09 22:10:43 +01:00
Rachel Powers
49109b9213
Merge pull request #1332 from TheKodeToad/widebar-pain 
Fix crash when editing instance and prevent similar crashes in future
 2023-07-09 14:07:34 -07:00
Rachel Powers
d43399c2b4
Merge pull request #1321 from TheKodeToad/mr-optional 
Optional mods in mrpack export
 2023-07-09 14:03:47 -07:00
Trial97
308877aa8f
removed redundant code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-09 23:18:38 +03:00
Trial97
159f14c076
feat:unlocked versions page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-09 22:47:38 +03:00
TheKodeToad
6e2fcc9e11 Replace string manipulation in favour of QFileInfo 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-09 12:08:15 +01: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
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
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