Trial97
|
477b72ad33
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2
|
2023-07-18 23:48:02 +03:00 |
|
Sefa Eyeoglu
|
3728cbb62a
|
Merge pull request #1397 from Gaming32/develop
|
2023-07-18 22:47:55 +02:00 |
|
Sefa Eyeoglu
|
3fbc25155b
|
Merge pull request #1362 from Trial97/fix_warning
|
2023-07-18 22:28:27 +02:00 |
|
Sefa Eyeoglu
|
ecac05b2fc
|
Merge pull request #1378 from Trial97/prism_export
Added progress bar to Prism instance export
|
2023-07-18 22:26:56 +02:00 |
|
seth
|
5b54475d3e
|
Merge pull request #1385 from orowith2os/flatpak-updates
Update Flatpak manifest
|
2023-07-18 20:12:39 +00:00 |
|
Dallas Strouse
|
2eff1de560
|
Update Flatpak manifest
Signed-off-by: Dallas Strouse <dastrouses@gmail.com>
|
2023-07-17 22:38:12 -05:00 |
|
Josiah Glosson
|
1fbb41f5e2
|
Make Launch Offline not launch online in 1.6+
Signed-off-by: Josiah Glosson <soujournme@gmail.com>
|
2023-07-17 17:07:06 -05:00 |
|
TheKodeToad
|
01afa8957f
|
Merge pull request #1387 from Scrumplex/fix-quilt-beacon
Check if any modloader is installed
|
2023-07-17 17:40:42 +01:00 |
|
Trial97
|
5162203c7d
|
Merge branch 'prism_export' of github.com:Trial97/PrismLauncher into prism_export2
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 17:58:42 +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
|
fe73d696cb
|
replace emplace with insert
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 17:24:29 +03:00 |
|
Trial97
|
2ea4a78541
|
Upgraded ExportToZipTask
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 17:24:23 +03:00 |
|
Trial97
|
cd9310afed
|
replace emplace with insert
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 16:57:52 +03:00 |
|
Trial97
|
64041a84a2
|
handle file removal in ExportToZipTask
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 16:55:26 +03:00 |
|
Trial97
|
78ee63af38
|
simplify modrinth export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 16:40:01 +03:00 |
|
Trial97
|
455c495338
|
simplify flame export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
s
|
2023-07-17 16:27:08 +03:00 |
|
Trial97
|
0bf70d677e
|
Upgraded ExportToZipTask
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 16:24:43 +03:00 |
|
Sefa Eyeoglu
|
2be630904f
|
fix: don't take modloaders by reference
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-07-17 14:33:01 +02:00 |
|
Tayou
|
e8c44e700d
|
Merge pull request #1286 from TayouVR/better-instance-group-separator
|
2023-07-17 11:55:31 +02:00 |
|
Sefa Eyeoglu
|
54a091ca59
|
fix: check if any modloader is installed
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-07-17 10:09:01 +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
|
6b970954d6
|
Merge pull request #1381 from getchoo/backporting-docs
chore(docs): add backporting info to CONTRIBUTING.md
|
2023-07-16 18:36:51 -04:00 |
|
seth
|
ed2f680202
|
chore(docs): add backporting info to CONTRIBUTING.md
Signed-off-by: seth <getchoo@tuta.io>
|
2023-07-16 17:28:52 -04: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 |
|
Alexandru Ionut Tripon
|
ec41252535
|
Update launcher/MMCZip.h
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-07-16 23:47:54 +03:00 |
|
Alexandru Ionut Tripon
|
4df9df03ab
|
Update launcher/MMCZip.cpp
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-07-16 23:47:47 +03:00 |
|
Trial97
|
79222a56e3
|
use shared pointer
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
use shared pointer
|
2023-07-16 21:14:39 +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 |
|
Sefa Eyeoglu
|
b54d1651ab
|
Merge pull request #1373 from Scrumplex/backport-bot
|
2023-07-16 19:42:09 +02:00 |
|
Sefa Eyeoglu
|
b9568279dc
|
Merge pull request #1010 from TayouVR/add_default_editorconfig
|
2023-07-16 12:30:22 +02:00 |
|
Sefa Eyeoglu
|
fcdd9ea986
|
Merge pull request #1246 from Trial97/export
|
2023-07-16 12:24:42 +02:00 |
|
Sefa Eyeoglu
|
c145bfa524
|
Merge pull request #1369 from Trial97/autoselect
|
2023-07-16 12:21:17 +02:00 |
|
Sefa Eyeoglu
|
18ebc858fd
|
feat(actions): add backport action
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-07-16 11:47:54 +02:00 |
|
Tayou
|
a6305ac891
|
Merge pull request #1368 from Trial97/crash_curse_import
|
2023-07-15 23:13:00 +02: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 |
|
Trial97
|
c346d875a2
|
make FileResolvingTask accept empty modlist
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-15 23:26:52 +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 |
|
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
|
9b02c31f8d
|
escaped text for html export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 23:35:18 +03:00 |
|
Trial97
|
50dae9d4f3
|
Moved to separate functions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 23:34:28 +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 |
|
Rachel Powers
|
37fb52aada
|
Merge pull request #1351 from Trial97/ftb_import
fixed substatus on ftb_import
|
2023-07-14 12:41:21 -07:00 |
|
seth
|
094af0f78f
|
Merge pull request #1336 from Ryex/packaging/fix-duplicate-share-directories
packaging: fix duplicate share directories (use only lowercase)
|
2023-07-14 14:19:44 -04:00 |
|
Rachel Powers
|
3487e1cb64
|
Update launcher/Application.cpp
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-14 03:56:18 -07:00 |
|