CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,571 Commits 10 Branches 30 Tags
de11017552a5e3e06c436051b2218c4411a0fb24
Commit Graph

279 Commits

Author SHA1 Message Date
flow
b937d33436 Merge pull request #714 from redstrate/cmark 2023-01-13 16:16:00 -03:00
Joshua Goins
807da6a035 fix: Remove extra line breaks for modrinth descriptions 
Signed-off-by: Joshua Goins <josh@redstrate.com>
 2023-01-12 10:08:52 -05:00
Sefa Eyeoglu
f3f628410d Merge pull request #576 from Ryex/identify-zip-packs 
fix https://github.com/PrismLauncher/PrismLauncher/issues/349
 2023-01-07 17:33:34 +01:00
byquanton
2faf8332ee fix: Add 1.16+ Forge library prefix in TechnicPackProcessor.cpp 
Signed-off-by: byquanton <32410361+byquanton@users.noreply.github.com>
 2023-01-06 02:44:10 +01:00
Rachel Powers
7f438425aa refactor: add an identify function to make easy to reuse 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-29 19:47:19 -07:00
Rachel Powers
c470f05abf refactor: use std::filesystem::rename insted of copy and then moving. 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-29 17:21:54 -07:00
Rachel Powers
3691f3a296 fix: cleanup and suggested changes 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-26 14:50:15 -07:00
Rachel Powers
b2082bfde7 fix: explicit QFileInfo converison for qt6 
fix: validatePath in validateZIPResouces

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-25 17:16:26 -07:00
Rachel Powers
78984eea3a feat: support installing worlds during flame pack import. 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-25 16:49:56 -07:00
Rachel Powers
8422e3ac01 feat: zip resource validation check for flame 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-24 20:43:17 -07:00
flow
e3f8d99087 refactor(Inst. Import): use m_* for member variables in MR components 
Makes it clearer what is being changed when.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-17 12:41:10 -03:00
flow
22aebc2215 fix(Inst. Import): correctly set component versions when updating 
This makes it so that the later call to parse the old manifest doesn't
change the class data, so that the new data con continue there and be
reflected on the component list later.

Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-17 12:38:58 -03:00
flow
5450e0edf3 fix(Inst.Import): don't set managed pack info from imported ZIPs 
This prevents the Managed Pack page from showing up even though there's
no way for it to work correctly.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-13 13:43:27 -03:00
flow
4a13d72997 Merge pull request #32 from flowln/modpack_update_page 
Closes https://github.com/PrismLauncher/PrismLauncher/issues/180
Closes https://github.com/PrismLauncher/PrismLauncher/issues/170
 2022-12-10 06:34:18 -08:00
Rachel Powers
0f48e0fc06 fix(blockedmods): Track and use targetFolder for blocked files 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-12-08 18:42:51 -07:00
flow
34230bfcf4 fix: don't try updating Flame instance names when updating versions 
Since the exact version string is only available in the manifest,
there's no easy way of getting it before commiting to the update, so
there's not much of a good way of showing the updated name in the UI,
and using the displayName is weird and gives some buggy behavior.

