aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft
AgeCommit message (Collapse)Author
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-10Merge pull request #1331 from TheKodeToad/hungry-trashseth
Fix updating trashing resources
2023-07-10Merge pull request #1334 from TheKodeToad/litemod-dlTheKodeToad
LiteMod downloading
2023-07-08LiteMod downloadingTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
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-04Merge branch 'develop' into fix-implicit-fallthroughPandaNinjas
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
2023-06-28Added warnings for running instancesTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-28Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into settings
2023-06-26Generate special signature :sparkles: composed of multiple elements instead ↵TheKodeToad
of relying on timestamp for Java version cache invalidation Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-25Made custom url functionTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-24Added translationTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-24Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into develop
2023-06-23fix: fix crash when hiding columns on resource packs pageleo78913
Signed-off-by: leo78913 <leo3758@riseup.net>
2023-06-23Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into develop Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-22Merge pull request #1058 from Ryex/feature/images-for-resource-pageRachel Powers
Feature: image coumn for Mod, Resource Pack, and Texturepack pages
2023-06-21Made buttons on ModsFolderPage enabled all the timeTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-21fix: resize columns on hide ^& uniform heightsRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-20Added fallback for quilt if the API or Kotilin is not presentTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-20Remove inconsistent/unneeded question marks in UIAlfio
Signed-off-by: P2 <tomarchioalfio5@gmail.com>
2023-06-19Fixed buildTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-19Fixed removeIfTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-19Added overide for Quilt/FabricTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-19Fixed regresion regarding modrinth project_id in dependence arrayTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-19Changed qWarning to qDebug for raw dataTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-19Small fixesTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-19Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into develop
2023-06-15fix: add JavaVendor as an instance overrideSefa Eyeoglu
This should suppress a critical error that gets printed every time an instance gets launched, as JavaCheck wants to store the vendor in the instance settings. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-06-15Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into develop
2023-06-07Resolve other switch fallthrough issuesPandaNinjas
2023-06-07Fix the AccountList codePandaNinjas
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
2023-06-07Add sensible defaults in AccountList.cppPandaNinjas
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
2023-06-07Merge pull request #1111 from Trial97/requiresTayou
2023-06-06update resource and data pack pack_format_versionsleo78913
Signed-off-by: leo78913 <leo3758@riseup.net>
2023-06-06Renamed requires fieldsTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-05-28fix: use instance settings, make image column user resizeable, fix memory leakRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-28refactor: column names as class property, use string names in settingRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-28Merge branch 'develop' into feature/images-for-resource-pageRachel Powers
2023-05-28Fixed Ptr logicTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-05-28Merge branch 'Fix_Assert' of github.com:Trial97/PrismLauncher into developTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-05-28fix(memory leak): don't give shared pointers out to foldermodels (causes ↵Rachel Powers
cyclic refrence) Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-24feat: Column on left, hideableRachel Powers
- columns are hideable (saves to settings) - image column moved to left - datamodals can provide resize modes Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-14Made sure the metadata is valid when checking mod depsTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-05-14Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into develop
2023-05-12Merge branch 'develop' into fix/network_and_signalsRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-07Merge remote-tracking branch 'upstream/develop' into better-tasksRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-05-05feat: display license and issue trackerRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
generated by cgit (git 2.46.0) at 2025-02-03 21:49:37 +0000