aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-11-01send blocked mod info to dialog & prototype UIRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2022-11-01Merge pull request #333 from flowln/fix_atl_packs_post_modpack_updatetimoreo
2022-11-01Merge pull request #329 from flowln/only_safe_workaroundstimoreo
2022-11-01Merge pull request #359 from Chrono-byte/developDioEgizio
2022-10-31Merge branch 'PrismLauncher:develop' into developChrono
2022-10-31remove one spaceChrono
Signed-off-by: Chrono <me@disilla.org>
2022-10-31Merge pull request #351 from Scrumplex/fix-trashSefa Eyeoglu
2022-10-31fix: fix undo key sequenceSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-31fix: do not trash instances in FlatpakSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-31Merge pull request #354 from Scrumplex/translations-maybeDioEgizio
Improve display names of certain languages
2022-10-31oopRyan Cao
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
2022-10-31Merge pull request #352 from TheLastRar/Win-setDarkWinTitlebar-10OrGreaterDioEgizio
2022-10-31Update VerifyJavaInstall.cppRyan Cao
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
2022-10-30Merge pull request #353 from FayneAldan/accounts-consistencyflow
2022-10-30chore: improve display names of certain languagesSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-30Change Profiles to Accounts for consistencyFayne Aldan
Signed-off-by: Fayne Aldan <FayneAldan@gmail.com>
2022-10-30Fix: Check if Windows 10 before calling setDarkWinTitlebar()TheLastRar
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
2022-10-30fix: fix disabled trash undo actionSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-30fix: more user friendly Java warning textRyan Cao
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
2022-10-29added option to not copy screenshotsMarcelo Hernandez
+ moved select all checkbox to top row, centered. Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
2022-10-30Merge pull request #342 from fn2006/prism-svg-fixtxtsd
2022-10-29use existing variablesfn2006
Signed-off-by: fn2006 <usernamefn2006alreadyused@protonmail.com>
2022-10-29fix hardcoded svgfn2006
Signed-off-by: fn2006 <usernamefn2006alreadyused@protonmail.com>
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>
generated by cgit (git 2.46.0) at 2025-03-15 10:25:54 +0000