0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,103 Commits 1 Branch 0 Tags 29 MiB
086304f7f2
Commit Graph

1445 Commits

Author SHA1 Message Date
TheKodeToad
a29d88c313 Even more fixes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-02 09:59:58 +00:00
TheKodeToad
a1ed8154f7 Another fix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-02 09:31:39 +00:00
TheKodeToad
6c45a990ef A good use of auto 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-02 09:13:44 +00:00
TheKodeToad
8dfa3393dc Formatting and forward-declaration 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-02 08:43:46 +00:00
txtsd
d12323396f
Merge pull request #346 from ryanccn/more-user-friendly-java-warning-text-ahaha 2022-11-02 10:38:26 +05:30
Santiago Cézar
48d34741f3 keyboard navigation is important 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-01 22:53:45 -03:00
Santiago Cézar
76203018e9 forgot the qrc 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
 2022-11-01 20:21:34 -03:00
flow
7956e6f04e
fix: don't use forward-declared Ptr types in meta/ 
This would cause ODR violations when those headers were included in
other places that also included stuff like "Version.h" (note the
"meta/Version.h"), which can cause problems, especially in LTO.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-01 19:48:26 -03:00
Santiago Cézar
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
Santiago Cézar
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
txtsd
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
Tayou
afcdf4b9cf
condensed icon theme code 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-01 20:18:07 +01:00
Tayou
a3f5ea3598
added suggested changes 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-01 20:17:53 +01:00
Tayou
fef60a9da0
add support for multiple custom themes 
also moved theme related code from Application.cpp to new ui/themes/ThemeManager.cpp, this class should cleanly isolate theme related functions and help avoid code duplication in future theme related additions.
Themes can now be just qss or css files, they won't have color pallette information with them in that case

Signed-off-by: Tayou <tayou@gmx.net>
 2022-11-01 20:10:12 +01:00
TheKodeToad
576867605d Add another fallback 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 18:40:12 +00:00
TheKodeToad
d1626d20bd Slight cleanup 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 18:30:11 +00:00
TheKodeToad
c890aa18f7 Only select correct mod 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 18:25:54 +00:00
TheKodeToad
6c7d040439 Hacky tweaks 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 18:12:27 +00:00
TheKodeToad
d03ae34b61 Auto-select first result 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 17:19:54 +00:00
TheKodeToad
b9547adce7 Add more license headers 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 17:02:24 +00:00
TheKodeToad
7f32c6464d Initial better mod browser link implementation 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-11-01 16:58:22 +00:00
Rachel Powers
209a1650e4 clang_format and code cleanup 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 07:06:36 -07:00
Rachel Powers
6010ce0dc5 chore(remove FS::copyFile): 
Now that #333 is merged and FS::copy works on non directory copyFile can be removed.

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:28:57 -07:00
Rachel Powers
a7a331a26e ensure FS::copyFile is marked for removal 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
fda2c116be code quality cleanup 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
d2f3dbaa29 fix mispellings and wrap strings for translation 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
e9d4793b1e minor clean up and add some docs 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
13c7efa058 copy found mods to instance (FTB and Flame) 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
1598d65824 watch filesystem, compute and match hashes 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
Rachel Powers
028e086960 send blocked mod info to dialog & prototype UI 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2022-11-01 04:24:11 -07:00
timoreo
04b39294ba
Merge pull request #333 from flowln/fix_atl_packs_post_modpack_update 2022-11-01 09:56:16 +01:00
timoreo
3a446c410c
Merge pull request #329 from flowln/only_safe_workarounds 2022-11-01 09:55:43 +01:00
Chrono
ce1a4857cc
Merge branch 'PrismLauncher:develop' into develop 2022-10-31 20:06:59 -04:00
Chrono
dfdf739282
remove one space 
Signed-off-by: Chrono <me@disilla.org>
 2022-10-31 19:44:55 -04:00
Sefa Eyeoglu
7086b1e65c
Merge pull request #351 from Scrumplex/fix-trash 2022-10-31 22:56:07 +01:00
Sefa Eyeoglu
f2d445d27b
fix: fix undo key sequence 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-31 11:34:48 +01:00
Sefa Eyeoglu
29d362a6e0
fix: do not trash instances in Flatpak 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-31 11:34:46 +01:00
DioEgizio
c8adc4e356
Merge pull request #354 from Scrumplex/translations-maybe 
Improve display names of certain languages
 2022-10-31 08:43:43 +01:00
