aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft
AgeCommit message (Collapse)Author
2023-03-05Merge pull request #853 from kumquat-ir/nilSefa Eyeoglu
NilLoader mod metadata support
2023-03-01fix: use makeShared for importing componentsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-03-01Merge pull request #735 from Scrumplex/import-componentSefa Eyeoglu
2023-02-22review fixeskumquat-ir
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-19fix metadata for mods with `.nilmod` extensionkumquat-ir
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-16minor cleanupkumquat-ir
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-13do not create nilmods folderkumquat-ir
"it cant be that easy" - me, clueless Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-12switch to qdcss for parsingkumquat-ir
make it not horrible to look at Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-11nilmods instance pagekumquat-ir
mostly copied from the coremod page impl Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-11parse nil metadatakumquat-ir
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2023-02-04ensure command env vars use native path seperatorsRachel Powers
fix #824 Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-02-03fix: fix component uid regexSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-02-02fix: give error when components have bad uidsflow
This allows other code to reject proceeding when the UID is bad, which is generally a good idea. :p Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: flow <flowlnlnln@gmail.com>
2023-01-25refactor: make shared_qobject_ptr ctor explicitflow
This turns issues like creating two shared ptrs from a single raw ptr from popping up at runtime, instead making them a compile error. Signed-off-by: flow <flowlnlnln@gmail.com>
2023-01-25refactor: add error handling to component importSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-01-25Merge pull request #784 from flowln/fix_resource_folder_double_smart_ptrsSefa Eyeoglu
2023-01-24fix(ResourceFolder): don't create two smart ptrs for the same raw ptrflow
Signed-off-by: flow <flowlnlnln@gmail.com>
2023-01-24Merge branch 'develop' into remove-updaterSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-01-23Merge pull request #675 from flowln/generalize_mod_modelSefa Eyeoglu
2023-01-16Merge pull request #696 from Ryex/import-all-the-thingsSefa Eyeoglu
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/581 Fixes https://github.com/PrismLauncher/PrismLauncher/issues/700
2023-01-14chore: update license headersSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-01-14Merge pull request #743 from flowln/fix_mods_with_wrong_modListVersionflow
2023-01-13fix: don't fail mod parsing when encountering invalid modListVersionflow
The spec (admitely a very old one) states that this entry should always have the value "2". However, some mods do not follow this convention, causing issues. One notable example is the 1.6 version of Aether II for 1.7.10, that has this value set at "5" for whatever reason. Signed-off-by: flow <flowlnlnln@gmail.com>
2023-01-13refactor: generalize mod models and APIs to resourcesflow
Firstly, this abstract away behavior in the mod download models that can also be applied to other types of resources into a superclass, allowing other resource types to be implemented without so much code duplication. For that, this also generalizes the APIs used (currently, ModrinthAPI and FlameAPI) to be able to make requests to other types of resources. It also does a general cleanup of both of those. In particular, this makes use of std::optional instead of invalid values for errors and, well, optional values :p This is a squash of some commits that were becoming too interlaced together to be cleanly separated. Signed-off-by: flow <flowlnlnln@gmail.com>
2023-01-12Merge branch 'PrismLauncher:develop' into instance-accountsAaron Sonin
2023-01-11feat: add button to import component JSONsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-01-09chore: cleanup review suggestionsRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-01-07feat: Import all the things!Rachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-01-07Merge pull request #576 from Ryex/identify-zip-packsSefa Eyeoglu
fix https://github.com/PrismLauncher/PrismLauncher/issues/349
2023-01-02Merge branch 'PrismLauncher:develop' into instance-accountsAaron Sonin
2023-01-02Allow selecting a default account to use with an instanceAaron
Signed-off-by: Aaron <10217842+byteduck@users.noreply.github.com>
2022-12-30fix newlinesRachel Powers
Co-authored-by: flow <flowlnlnln@gmail.com> Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2022-12-30Merge pull request #626 from leo78913/mods-provider-columnflow
closes https://github.com/PrismLauncher/PrismLauncher/issues/402
2022-12-29refactor: add an `identify` function to make easy to reuseRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2022-12-29refactor(Mods): make provider() return a std::optionalflow
This makes it easier to check if a mod has a provider or not, without having to do a string comparison. Signed-off-by: flow <flowlnlnln@gmail.com>
2022-12-27refactor: add logging category for credentialsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-12-26fix: cleanup and suggested changesRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2022-12-26Merge pull request #618 from TheKodeToad/safer-destructive-actionsSefa Eyeoglu
Fixes https://github.com/PolyMC/PolyMC/issues/948
2022-12-24feat: zip resource validation check for flameRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2022-12-24fix: update parse testsRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2022-12-24feat: validate world savesRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2022-12-24feat: worldSave parsing and validationRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2022-12-24feat: add shaderpack validationRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2022-12-24feat: add a `ModUtils::validate`Rachel Powers
moves the reading of mod files into `ModUtils` namespace Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2022-12-24feat: add initial support for parseing datapacksRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2022-12-16fix: translate unknown mod providerleo78913
Co-authored-by: flow <flowlnlnln@gmail.com> Signed-off-by: leo78913 <leo3758@riseup.net>
2022-12-15fix(ResourceModel): use a single ConcurrentTask for parsing tasksflow
This avoids creating a bunch of threads that fills up the maximum amount allowed by QThreadPool, and causes a deadlock between the helper threads and the main thread (main thread tries to create threads in painting code, but isn't able to, so it keeps waiting for a thread to free up, but all the threads are waiting on the main thread to process some events). Signed-off-by: flow <flowlnlnln@gmail.com>
2022-12-15feat: add a provider column to the mods pageleo78913
Signed-off-by: leo78913 <leo3758@riseup.net>
2022-12-14Merge branch 'develop' into remove-updaterSefa Eyeoglu
2022-12-14Improve handling of destructive actionsTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>