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

6321 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rachel Powers
275351e19c
Merge branch 'packaging/appimage-updates' into feat/launcher-updater 2023-06-25 13:51:01 -07:00
Rachel Powers
35c233d4c5
DCO Remediation Commit for Rachel Powers <508861+Ryex@users.noreply.github.com> 
I, Rachel Powers <508861+Ryex@users.noreply.github.com>, hereby add my Signed-off-by to this commit: f5729d9a7c

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 13:47:32 -07:00
Rachel Powers
e099a3f7e8
feat(updater): packaging - know the updater git repo 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 13:47:32 -07:00
Rachel Powers
4313466589
feat(updater): final step for portable install 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 13:47:32 -07:00
Rachel Powers
d2a3acd493
fix: filter archive assets from windows non-portable installs 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 13:47:31 -07:00
Rachel Powers
516dd6bd1a
support windows console 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 13:47:31 -07:00
Rachel Powers
44bc60021d
feat(updater): unpack portable archive 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 13:47:31 -07:00
Rachel Powers
50d5eb0621
feat(updater): download new & back up old 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 13:47:31 -07:00
Rachel Powers
3d3acb7a92
Merge branch 'packaging/appimage-updates' into feat/launcher-updater 2023-06-25 13:47:31 -07:00
Rachel Powers
bee88b1c7f
feat(updater) select valid asset 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 13:47:30 -07:00
Rachel Powers
98174b7a37
refactor: use Net tasks for github api download 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 13:47:30 -07:00
Rachel Powers
5d03919b59
Merge branch 'packaging/file-manifest-in-portable-install' into feat/windows-updater 2023-06-25 13:47:30 -07:00
Rachel Powers
2357d167b8
Merge branch 'packaging/windows-installer-uninstall-previous' into feat/windows-updater 2023-06-25 13:46:28 -07:00
Rachel Powers
013a26aafe
fix: add ApiUpload to CMakeLists.txt 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 13:23:43 -07:00
Rachel Powers
fe9927d10d
Merge branch 'refactor/net-split-headers-to-proxy-class' into feat/windows-updater 2023-06-25 12:44:25 -07:00
Rachel Powers
df4fd7df7f
Merge remote-tracking branch 'upstream/develop' into refactor/net-split-headers-to-proxy-class 2023-06-25 12:43:48 -07:00
Rachel Powers
c8ff812ab8
feat(net): ApiUpload ^& fix unfired finished signals 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 12:02:46 -07:00
Trial97
6d0e255ca1
fix: Page container extra info set on logs page 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-25 22:00:33 +03:00
Rachel Powers
3105f314cb
fix: class rename (lsp acitons undid the first rename :P) 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 11:09:26 -07:00
Rachel Powers
6db906d623
chore: format 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 11:09:26 -07:00
Rachel Powers
418677ef31
refactor: override / mask static make functions for ApiDownload 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 11:09:25 -07:00
Rachel Powers
9c10965997
refactor: split out setting api headers for downloads 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-25 11:09:25 -07:00
TheKodeToad
1bd778d0ae
Merge pull request #1270 from TheKodeToad/fix-unchecked-value 
Fix unsafe usage of std::optional::value in FlameAPI
 2023-06-25 18:24:29 +01:00
TheKodeToad
4745ab64cd Deduplicate launcher icon 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 15:02:25 +01:00
Leo
953a2590e2
Add fixme comment for no SSD detection 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Leo <leo3758@riseup.net>
 2023-06-25 10:11:58 -03:00
TheKodeToad
02b628653b Fix markdown header 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 13:43:03 +01:00
TheKodeToad
c75ba0f855
Fix big mistake :iea: 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 12:46:07 +01:00
TheKodeToad
514080653f Fix unsafe usage of std::optional::value in FlameAPI 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 11:56:28 +01:00
TheKodeToad
603ed22015 Replace accidental usages of QAbstractButton::pressed 
This signal is not usually what you want, and creates an inconsistent experience.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-25 10:36:54 +01:00
TheKodeToad
5eb71fc6a9 Revert "feat(Mods): hide 'Provider' column when no mods have providers" 
With Ryex's change, this causes issues. Apparently you need to sign off reverts! That's just weird...

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-24 23:36:32 +01:00
TheKodeToad
8a3aba1634 Fix Open Global Settings, why not 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-24 23:30:51 +01:00
TheKodeToad
bb8e6ef35e Fix flat white launcher icon 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-24 23:27:01 +01: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
TheKodeToad
bcf45c74a1
Merge pull request #986 from Trial97/develop 
Mod dependencies
 2023-06-24 14:04:27 +01:00
Trial97
8b576fd2bd
Added translation 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 15:59:55 +03:00
Trial97
7fdd68d768
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-06-24 15:58:55 +03:00
Sefa Eyeoglu
df6d46de9e
Merge pull request #1261 from telans/modrinthexport-url 2023-06-24 10:51:14 +02: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
seth
cce6a54701
Merge pull request #1258 from leo78913/resources-pack-page-crash-fix 
fix: fix crash when hiding columns on resource packs page
 2023-06-24 00:39:47 -04:00
Rachel Powers
68865353cf
Merge pull request #1259 from PrismLauncher/update-devs 
Update developers
 2023-06-23 21:38:16 -07:00
Rachel Powers
0e7f435921
echo to correct var for summary 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-06-23 20:56:07 -07:00
James Beddek
20ba6e5fb5
modrinth: use encoded url when exporting pack 
Ensures that necessary url components such as spaces are encoded.
Prevents an error when submitting the resulting file to modrinth.

See https://discord.com/channels/734077874708938864/1120070731242410024

Fixes: #1226
Signed-off-by: James Beddek <telans@posteo.de>
 2023-06-24 15:42:58 +12:00
TheKodeToad
d74a23d5b2
Update developers 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-23 21:00:55 +01:00
leo78913
750209b8bb
fix: fix crash when hiding columns on resource packs page 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2023-06-23 16:55:51 -03:00
TheKodeToad
741c23a72a
Merge pull request #1256 from Trial97/fix11 
Fixed hashers
 2023-06-23 19:53:44 +01:00
Trial97
28de461067
Fixed hashers 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-23 21:38:41 +03: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
Rachel Powers
046d510134
Merge pull request #1200 from Trial97/net_job_crash 
Made ByteSynkArray to use shared_ptr
 2023-06-23 09:13:52 -07: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
67db141203
Renamed getResults to resultsReady 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-23 14:38:23 +03:00