CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,722 Commits 10 Branches 30 Tags
dfa220ef02f23ff734dec6247f4a124a7a144c7a
Commit Graph

4722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
flow
dfa220ef02 fix: issues with aborts (again) 
i hate it

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-13 15:10:35 -03:00
flow
f26be00571 fix: abort search if we're already trying to download a pack 
Meaning we don't have to wait for the searches to finish in the
background to finally start the modpack download, when we have already
selected it -_-

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-13 13:49:06 -03:00
flow
83654a193e refactor+fix: Make FTB install task similar to other install tasks 
In particular, this changes the order so that the instance gets created
before downloading the mods (like other install tasks), and the mod download
directly puts the files in the staging folder (like the others), instead
of that weird makeCached and copy stuff.

This fixes some issues with modpack downloads from FTB, like creating an
instance with no mods in it.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-13 13:27:52 -03:00
flow
19ee736e1d Merge pull request #1190 from TayouVR/merged-launch-button1 2022-10-11 16:21:41 -03:00
Tayou
aaba99dc10 Update launcher/ui/MainWindow.cpp 
make " Offline" string for profilers translatable

Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com>
 2022-10-11 14:58:34 +02:00
Tayou
93a2e0f777 Merge Launch Buttons 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-10-10 23:23:06 +02:00
Sefa Eyeoglu
aabcca5059 Merge pull request #1175 from Ozynt/patch-1 2022-10-09 20:20:05 +02:00
Ozynt
7e67fd8c79 Update LaunchController.cpp 
Signed-off-by: Ozynt <104643560+Ozynt@users.noreply.github.com>
 2022-10-09 13:20:50 +02:00
Ozynt
fecf1ffcb9 Update LaunchController.cpp 
Signed-off-by: Ozynt <104643560+Ozynt@users.noreply.github.com>
 2022-10-09 13:19:38 +02:00
Sefa Eyeoglu
fafc9cf9ca Merge pull request #1033 from Scrumplex/multi-arch-support 2022-10-08 20:12:40 +02:00
Sefa Eyeoglu
3111e6a721 chore: add missing license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-08 20:12:07 +02:00
flow
e436f471a0 Merge pull request #1177 from DioEgizio/codeql 
bye LGTM 👋
 2022-10-08 15:04:23 -03:00
flow
28f84902f6 Merge pull request #1185 from DioEgizio/fix-tooltip 
Fix outdated 'Disable mod metadata' button's warning message.
 2022-10-08 14:34:59 -03:00