Ryan Cao
8467daa0ec
oop 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-10-31 14:58:38 +08:00
DioEgizio
13e14b712e
Merge pull request #352 from TheLastRar/Win-setDarkWinTitlebar-10OrGreater 2022-10-31 07:51:13 +01:00
Ryan Cao
27dfe30fe6
Update VerifyJavaInstall.cpp 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-10-31 14:44:11 +08:00
Sefa Eyeoglu
42350e689d
chore: improve display names of certain languages 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-30 23:50:57 +01:00
Fayne Aldan
b7d5fee995 Change Profiles to Accounts for consistency 
Signed-off-by: Fayne Aldan <FayneAldan@gmail.com>
 2022-10-30 15:56:45 -06:00
TheLastRar
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
Sefa Eyeoglu
b4be28b9bb
fix: fix disabled trash undo action 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-30 18:37:06 +01:00
Ryan Cao
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
Marcelo Hernandez
5d1aac3c53
added option to not copy screenshots 
+ moved select all checkbox to top row, centered.

Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-29 22:27:31 -04:00
fn2006
b142a6da5b fix hardcoded svg 
Signed-off-by: fn2006 <usernamefn2006alreadyused@protonmail.com>
 2022-10-29 16:42:37 +01:00
Sefa Eyeoglu
5ed7eb9d53
chore: update credits 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-29 13:12:51 +02:00
Marcelo Hernandez
c00f96c7ca
create getters and setters for InstanceCopyPrefs 
+ use pragma once like other .h files in this directory

Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-29 00:55:33 -04:00
flow
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
Sefa Eyeoglu
177f17450a
Merge pull request #173 from Scrumplex/fix-icons 2022-10-29 00:35:48 +02:00
leo78913
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
leo78913
4500e345b3
Merge branch 'PrismLauncher:develop' into toolbar-icons 2022-10-28 15:46:02 -03:00
Sefa Eyeoglu
e885f3c26a
Merge pull request #65 from he3als/develop 2022-10-28 18:43:30 +02:00
flow
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
Sefa Eyeoglu
7b446dd30f
Merge pull request #319 from Scrumplex/fix-avoid-mr-segfault 2022-10-28 13:40:52 +02:00
Sefa Eyeoglu
93894f62ff
fix: avoid segfault for unexpected API reponse 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-28 00:08:15 +02:00
Sefa Eyeoglu
2ba3de79d8 chore: add comment about copy bug 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-27 21:23:17 +02:00
Piper McCorkle
2e0f818905 Add a snapcraft.yml for building Snaps 
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-26 09:25:54 -05:00
Marcelo Hernandez
63b6c6685c
Abstract away InstanceCopyPrefs' internals through new getSelectedFiltersAsRegex() function 
+ fix typo in comment
+ remove unused import
+ add [[nodiscard]] to methods

Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-26 00:20:36 -04:00
DioEgizio
b516dd970f
Merge pull request #206 from flowln/changelog_height_fix 2022-10-25 11:29:14 +02:00
Marcelo Hernandez
385c452ddf
remove checkBool function, add updateSelectAllCheckbox function 
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-24 20:49:40 -04:00
Marcelo Hernandez
a89df42561
Simplify bool check in CopyInstanceDialog.cpp 
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-24 19:31:40 -04:00
Sefa Eyeoglu
08cd5d52fa
Merge pull request #283 from flowln/fix_abort_on_autosearch 2022-10-24 23:00:02 +02:00
Sefa Eyeoglu
d0e668e1d8
Merge pull request #211 from Hibiii/show-instace-arg 2022-10-24 22:51:30 +02:00
flow
b638a6ae95
fix: retry mod search job after aborting it 
This way, we don't get stuck with an aborted job in our way! :o

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-24 09:09:24 -03:00
Sefa Eyeoglu
6a474a0125
fix: update icon generate script 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-24 11:18:53 +02:00
Marcelo Hernandez
4caf06bc99
Check "Select all" checkbox if all options are already selected 
+ code cleanup

Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-23 19:30:41 -04:00
Marcelo Hernandez
15593b5c09
Add "Select all" checkbox + ui revamp + code cleanup 
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com>
 2022-10-23 19:30:41 -04:00
Marcelo Hernandez
e7e56eb1e3
add more options to copy instance dialog 
- 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-23 19:30:28 -04:00
leo78913
43bf601f12 add icons to the instance toolbar 
Signed-off-by: leo78913 <leo3758@riseup.net>
 2022-10-23 20:04:19 -03:00
