Trial97
|
97ff7afbe7
|
keep the icon suffix
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-28 08:37:45 +03:00 |
|
Trial97
|
b15f689ccf
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions
|
2023-07-27 00:03:42 +03:00 |
|
tjw123hh
|
280f041acb
|
Delete some incorrect notr="true" tags
Signed-off-by: tjw123hh <tjw123hh@outlook.com>
|
2023-07-25 17:35:31 +08:00 |
|
tjw123hh
|
6a01c277e8
|
Delete some incorrect tags
|
2023-07-24 20:41:22 +08:00 |
|
Trial97
|
b31644e228
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-22 18:16:03 +03:00 |
|
TheKodeToad
|
57430fd189
|
Merge branch 'develop' into better-launch
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-22 11:26:02 +01:00 |
|
TheKodeToad
|
0be4db30eb
|
Merge branch 'PrismLauncher:develop' into better-component-installation
|
2023-07-21 11:02:57 +01:00 |
|
TheKodeToad
|
c37e1fb9f1
|
Merge branch 'develop' into skinfix
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-20 18:11:27 +01:00 |
|
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
|
02082cda09
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file
|
2023-07-18 23:40:11 +03:00 |
|
Trial97
|
5eec0f5901
|
feat:managed packs can update from file
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-18 23:40:03 +03:00 |
|
Tayou
|
e8c44e700d
|
Merge pull request #1286 from TayouVR/better-instance-group-separator
|
2023-07-17 11:55:31 +02:00 |
|
Sefa Eyeoglu
|
aaf1726965
|
Merge pull request #1357 from getchoo/quilt-beacon
feat: add toggle for quilt beacon
|
2023-07-17 06:42:46 +02:00 |
|
seth
|
5e0df9b696
|
Merge pull request #1276 from Scrumplex/print-build-platform
Print build platform on launch
|
2023-07-16 17:15:55 -04:00 |
|
Trial97
|
a3ffa64550
|
Upgraded pack changelog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-16 01:59:08 +03:00 |
|
Trial97
|
06fc8358d9
|
auto focus search line on resource download
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-15 23:57:32 +03:00 |
|
seth
|
a2a09ffe01
|
chore: better explain quilt loader beacon
Signed-off-by: seth <getchoo@tuta.io>
|
2023-07-15 14:25:05 -04:00 |
|
Trial97
|
21ffed3bf5
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-15 20:35:11 +03:00 |
|
Trial97
|
7befd63cce
|
fixed settings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-15 00:28:58 +03:00 |
|
Trial97
|
149b6d59cf
|
fixed tests
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 23:22:11 +03:00 |
|
Trial97
|
db9f5f44e0
|
Split in two the options
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 22:26:22 +03:00 |
|
Trial97
|
cebb4dd17a
|
made the number of concurrent tasks configurable
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 20:39:53 +03:00 |
|
Rachel Powers
|
520594e529
|
Merge branch 'develop' into chore/add-compiler-warnings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-13 20:05:16 -07:00 |
|
Trial97
|
843c2d67eb
|
Added FTBAPP Import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-13 18:41:29 +03:00 |
|
seth
|
89aaedc06c
|
feat: add toggle for quilt beacon
Signed-off-by: seth <getchoo@tuta.io>
|
2023-07-12 21:10:48 -04:00 |
|
Trial97
|
766e833a73
|
fixed crash if no version is loaded
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-12 16:25:05 +03:00 |
|
Rachel Powers
|
149bc8e9ce
|
cleanup: pull out data object so I'm not repeating myself
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-11 21:42:34 -07:00 |
|
Rachel Powers
|
9957aeb003
|
Merge branch 'develop' into curseforge-url-handle
|
2023-07-11 21:42:29 -07:00 |
|
TheKodeToad
|
4c69290381
|
Merge branch 'develop' into better-component-installation
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-11 11:14:06 +01: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 |
|
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
|
08c140b9b4
|
Fix actionVisitItemPage insersion, and prevent widebar segfault
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-08 20:55:30 +01: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
|
073cb91f88
|
fix(ui): validate meta override url
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-07-07 15:56:07 +02:00 |
|
TheKodeToad
|
22327bbe71
|
Combine launch buttons in Instance window, persist profiler
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-06 18:07:45 +01:00 |
|
leo78913
|
f9578066d6
|
make "browse" buttons and java pages more consistent
Signed-off-by: leo78913 <leo3758@riseup.net>
|
2023-07-06 01:39:59 -03: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
|
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 |
|
TheKodeToad
|
64c591b234
|
Better parent version filtering; handle old fabric :P
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-03 20:48:37 +01:00 |
|
Trial97
|
026293f773
|
updated option text
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-03 14:17:39 +03:00 |
|
TheKodeToad
|
43e6f05ed5
|
Merge pull request #1232 from telans/screenshots-update
ScreenshotsPage fixes
|
2023-07-02 16:44:54 +01: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 |
|
Rachel Powers
|
8d7dcdfc5b
|
chore: fix shadowed member and signed/unsigned mismatch
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: supress unused with [[maybe_unused]]
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: unshadow ^&^& static_cast implicit return
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: deshadow and mark unused in parse task
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: mark unused in folder models
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: deshadow and mark unused with instances
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: more deshadow and unused
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: remove uneeded simicolons
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: mark unused
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: prevent shadow
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-01 23:39:38 -07:00 |
|