CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,835 Commits 10 Branches 30 Tags
4704c522e002e0da2c9ce49f71456fce684ab3a1
Commit Graph

197 Commits

Author SHA1 Message Date
Trial97
4704c522e0 moved modloaderTypes to ModPlatform 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-23 10:26:57 +03:00
Trial97
0138cd65cb feat:neoforge can download forge mods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-19 09:00:59 +03:00
Sefa Eyeoglu
be2888d6fb chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-17 22:23:50 +02:00
Sefa Eyeoglu
62c14cea2a fix: allow NeoForge in resource APIs 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-15 11:06:14 +02:00
Sefa Eyeoglu
01c3750835 feat: support NeoForge mrpack modpacks 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-15 11:06:14 +02:00
Sefa Eyeoglu
215d7dbb74 chore: update license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-14 18:17:05 +02:00
Sefa Eyeoglu
91ba4cf75e chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-14 18:16:53 +02:00
Sefa Eyeoglu
ef6f9487f4 Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings 2023-08-10 20:38:32 +02:00
Sefa Eyeoglu
304e294ea7 Merge pull request #1102 from Ryex/refactor/net-split-headers-to-proxy-class 2023-08-04 20:31:43 +02:00
Rachel Powers
2d1197f59f Merge branch 'develop' into refactor/net-split-headers-to-proxy-class 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-31 22:26:20 -07:00
Trial97
62aa7a52c4 fiexed conflicts 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-27 00:07:38 +03:00
Trial97
3c472fd7e0 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2 2023-07-27 00:05:59 +03:00
seth
af59c41713 fix: typo in task.h 
Signed-off-by: seth <getchoo@tuta.io>
 2023-07-26 16:20:30 -04: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
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
TheKodeToad
9aedb5afff Merge pull request #1334 from TheKodeToad/litemod-dl 
LiteMod downloading
 2023-07-10 16:42:38 +01:00
TheKodeToad
91c9082d19 Merge pull request #1249 from Trial97/curse 
Curseforge modpack export
 2023-07-10 14:20:29 +01:00
TheKodeToad
6e2fcc9e11 Replace string manipulation in favour of QFileInfo 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-09 12:08:15 +01:00
TheKodeToad
d53d58a5d4 LiteMod downloading 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-08 22:16:43 +01:00
TheKodeToad
8ae67b84db Optional mods in mrpack export 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-06 20:04:26 +01:00
Trial97
5f63c781b4 resolved local vaiables names 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-02 18:50:29 +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
Rachel Powers
98d6904e4a chore: fix propagate mispelling 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-01 17:03:12 -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
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
Trial97
81c1a95166 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse 2023-06-24 20:04:56 +03:00
Trial97
7fdd68d768 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-06-24 15:58:55 +03:00
Trial97
19cb6ad588 Updated Modrinth esport messages 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 15:04:18 +03: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
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
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
James Beddek
009623823d Modrinth: use default icon for non-managed packs 
Fixes: #317
Signed-off-by: James Beddek <telans@posteo.de>
 2023-06-20 23:00:13 +12:00
Trial97
6fd729e285 Fixed regresion regarding modrinth project_id in dependence array 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 17:42:16 +03:00
Trial97
1bdde1f947 Small fixes 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 00:36:37 +03:00
Trial97
0161520b33 Fixed leaks 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-18 23:27:26 +03:00
Trial97
147366bc0a Made ByteSynkArray to use shared_ptr 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-15 22:59:41 +03:00
Trial97
182e19eae3 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-06-15 10:35:26 +03:00
TheKodeToad
f4a814b5e6 Remove unnecessary code 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-12 15:46:15 +01:00
TheKodeToad
94ddc8bbf7 Could this work? 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-12 14:14:50 +01:00
Rachel Powers
3dccc38f42 Merge pull request #904 from TheKodeToad/mrpack-export 
mrpack export
 2023-06-04 19:01:50 -07:00
TheKodeToad
3c87e5d31e Make mcInstance mutable 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-06-03 13:48:15 +01:00
Alexandru Ionut Tripon
1840505a0f Fix crash when selecting same mod from different providers (#1029) 2023-06-02 18:04:06 -03:00
Trial97
737fc1a2a4 Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into develop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-28 18:01:39 +03:00
Trial97
27c3775f99 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into Fix_Assert 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-28 17:44:23 +03:00
TheKodeToad
86974b046e Clarify comment 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-05-28 11:48:09 +01:00
Trial97
ffcc58cb3e Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-05-14 14:20:24 +03:00
Kode
f60562c5a2 Merge branch 'develop' into mrpack-export 
Signed-off-by: Kode <TheKodeToad@proton.me>
 2023-05-13 19:07:03 +01:00