Trisave
d5109f024b
Better dark theme selection contrast 
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-23 20:32:04 +02:00
flow
7f441f5b87
Merge pull request #228 from bensuperpc/change_cast 2022-10-23 14:28:33 -03:00
he3als
0aac85dda1 Replace tab with spaces in flat_white.qrc 
Signed-off-by: he3als <65787561+he3als@users.noreply.github.com>
 2022-10-23 14:35:33 +01:00
he3als
4777a45722 Fix new flat white icons 
Signed-off-by: he3als <65787561+he3als@users.noreply.github.com>
 2022-10-23 14:32:35 +01:00
jn64
01db80d19a Fix version labels width 
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-23 03:35:23 +08:00
flow
8b28ed67ae
Merge pull request #234 from AliceDTRH/fix/dedupejava 2022-10-22 13:14:26 -03:00
Ryan Cao
f35a30d371
oops 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-10-22 23:47:53 +08:00
AliceDTRH
b2789fef0f
Use correct variable for Windows 
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com>
 2022-10-22 17:19:34 +02:00
he3als
46fe7e77b3 DCO Remediation Commit for he3als <65787561+he3als@users.noreply.github.com> 
I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: d87f743a2b
I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 92dfd659f1
I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: a6e65dfc7a
I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 99e1c13e80

Signed-off-by: he3als <65787561+he3als@users.noreply.github.com>
 2022-10-22 16:14:50 +01:00
he3als
99e1c13e80 fix: add flat_white to code 2022-10-22 15:50:06 +01:00
he3als
a6e65dfc7a Add new flat white icons 2022-10-22 15:40:39 +01:00
AliceDTRH
1471eddc7e
Deduplicates java installs before passing it on 
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com>
 2022-10-22 16:40:31 +02:00
he3als
89fd84d916
Merge branch 'PrismLauncher:develop' into develop 2022-10-22 15:30:40 +01:00
Jamie Mansfield
0e17eee096
ATLauncher: Fix pack installation always aborting 
I made a mistake during when cherry picking a previous commit, this
applies the change - and fixes installing ATLauncher packs.
 2022-10-22 15:22:30 +01:00
flow
81f1305270
Merge pull request #215 from forkiesassds/develop 2022-10-22 10:48:00 -03:00
Sefa Eyeoglu
24e4db676a
Merge pull request #224 from jamierocks/atl-abort-close-optional-mods-dialog 2022-10-22 15:31:53 +02:00
Sefa Eyeoglu
6e21a9829d
Merge pull request #225 from Scrumplex/fix-segfault-fileresolver 2022-10-22 15:31:46 +02:00
flow
4e99e10cbd
Merge pull request #218 from getchoo/change-jars-path 2022-10-22 10:18:58 -03:00
Ryan Cao
a406aeb3ea
feat: register as zip/mrpack handler on macOS 
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
 2022-10-22 20:51:46 +08:00
Sefa Eyeoglu
970e4b020e
fix: fix segfault when resolving Flame resources 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-22 14:11:51 +02:00
Jamie Mansfield
a6b13487f0
ATLauncher: Abort install if optional mods dialog is closed 
This matches the behaviour of ATLauncher.
 2022-10-22 12:35:34 +01:00
Bensuperpc
56ae4e5b6a
Change old style cast to C++ cast 
Change old style cast to C++ cast

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
 2022-10-22 13:04:48 +02:00
Sefa Eyeoglu
54c26b05fa
Merge pull request #185 from flowln/fix_blocked_mods_crash 2022-10-22 12:44:20 +02:00
seth
4a2b25e841
fix: use correct variable for jars path 
Signed-off-by: seth <getchoo@tuta.io>
 2022-10-21 21:40:21 -04:00
seth
ba4af1a890
fix: make jars path specific to prism 
Signed-off-by: seth <getchoo@tuta.io>
 2022-10-21 21:40:20 -04:00
forkiesassds
9b17cde019 CurseForge modpack page improvements 
Signed-off-by: forkiesassds <icanttellyou@memeware.net>
 2022-10-22 01:20:08 +03:00
Sefa Eyeoglu
aefb8b353e
Merge pull request #187 from leo78913/menu-icons 2022-10-21 22:39:35 +02:00
Hibi
1288b92615
Add argument to show instance window 2022-10-21 15:40:28 -03:00