aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-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-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>
2022-10-23Fix new flat white iconshe3als
Signed-off-by: he3als <65787561+he3als@users.noreply.github.com>
2022-10-23Merge pull request #240 from jn64/fix/version-label-widthSefa Eyeoglu
2022-10-23Fix version labels widthjn64
Make labels fit to the contents, so Ibeam cursor doesn't appear over empty space. Should have been done with 90025ed. Signed-off-by: jn64 <23169302+jn64@users.noreply.github.com>
2022-10-22Merge pull request #234 from AliceDTRH/fix/dedupejavaflow
2022-10-22oopsRyan Cao
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
2022-10-22add linux supportRyan Cao
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
2022-10-22Merge pull request #233 from jamierocks/atl-fix-aborting-installsflow
2022-10-22Use correct variable for WindowsAliceDTRH
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com>
2022-10-22DCO Remediation Commit for he3als <65787561+he3als@users.noreply.github.com>he3als
I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: d87f743a2bd2fac761b94de77ed7255d7a983f03 I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 92dfd659f1a3e11accdbf0ebbdc7cb91f74d9a21 I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: a6e65dfc7a7e8080297b59ecf322b788d1c9bad2 I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 99e1c13e80d12764f57a993661656d9ed7de27bb Signed-off-by: he3als <65787561+he3als@users.noreply.github.com>
2022-10-22fix: add flat_white to codehe3als
2022-10-22Add new flat white iconshe3als
2022-10-22Deduplicates java installs before passing it onAliceDTRH
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com>
2022-10-22Merge branch 'PrismLauncher:develop' into develophe3als
2022-10-22ATLauncher: Fix pack installation always abortingJamie Mansfield
I made a mistake during when cherry picking a previous commit, this applies the change - and fixes installing ATLauncher packs.
2022-10-22Merge pull request #215 from forkiesassds/developflow
2022-10-22Merge pull request #230 from Scrumplex/add-pr-templateSefa Eyeoglu
generated by cgit (git 2.46.0) at 2025-02-03 05:54:40 +0000