aboutsummaryrefslogtreecommitdiff
path: root/launcher
AgeCommit message (Collapse)Author
2022-12-02Remove blue-ish tint from remaining flat white iconsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-12-02Merge branch 'upstream/develop' into developSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
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-12-01fix: explicitly set scheme for local file in -I argumentflow
Otherwise isLocalFile() will return false for local files without the file:// thingy. Signed-off-by: flow <flowlnlnln@gmail.com>
2022-12-01fix(FileResolvingTask): Fail instead of crash when there's API errorsflow
Also remove non-used variable (rip). Signed-off-by: flow <flowlnlnln@gmail.com>
2022-12-01fix(Inst.Import): Show error reason in fail dialogflow
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-12-01fix(Inst.Import): don't search inside 'overrides/' for the manifestflow
It will never be there anyways, and saves a **bunch** of time when the overrides folder is big and we traverse all the tree when searching for the MMC 'instance.cfg' file. Signed-off-by: flow <flowlnlnln@gmail.com>
2022-11-30Merge pull request #436 from Scrumplex/feat-change-maxmemSefa Eyeoglu
Closes https://github.com/PrismLauncher/PrismLauncher/issues/426
2022-11-29Merge pull request #238 from santiagocezar/new-iconsflow
2022-11-29chore: move instance_icons.svgSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
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: make resource buttons work when instance is runningSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-11-27Merge branch 'develop' into new-iconsSantiago Cézar
Signed-off-by: Santiago Cézar <48573316+santiagocezar@users.noreply.github.com>
2022-11-27resolving reviewsSantiago Cézar
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
2022-11-27Merge remote-tracking branch 'upstream/develop' into ↵Sefa Eyeoglu
import-resource-pack-dialog-uwu
2022-11-27fix: check resource pack validity solely using pack formatSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-11-27fix: improve code readabilitySefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-11-26fix: use monochrome icon for breezeDioEgizio
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-11-25remove unused ftb iconSantiago Cézar
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
2022-11-25meat is now roundSantiago Cézar
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
2022-11-25resize to 24x24Santiago Cézar
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
2022-11-25forgot ftbSantiago Cézar
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
2022-11-25merge with upstreamSantiago Cézar
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
2022-11-25gradients!Santiago Cézar
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
2022-11-25initial iconsSantiago Cézar
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
2022-11-25fix(RPImportDialog): allow changing item size to accomodate wrapped textflow
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-11-25fix: add missing shortcut iconsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-11-25Merge pull request #227 from Leo40Git/feature/instance-shortcutsSefa Eyeoglu
Closes https://github.com/PrismLauncher/PrismLauncher/issues/210
2022-11-25Merge pull request #412 from leo78913/legacy-iconsSefa Eyeoglu
add the missing icons to the legacy icon theme
2022-11-23Button to add agentTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2022-11-22Remove blue-ish tint from flat white iconsTrisave
Signed-off-by: Trisave <42098407+Protrikk@users.noreply.github.com>
2022-11-21Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Ryan Cao
into import-resource-pack-dialog-uwu
2022-11-21fix: actually emit fileCopiedSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-11-21Merge pull request #487 from TayouVR/breeze-icon-themesDioEgizio
2022-11-21Merge pull request #243 from Scrumplex/migration-dialogSefa Eyeoglu
Closes https://github.com/PrismLauncher/PrismLauncher/issues/46 Closes https://github.com/PrismLauncher/PrismLauncher/issues/204
2022-11-21fix: text wrappingRyan Cao
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
2022-11-20feat: validate maximum memory allocation in wizardSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
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-20add breeze themesTayou
Signed-off-by: Tayou <tayou@gmx.net>
2022-11-19Merge pull request #291 from TheKodeToad/betterjavalauncherSefa Eyeoglu
2022-11-20fix: stray includeRyan Cao
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
2022-11-20fix: add support for CLI and drag and dropRyan Cao
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
2022-11-19Fix New Zealand English displayjopejoe1
Signed-off-by: jopejoe1 <34899572+jopejoe1@users.noreply.github.com>
2022-11-20fix: resource pack import dialog icons and add messageRyan Cao
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
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>