094b57bb23
Merge pull request #372 from santiagocezar/rory
2022-11-02 12:06:08 +01:00
9ca4f19aea
remove logcat
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-02 07:45:43 -03:00
d12323396f
Merge pull request #346 from ryanccn/more-user-friendly-java-warning-text-ahaha
2022-11-02 10:38:26 +05:30
48d34741f3
keyboard navigation is important
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-01 22:53:45 -03:00
76203018e9
forgot the qrc
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
2022-11-01 20:21:34 -03:00
668342b470
add rory flat too (and holiday variants)
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
Co-authored-by: Ashtaka <66513643+AshtakaOOf@users.noreply.github.com >
2022-11-01 19:31:37 -03:00
0a0ce74105
add rory
...
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com >
Co-authored-by: Ashtaka <66513643+AshtakaOOf@users.noreply.github.com >
2022-11-01 19:06:27 -03:00
f6a3fa55b1
Merge pull request #368 from PrismLauncher/credits
2022-11-01 21:56:26 +01:00
718a9a3559
change: Update credits
...
Replaces txtsd's GitHub link with their website
Moves DioEgizio and flowln from contributors to dev team
Signed-off-by: txtsd <code@ihavea.quest >
2022-11-02 01:20:58 +05:30
5485c5aaed
Merge pull request #365 from Scrumplex/fix-logo
2022-11-01 20:34:23 +01:00
b142e2a7a7
fix: fix logo name
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-11-01 13:59:11 +01:00
04b39294ba
Merge pull request #333 from flowln/fix_atl_packs_post_modpack_update
2022-11-01 09:56:16 +01:00
3a446c410c
Merge pull request #329 from flowln/only_safe_workarounds
2022-11-01 09:55:43 +01:00
35edea2141
Merge pull request #359 from Chrono-byte/develop
2022-11-01 08:17:14 +01:00
ce1a4857cc
Merge branch 'PrismLauncher:develop' into develop
2022-10-31 20:06:59 -04:00
dfdf739282
remove one space
...
Signed-off-by: Chrono <me@disilla.org >
2022-10-31 19:44:55 -04:00
7086b1e65c
Merge pull request #351 from Scrumplex/fix-trash
2022-10-31 22:56:07 +01:00
f2d445d27b
fix: fix undo key sequence
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-31 11:34:48 +01:00
29d362a6e0
fix: do not trash instances in Flatpak
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-31 11:34:46 +01:00
c8adc4e356
Merge pull request #354 from Scrumplex/translations-maybe
...
Improve display names of certain languages
2022-10-31 08:43:43 +01:00
8467daa0ec
oop
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-10-31 14:58:38 +08:00
13e14b712e
Merge pull request #352 from TheLastRar/Win-setDarkWinTitlebar-10OrGreater
2022-10-31 07:51:13 +01:00
27dfe30fe6
Update VerifyJavaInstall.cpp
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-10-31 14:44:11 +08:00
d89a541a8d
Merge pull request #353 from FayneAldan/accounts-consistency
2022-10-30 16:52:36 -07:00
42350e689d
chore: improve display names of certain languages
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-30 23:50:57 +01:00
b7d5fee995
Change Profiles to Accounts for consistency
...
Signed-off-by: Fayne Aldan <FayneAldan@gmail.com >
2022-10-30 15:56:45 -06:00
fd099166c6
Fix: Check if Windows 10 before calling setDarkWinTitlebar()
...
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com >
2022-10-30 20:49:56 +00:00
b4be28b9bb
fix: fix disabled trash undo action
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-30 18:37:06 +01:00
19a8d51bf3
fix: more user friendly Java warning text
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-10-30 11:56:43 +08:00
87b0d3fe11
Merge pull request #342 from fn2006/prism-svg-fix
2022-10-30 01:51:14 +05:30
98891a036d
use existing variables
...
Signed-off-by: fn2006 <usernamefn2006alreadyused@protonmail.com >
2022-10-29 17:35:37 +01:00
b142a6da5b
fix hardcoded svg
...
Signed-off-by: fn2006 <usernamefn2006alreadyused@protonmail.com >
2022-10-29 16:42:37 +01:00
1c0139c5f4
Merge pull request #340 from PrismLauncher/repology
2022-10-29 16:16:12 +02:00
1b7ae4321d
Merge pull request #338 from Scrumplex/fix-credits-1
2022-10-29 16:15:34 +02:00
7f991ed897
feat: Add Repology badge to README
...
Signed-off-by: txtsd <code@ihavea.quest >
2022-10-29 19:37:00 +05:30
5ed7eb9d53
chore: update credits
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-29 13:12:51 +02:00
81333515e0
feat(tests): add test for FS::copy with files
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-28 20:55:25 -03:00
be3c9abcfe
fix: copy single files too in FS::copy
...
eek
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-28 20:54:58 -03:00
177f17450a
Merge pull request #173 from Scrumplex/fix-icons
2022-10-29 00:35:48 +02:00
150a3adaaf
Merge pull request #267 from leo78913/toolbar-icons
2022-10-28 21:28:44 +02:00
76146e0f17
add a flat white version of the launch icon
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-10-28 15:51:20 -03:00
4500e345b3
Merge branch 'PrismLauncher:develop' into toolbar-icons
2022-10-28 15:46:02 -03:00
e885f3c26a
Merge pull request #65 from he3als/develop
2022-10-28 18:43:30 +02:00
e6e92f2b0e
fix: only allow workarounds for blocked mods from MR when 100% safe
...
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-28 13:31:21 -03:00
f229574758
Merge pull request #322 from DioEgizio/64bit-it
2022-10-28 18:43:32 +05:30
7b446dd30f
Merge pull request #319 from Scrumplex/fix-avoid-mr-segfault
2022-10-28 13:40:52 +02:00
a5be974f1a
feat: use clang64 on qt6 builds
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com >
2022-10-28 08:05:31 +02:00
952615eadb
Merge pull request #301 from DioEgizio/clang-attempt
...
feat(actions): use clang32 for building on windows
2022-10-28 07:54:17 +02:00
93894f62ff
fix: avoid segfault for unexpected API reponse
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-28 00:08:15 +02:00
2051de51b5
Merge pull request #318 from TheLastRar/manifest-platform
...
Fix: Don't specify x86 in manifest
2022-10-27 22:53:15 +02:00
