aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft
AgeCommit message (Collapse)Author
2023-01-24fix(ResourceFolder): don't create two smart ptrs for the same raw ptrflow
Signed-off-by: flow <flowlnlnln@gmail.com>
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-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-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-14Improve handling of destructive actionsTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2022-12-11Not all libraries are from MojangUna
Signed-off-by: Una <me@unascribed.com>
2022-12-11Merge pull request #569 from Jan200101/PR/fix-mangohudSefa Eyeoglu
2022-12-11Merge pull request #461 from flowln/fix_big_resource_pack_imgsflow
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/360
2022-12-11chore: replace naive mangohud preload with vklayer detectionJan200101
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
2022-12-08fix: re-add LD_LIBARY_PATH to mangohudJan200101
Upstream officially supports the use of $LIB/mangohud/ Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
2022-12-02Merge pull request #423 from TheKodeToad/addagentflow
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/414
2022-12-02Merge pull request #481 from ryanccn/import-resource-pack-dialog-uwuflow
2022-11-29Make requested changesTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2022-11-28fix: don't disable interaction on non-mod models when inst. is runningflow
It is still useful for mods though, since we don't wnt to allow disabling mods when the instance is running, as that wouldn't affect the running instance, possibly causing confusion Signed-off-by: flow <flowlnlnln@gmail.com>
2022-11-27fix: check resource pack validity solely using pack formatSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-11-23Button to add agentTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2022-11-21Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Ryan Cao
into import-resource-pack-dialog-uwu
2022-11-20fix: remove commented-out assertionsflow
They may not hold true at all times, and that's fine. Signed-off-by: flow <flowlnlnln@gmail.com>
2022-11-20refactor: move RP/TP validation to their respective utilsflow
This makes it easier to validate individual resources, and allows the logic to be used in other places in the future, if we need to. Signed-off-by: flow <flowlnlnln@gmail.com>
2022-11-19Merge pull request #291 from TheKodeToad/betterjavalauncherSefa Eyeoglu
2022-11-19fix instance IDs and resource pack importsRyan Cao
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
2022-11-19fix: add resource pack format for 1.19.3Ryan Cao
Co-authored-by: Rachel Powers <508861+Ryex@users.noreply.github.com> Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
2022-11-19fix: check if packFormat is valid for resourcepack parsingRyan Cao
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
2022-11-19fix resource packs and add support for texture packsRyan Cao
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
2022-11-16refactor: use isEmpty instead of size for listsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
generated by cgit (git 2.46.0) at 2025-02-03 12:02:34 +0000