aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft/mod
AgeCommit message (Collapse)Author
2023-10-04Merge pull request #1678 from Trial97/release_orderHEADdevelopTayou
fixed quilt dependencies
2023-10-04Merge pull request #1537 from Trial97/warningsSefa Eyeoglu
2023-10-04Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into release_order
2023-10-04updated dependency cycleTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-10-02Merge pull request #1657 from Trial97/shader_txtSefa Eyeoglu
2023-09-28Merge pull request #1263 from Trial97/developSefa Eyeoglu
2023-09-28Merge pull request #1363 from Trial97/download_threadsSefa Eyeoglu
2023-09-25Do not display invalid shadersTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-09-25Update links to Minecraft Wikialexia
Minecraft Wiki has officially moved from Fandom to their own wiki. I updated some links I found in comments. Signed-off-by: alexia <me@alexia.lol>
2023-09-20Update launcher/minecraft/mod/tasks/GetModDependenciesTask.cppAlexandru Ionut Tripon
Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-09-04Merge pull request #1578 from TheKodeToad/antialiasingSefa Eyeoglu
2023-09-04Merge pull request #1530 from Trial97/metadata_deleteSefa Eyeoglu
2023-08-29Enable antialiasing for mod and pack iconsTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-27Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into develop Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-27Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into curse_multiple_loaders2 Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-25minor dependency crash fixTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-23reverted change for optionalTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-23Added loaders check on versions loadTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-23moved modloaderTypes to ModPlatformTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-18added -Wno-gnu-zero-variadic-macro-arguments and fixed more warningsTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-17Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into develop
2023-08-17feat:added flame install mod metadataTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-16made safe for vegetariansTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-16feat:Added remove metadata buttonTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-15Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into download_threads Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-15Some warningsTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-14chore: update license headersSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-14chore: reformatSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-11fix: fix more warningsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-10Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warningsSefa Eyeoglu
2023-08-10Merge pull request #1324 from leia-uwu/ui-tweaksSefa Eyeoglu
2023-08-05Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into download_threads Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-05Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into develop12 Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-04chore: update license headersSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02chore: reformatSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-07-30Merge branch 'develop' into chore/add-compiler-warningsRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-26fix: add support for QByteArray inifileTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-14fixed testsTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-14Split in two the optionsTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-14Merge pull request #1335 from Ryex/fix/gh-1322-old-zip-mods-in-wrong-placeseth
fix(flame install): don't assume .zip is a resource pack. default to mod
2023-07-13Update launcher/minecraft/mod/tasks/LocalResourceParse.cppRachel Powers
Co-authored-by: seth <getchoo@tuta.io> Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-13Merge branch 'develop' into chore/add-compiler-warningsRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-10Merge pull request #1331 from TheKodeToad/hungry-trashseth
Fix updating trashing resources
2023-07-08fix(flame install): don't assume .zip is a resource pack. default to modRachel Powers
let identifier move it if needed Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-08Make trash hungryTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-08Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into settings Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-07Merge pull request #1120 from Trial97/visit_mod_pageTayou
2023-07-07disable hiding enable and name columns on folder modelsleo78913
Signed-off-by: leo78913 <leo3758@riseup.net>
2023-07-04Merge branch 'develop' into fix-implicit-fallthroughPandaNinjas
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
2023-07-01chore: fix shadowed member and signed/unsigned mismatchRachel Powers
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>