aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft
AgeCommit message (Collapse)Author
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-04Merge pull request #1102 from Ryex/refactor/net-split-headers-to-proxy-classSefa Eyeoglu
2023-08-02Merge pull request #1339 from TheKodeToad/remove-direct-launchSefa Eyeoglu
2023-08-01Fix: always false comparisonRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-31Merge branch 'develop' into refactor/net-split-headers-to-proxy-classRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-30Merge branch 'develop' into chore/add-compiler-warningsRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-30Merge pull request #1449 from Trial97/tehnicSefa Eyeoglu
Reintroduce parsing of INI files
2023-07-26fix: add support for QByteArray inifileTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-26fix: typo in task.hseth
Signed-off-by: seth <getchoo@tuta.io>
2023-07-24Fix token "0" being replacedTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-19Merge pull request #1399 from Scrumplex/offline-uuidTheKodeToad
fix: generate predictable UUIDs for offline accounts
2023-07-18fix: generate predictable UUIDs for offline accountsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-07-17Make Launch Offline not launch online in 1.6+Josiah Glosson
Signed-off-by: Josiah Glosson <soujournme@gmail.com>
2023-07-17fix: don't take modloaders by referenceSefa Eyeoglu
Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-07-17fix: check if any modloader is installedSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-07-17Merge pull request #1357 from getchoo/quilt-beaconSefa Eyeoglu
feat: add toggle for quilt beacon
2023-07-15chore: better explain quilt loader beaconseth
Signed-off-by: seth <getchoo@tuta.io>
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-12feat: add toggle for quilt beaconseth
Signed-off-by: seth <getchoo@tuta.io>
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-10Remove direct launchTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
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-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>
2023-07-01chore: fix propagate mispellingRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-01fix: toml without exceptions usageRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-01Merge branch 'develop' into chore/add-compiler-warningsRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
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-25Merge remote-tracking branch 'upstream/develop' into ↵Rachel Powers
refactor/net-split-headers-to-proxy-class
2023-06-25refactor: split out setting api headers for downloadsRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
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>
generated by cgit (git 2.46.0) at 2025-02-11 02:06:01 +0000