We may want to re-enable it in the future if we find a reliable way of
showing the correct info on the UI before starting the update.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-07 18:05:46 -03:00
flow
bb386a1162 fix(ManagedPackPage): only update the current instance exactly 
Also carry on the original ID to avoid updating the wrong instance.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:34 -03:00
flow
968366c2ae feat+fix: allow forwarding extra info to InstanceImportTask 
This allows us to pass to the creation instances their actual pack ID
and version ID, that in Flame's case, are only available before starting
to create an instance.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:32 -03:00
flow
82699cc297 feat: allow skipping the update confirmation dialog 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:32 -03:00
flow
08d008a5aa refactor: abstract away update confirmation dialog 
... so that we can avoid code duplication.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 17:00:29 -03:00
flow
cba2608c1c feat: add logic for the modrinth instance modpack page 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-06 16:54:54 -03:00
Sefa Eyeoglu
c8c3fe1023 chore: add license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-06 13:18:50 +01:00
Sefa Eyeoglu
85bddbed86 chore: reformat code 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-06 13:16:27 +01:00
Sefa Eyeoglu
07359865c6 fix: don't allocate BlockedsModsDialog 
Fixes temporary memory leak!

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-12-05 21:39:26 +01:00
flow
386fb28a35 fix(FileResolvingTask): Fail instead of crash when there's API errors 
Also remove non-used variable (rip).

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-12-01 15:33:35 -03:00
Rachel Powers
9af1b00df5 feat: add list of watched folders 
move explanation text into dialog class and it's own label

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 18:05:19 -07:00
Rachel Powers
3f6cc17818 properly handle a currently running hashing task 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 15:45:40 -07:00
Rachel Powers
5909af9878 drag&drop + add folder to watch 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 14:17:33 -07:00
flow
64576f4c4c Merge pull request #304 from Ryex/move-downloads 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/222
 2022-11-11 12:48:53 -08:00
Rachel Powers
2f10fa8b61 add some extra debug logs for CF blocked mods 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-11 05:41:32 -07:00
Sefa Eyeoglu
392452d422 Merge pull request #397 from flowln/windows_mod_updater_fixes_maybe 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/226
 2022-11-10 14:34:15 +01:00
flow
589d160515 fix: use cross-platform toStdString in FlameHasher 
Almost the same issue from toml++ :p

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-07 14:04:48 -03:00
Sefa Eyeoglu
5e9b26dbef Merge pull request #366 from TheLastRar/MSVC-Build 2022-11-04 23:49:54 +01:00
flow
d35c2db41e fix: separate types of std::string in Packwiz 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-04 16:53:25 -03:00
TheLastRar
e29259cd55 Fix: Resolve ambiguous overload errors 
Clang-cl fails to select the correct function and instead errors

Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:39 +00:00
TheLastRar
c993209b76 Fix: Explicitly specify Version.h path 
MSVC uses a different search mechanism that ends up picking the mete Version.h

Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-03 21:35:27 +00:00
flow
7956e6f04e fix: don't use forward-declared Ptr types in meta/ 
This would cause ODR violations when those headers were included in
other places that also included stuff like "Version.h" (note the
"meta/Version.h"), which can cause problems, especially in LTO.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-01 19:48:26 -03:00
Rachel Powers
209a1650e4 clang_format and code cleanup 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 07:06:36 -07:00
Rachel Powers
6010ce0dc5 chore(remove FS::copyFile): 
Now that #333 is merged and FS::copy works on non directory copyFile can be removed.

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:28:57 -07:00
Rachel Powers
a7a331a26e ensure FS::copyFile is marked for removal 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
fda2c116be code quality cleanup 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
e9d4793b1e minor clean up and add some docs 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
13c7efa058 copy found mods to instance (FTB and Flame) 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
1598d65824 watch filesystem, compute and match hashes 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
028e086960 send blocked mod info to dialog & prototype UI 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
flow
e6e92f2b0e fix: only allow workarounds for blocked mods from MR when 100% safe 
If a version on Modrinth has more than a single mod loader associated,
it means that it's possible we might get the wrong file for download,
since individual files don't really have this kind of metadata in the
API response.

So, in such cases, it's best to let the user take care of it instead.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-28 13:31:21 -03:00
Sefa Eyeoglu
93894f62ff fix: avoid segfault for unexpected API reponse 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-28 00:08:15 +02:00
flow
b638a6ae95 fix: retry mod search job after aborting it 
This way, we don't get stuck with an aborted job in our way! :o

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-24 09:09:24 -03:00
Sefa Eyeoglu
24e4db676a Merge pull request #224 from jamierocks/atl-abort-close-optional-mods-dialog 2022-10-22 15:31:53 +02:00
Sefa Eyeoglu
970e4b020e fix: fix segfault when resolving Flame resources 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-22 14:11:51 +02:00