aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-10-29Merge pull request #340 from PrismLauncher/repologySefa Eyeoglu
2022-10-29Merge pull request #338 from Scrumplex/fix-credits-1Sefa Eyeoglu
2022-10-29feat: Add Repology badge to READMEtxtsd
Signed-off-by: txtsd <code@ihavea.quest>
2022-10-29chore: update creditsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-29create getters and setters for InstanceCopyPrefsMarcelo Hernandez
+ use pragma once like other .h files in this directory Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
2022-10-28feat(tests): add test for FS::copy with filesflow
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-28fix: copy single files too in FS::copyflow
eek Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-29Merge pull request #173 from Scrumplex/fix-iconsSefa Eyeoglu
2022-10-28Merge pull request #267 from leo78913/toolbar-iconsSefa Eyeoglu
2022-10-28add a flat white version of the launch iconleo78913
Signed-off-by: leo78913 <leo3758@riseup.net>
2022-10-28Merge branch 'PrismLauncher:develop' into toolbar-iconsleo78913
2022-10-28Merge pull request #65 from he3als/developSefa Eyeoglu
2022-10-28fix: only allow workarounds for blocked mods from MR when 100% safeflow
If a version on Modrinth has more than a single mod loader associated, it means that it's possible we might get the wrong file for download, since individual files don't really have this kind of metadata in the API response. So, in such cases, it's best to let the user take care of it instead. Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-29fix(style): convert tabs to spacesRyan Cao
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
2022-10-28Merge pull request #322 from DioEgizio/64bit-ittxtsd
2022-10-28Merge pull request #319 from Scrumplex/fix-avoid-mr-segfaultSefa Eyeoglu
2022-10-28feat: use clang64 on qt6 buildsDioEgizio
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-10-28Merge pull request #301 from DioEgizio/clang-attemptDioEgizio
feat(actions): use clang32 for building on windows
2022-10-28fix: avoid segfault for unexpected API reponseSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-27Merge pull request #318 from TheLastRar/manifest-platformSefa Eyeoglu
Fix: Don't specify x86 in manifest
2022-10-27chore: add comment about copy bugSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-27feat(actions): use clang32 for building on windowsDioEgizio
*way* faster Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-10-27Fix: Don't specify x86 in manifestTheLastRar
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
2022-10-27Merge pull request #315 from AshtakaOOf/developflow
Remove appveyor from README
2022-10-27Remove appveyorAdrien
I forgor :skull: But seriously I forgor to remove the &logo=appveyor thing AAAAAH!!! Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com>
2022-10-26Add CI build for SnapPiper McCorkle
Signed-off-by: Piper McCorkle <contact@piperswe.me>
2022-10-26Add a snapcraft.yml for building SnapsPiper McCorkle
The included snapcraft.yml can be used to build a Snap (the application format used by Canonical's modern package manager) out of Prism. If the project wants in the future, Prism can publish these Snaps to the Snap Store so the Prism Launcher can be installed through the Ubuntu Software app on vanilla Ubuntu. I haven't registered the Snap name, so it's currently free for anyone to reserve. I'd suggest that a Prism developer register the name prismlauncher at https://snapcraft.io/register-snap to ensure the name belongs to the project, even if there are no plans of setting up CI to publish snaps in the short term. I have also modified JavaUtils.cpp to be able to autodetect the Java versions included in the Snap, and added "*.snap" to the .gitignore so the compiled Snap isn't accidentally committed to the repository. Signed-off-by: Piper McCorkle <contact@piperswe.me>
2022-10-26Abstract away InstanceCopyPrefs' internals through new ↵Marcelo Hernandez
getSelectedFiltersAsRegex() function + fix typo in comment + remove unused import + add [[nodiscard]] to methods Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
2022-10-25Improve a bit README.md (#305)Adrien
Add Open Collective and fix some stuff.
2022-10-25Merge pull request #231 from tobimori/patch-1Sefa Eyeoglu
2022-10-25update macos copyright yeartobimori
Signed-off-by: tobimori <tobias@moeritz.cc>
2022-10-25Merge pull request #206 from flowln/changelog_height_fixDioEgizio
2022-10-25move .app rename to packaging process, update mac copyright stringtobimori
Signed-off-by: tobimori <tobias@moeritz.cc>
2022-10-24remove checkBool function, add updateSelectAllCheckbox functionMarcelo Hernandez
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
2022-10-24Simplify bool check in CopyInstanceDialog.cppMarcelo Hernandez
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
2022-10-24Merge pull request #283 from flowln/fix_abort_on_autosearchSefa Eyeoglu
2022-10-24Merge pull request #211 from Hibiii/show-instace-argSefa Eyeoglu
2022-10-25add .mrpack mime typeRyan Cao
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
2022-10-24Merge pull request #281 from Scrumplex/fix-nsis-displaynameflow
2022-10-24fix: retry mod search job after aborting itflow
This way, we don't get stuck with an aborted job in our way! :o Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-24fix: use display name in NSISSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-24fix: update icon generate scriptSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-24Merge pull request #274 from Protrikk/patch-1Sefa Eyeoglu
2022-10-23Check "Select all" checkbox if all options are already selectedMarcelo Hernandez
+ code cleanup Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
2022-10-23Add "Select all" checkbox + ui revamp + code cleanupMarcelo Hernandez
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
2022-10-23add more options to copy instance dialogMarcelo Hernandez
- Copy game options, copy resource packs, copy shaders, copy servers, and copy mods - Also made a new InstanceCopyPrefs struct to store those options rather than passing 7 different booleans into InstanceCopyTask's constructor Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
2022-10-23add icons to the instance toolbarleo78913
Signed-off-by: leo78913 <leo3758@riseup.net>
2022-10-23Better dark theme selection contrastTrisave
Tweak background of the selection background in order to make text more readable Signed-off-by: Trisave <42098407+Protrikk@users.noreply.github.com>
2022-10-23Merge pull request #228 from bensuperpc/change_castflow
2022-10-23Replace tab with spaces in flat_white.qrche3als
Signed-off-by: he3als <65787561+he3als@users.noreply.github.com>