aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft
AgeCommit message (Collapse)Author
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-14Merge commit 'ce2ca1381519a2e261d7f76dffa874d559d979c2' into stagingSefa Eyeoglu
2023-08-12Improvements and refinements to pack exportTheKodeToad
- Persist fields - Toggle optional files Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-12Merge branch 'develop' into feat/acknowledge_release_typeAlexandru Ionut Tripon
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-08-11fix: use QColorConstants in Qt 5.14+Sefa 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-10Fix transparency in skin iconmaple!
QPainter has a bug where drawing transparency to a freshly initialized, empty QPixmap causes garbage data to be drawn. This broke the rendering of the skin icon. The fix is simply to fill the QPixmap with empty transparent pixels beforehand. Signed-off-by: maple! <averyrudelphe@gmail.com>
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-04Merge pull request #1102 from Ryex/refactor/net-split-headers-to-proxy-classSefa Eyeoglu
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-08-02fix: remove irregular enum initializationSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02fix: simplify switch statementSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
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-22Merge branch 'develop' into better-launchTheKodeToad
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-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-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-06Import QActionGroup properly :PTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>