Trisave
ebee50eedc Improve default light and dark themes (#1174) 2022-10-08 14:33:24 -03:00
flow
e0ef09dfe1 Merge pull request #1183 from Scrumplex/fix-capabilities-first-run 2022-10-08 14:29:14 -03:00
DioEgizio
f26049009e fix: mod updating isn't upcoming anymore :p 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-10-08 16:20:46 +02:00
Sefa Eyeoglu
787234a53a Merge pull request #1163 from flowln/fix_list_icons 2022-10-08 12:12:38 +02:00
Sefa Eyeoglu
fc3a64056c Merge pull request #1154 from Scrumplex/epic-formatting-codes 2022-10-08 12:12:26 +02:00
Sefa Eyeoglu
6ebc9abb80 fix: update capabilities before first-run wizard 
On first run, the condition for the wizard would return, before running
updateCapabilities(). This moves that call up, as its only dependency is
the settings system.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-06 14:46:13 +02:00
DioEgizio
80e9eed35a fix: remove old unused lgtm.yml, exclude cpp/fixme-comment 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-10-04 16:17:57 +02:00
DioEgizio
23b3990f99 feat(code scanning): enable security-and-quality query 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-10-04 16:17:57 +02:00
DioEgizio
41276403df feat(actions): add codeql code scanning 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-10-04 16:17:57 +02:00
Sefa Eyeoglu
e3e9e39498 Merge pull request #1171 from vedantmgoyal2009/patch-1 2022-10-02 15:08:59 +02:00
txtsd
f315025a8d Merge pull request #1167 from Scrumplex/epic-commandline 2022-10-02 00:41:34 +05:30
stoltsvensk
8e43d97133 Microsoft account only 
Signed-off-by: stoltsvensk <104643560+stoltsvensk@users.noreply.github.com>
 2022-10-01 16:47:23 +02:00
flow
c97a47dc62 Merge pull request #1172 from Scrumplex/fix-includes 2022-09-30 18:08:45 -03:00
Sefa Eyeoglu
7ccafdc993 fix: add missing includes to fix Qt 6.4 build 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-30 19:56:01 +02:00
Sefa Eyeoglu
0dca9cb6b8 Merge pull request #1162 from Trial97/feature/Replace-toml-library 2022-09-30 19:44:45 +02:00
Vedant
be3d780720 Update winget.yml 
Signed-off-by: Vedant <83997633+vedantmgoyal2009@users.noreply.github.com>
 2022-09-30 22:51:47 +05:30
Sefa Eyeoglu
0f59a1dde1 fix(nix): add tomlplusplus 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-26 15:42:45 +02:00
Sefa Eyeoglu
7c6bb80cee fix: move toml++ find call 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-26 13:46:01 +02:00
Sefa Eyeoglu
62841c5b23 fix: pin tomlplusplus to latest release 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-26 13:44:28 +02:00
Sefa Eyeoglu
aad4f8d1f7 fix: update Git modules 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-26 13:44:28 +02:00
Sefa Eyeoglu
11c44c676c fix: remove unused MACOS_HINT 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-26 13:28:46 +02:00
flow
370c3aa598 Merge pull request #894 from flowln/update_from_external_source 
epic PR
 2022-09-26 08:25:12 -03:00
Sefa Eyeoglu
1cdadafdf8 refactor: use QCommandLineParser instead 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-26 13:21:27 +02:00
timoreo
dd6f670dec fix: Fixed memory leak 
Signed-off-by: timoreo <contact@timoreo.fr>
 2022-09-26 11:50:55 +02:00
timoreo
9ff364b0d3 huge nit: added const refs, everywhere 
Signed-off-by: timoreo <contact@timoreo.fr>
 2022-09-26 11:50:31 +02:00
Sefa Eyeoglu
58a5331f7b Merge pull request #1164 from Scrumplex/fix-sort-languages 2022-09-25 19:50:55 +02:00
Alexandru Ionut Tripon
ed261f0af9 Update launcher/minecraft/mod/tasks/LocalModParseTask.cpp 
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2022-09-25 20:38:55 +03:00
flow
c01b475cbf Merge pull request #1165 from ErogigGit/develop 2022-09-25 09:33:29 -03:00
ErogigGit
3d4feeec8d DCO Remediation Commit for ErogigGit <eric.hagerstrand@gmail.com> 
I, ErogigGit <eric.hagerstrand@gmail.com>, hereby add my Signed-off-by to this commit: 8a4f1c66f83a339d33ab0ba0076d8c1141055067

Signed-off-by: ErogigGit <eric.hagerstrand@gmail.com>
 2022-09-24 23:31:30 +02:00
Trial97
a1800ec23f Prefer the system tomlplusplus 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2022-09-25 00:20:01 +03:00
ErogigGit
8a4f1c66f8 Allow double clicking to mark for dowload 
Signed-off-by: Erogig <erogigabyte@gmail.com>
 2022-09-24 22:37:51 +02:00
Sefa Eyeoglu
b187231b0e fix: sort languages by their name instead of key 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-24 11:53:41 +02:00
Sefa Eyeoglu
60b38de69f fix: fallback for languages without a native name 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-24 11:48:33 +02:00
Trial97
600c49f7f0 Replaced tomlc99 with tomlplusplus 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2022-09-24 00:10:27 +03:00
flow
e7380e70a3 fix: use placeholder icon when the project has no icon in MR 
Projects with no icon return a null icon URL in Modrinth's API.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-23 18:05:58 -03:00
flow
3df8594f19 feat: change project item delegate for modrinth modpacks 
more info! \ ^-^/

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-23 16:59:40 -03:00
flow
ee4a829293 fix: remove manual icon resize in ModModel 
THis fixes a FIXME, now that we fixed the issue :o

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-23 16:59:40 -03:00