TheKodeToad
|
b0b9b89bce
|
Merge pull request #1406 from PrismLauncher/backport-1397-to-release-7.x
[Backport release-7.x] Make Launch Offline not launch online in 1.6+
|
2023-07-18 22:46:05 +01:00 |
|
Josiah Glosson
|
862f4fb061
|
Make Launch Offline not launch online in 1.6+
Signed-off-by: Josiah Glosson <soujournme@gmail.com>
(cherry picked from commit 1fbb41f5e2)
|
2023-07-18 21:40:28 +00:00 |
|
seth
|
f8d88cc83d
|
Merge pull request #1372 from PrismLauncher/update_flake_lock_action
chore(nix): update lockfile
|
2023-07-18 21:19:58 +00:00 |
|
Trial97
|
f393aa684e
|
wait to load metadata
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-18 23:59:43 +03:00 |
|
Trial97
|
4c319c8f4f
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into flame_import
|
2023-07-18 23:49:52 +03:00 |
|
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
|
7c5d07e74d
|
Merge pull request #1404 from PrismLauncher/backport-1385-to-release-7.x
|
2023-07-18 22:46:25 +02: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 |
|
TheKodeToad
|
fe1ea7240e
|
Merge pull request #1334 from TheKodeToad/litemod-dl
LiteMod downloading
|
2023-07-18 22:43:35 +02:00 |
|
Sefa Eyeoglu
|
6f1d594f1c
|
Merge pull request #1128 from pandaninjas/fix-implicit-fallthrough
|
2023-07-18 22:43:35 +02:00 |
|
Dallas Strouse
|
7baaf83f1d
|
Update Flatpak manifest
Signed-off-by: Dallas Strouse <dastrouses@gmail.com>
(cherry picked from commit 2eff1de560)
|
2023-07-18 20:41:33 +00: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 |
|
Sefa Eyeoglu
|
bab7105820
|
Merge pull request #1403 from PrismLauncher/backport-1362-to-release-7.x
|
2023-07-18 22:29:16 +02:00 |
|
Trial97
|
1389b74a8a
|
fixed warning
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 440afcedb0)
|
2023-07-18 20:28:46 +00:00 |
|
Trial97
|
5aa3aabdf9
|
insert header
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit b0a21c9389)
|
2023-07-18 20:28:46 +00:00 |
|
Trial97
|
42d2c7446a
|
format
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit fc4a1ef193)
|
2023-07-18 20:28:46 +00: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 |
|
Trial97
|
391497645f
|
feat:made flame instace creation use metadata for recommended version
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-18 22:33:39 +03:00 |
|
Sefa Eyeoglu
|
f8fcb98c68
|
fix: generate predictable UUIDs for offline accounts
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-07-18 10:07:35 +02: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
|
71a7358287
|
Merge pull request #1395 from PrismLauncher/backport-1387-to-release-7.x
[Backport release-7.x] Check if any modloader is installed
|
2023-07-17 17:42:00 +01:00 |
|
Sefa Eyeoglu
|
eaf125c31a
|
fix: don't take modloaders by reference
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 2be630904f)
|
2023-07-17 16:41:05 +00:00 |
|
Sefa Eyeoglu
|
f7e018d41a
|
fix: check if any modloader is installed
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
(cherry picked from commit 54a091ca59)
|
2023-07-17 16:41:05 +00: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
|
f5891940e0
|
translate strings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 17:22:35 +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 |
|
TheKodeToad
|
49cebc2da4
|
More consistent behaviour
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-17 12:49:12 +01:00 |
|
TheKodeToad
|
049abc9b1a
|
Merge remote-tracking branch 'upstream/develop' into rename-groups
|
2023-07-17 12:13:58 +01: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 |
|
Trial97
|
ec32618e11
|
reveted back to add years
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 10:20:22 +03:00 |
|
Sefa Eyeoglu
|
7d6e07ea71
|
Merge pull request #1384 from PrismLauncher/backport-1357-to-release-7.x
[Backport release-7.x] feat: add toggle for quilt beacon
|
2023-07-17 06:43:57 +02:00 |
|
seth
|
cd011a097b
|
chore: better explain quilt loader beacon
Signed-off-by: seth <getchoo@tuta.io>
(cherry picked from commit a2a09ffe01)
|
2023-07-17 04:43:06 +00:00 |
|
seth
|
055bcc2721
|
feat: add toggle for quilt beacon
Signed-off-by: seth <getchoo@tuta.io>
(cherry picked from commit 89aaedc06c)
|
2023-07-17 04:43:06 +00: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 |
|