aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft
AgeCommit message (Collapse)Author
2022-12-26Merge pull request #618 from TheKodeToad/safer-destructive-actionsSefa Eyeoglu
Fixes https://github.com/PolyMC/PolyMC/issues/948
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-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>
2022-11-16fix: serialize metadata extensionsSefa Eyeoglu
Prism has introduced a few extensions to the meta component version format, which were not exported as JSON in the launcher. This caused the `Customize` button on the version page to not write these new properties to the custom component file. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-11-16fix: remove unnecessary conditionSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-11-15fix: use QPixmapCache only from the main threadflow
It's a required condition. Signed-off-by: flow <flowlnlnln@gmail.com>
2022-11-15fix: don't retry to load RP images that can't fit in the cacheflow
Avoids an infinite loop when the image is too big. Signed-off-by: flow <flowlnlnln@gmail.com>
2022-11-14Merge pull request #428 from DioEgizio/fixes-to-CIflow
2022-11-14Pass index.parent() as parent parameter for rowCountTheLastRar
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
2022-11-14Use Q_UNUSED instead of [[maybe_unused]] in onParseFailedTheLastRar
Qt5 on Ubuntu cannot handle [[maybe_unused]] in this function Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
2022-11-14Check parent in rowCount/columnCount/canFetchMoreTheLastRar
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
2022-11-14Mark paramaters of dropMimeData as unusedTheLastRar
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
2022-11-14Mark paramaters of onParseFailed as unusedTheLastRar
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
2022-11-14Mark paramater runtimeContext as unusedTheLastRar
Base class uses variable, but ImplicitRule does not Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
2022-11-13fix: Fix the error that CodeQL caughttxtsd
Signed-off-by: txtsd <code@ihavea.quest>
2022-11-10Merge pull request #397 from flowln/windows_mod_updater_fixes_maybeSefa Eyeoglu
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/226
2022-11-08A lot more cleanupTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2022-11-08Remove arguments being passed twiceTheKodeToad
Passing the classpath into stdin has no effect. Java is already provided the classpath with -cp, which pretty much takes up the largest part of the arguments anyway, which leads me to wonder, what's the point of stdin arguments at all? Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2022-11-08Various tweaks to the Java component of the launcherTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2022-11-04refactor: move MMCStrings -> StringUtilsflow
General utilities can go in here >:) Signed-off-by: flow <flowlnlnln@gmail.com>
2022-11-04fix: use unicode variant for marking '.index' hiddenflow
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-11-04Merge pull request #374 from flowln/fix_ltotxtsd
2022-11-01fix: don't use forward-declared Ptr types in meta/flow
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-10-31oopRyan Cao
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
2022-10-31Update VerifyJavaInstall.cppRyan Cao
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
2022-10-30fix: more user friendly Java warning textRyan Cao
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
2022-10-19RenameSamisafool
Signed-off-by: Samisafool <thenerdiestguy@gmail.com>
2022-10-18fix: use display name in codeSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-08Merge pull request #1033 from Scrumplex/multi-arch-supportSefa Eyeoglu
2022-10-08chore: add missing license headersSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>