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
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
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
fda2c116be
code quality cleanup
...
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com >
2022-11-01 04:24:11 -07:00
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
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
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
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
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
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
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
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
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
b142a6da5b
fix hardcoded svg
...
Signed-off-by: fn2006 <usernamefn2006alreadyused@protonmail.com >
2022-10-29 16:42:37 +01:00
5ed7eb9d53
chore: update credits
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-29 13:12:51 +02:00
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
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
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
7b446dd30f
Merge pull request #319 from Scrumplex/fix-avoid-mr-segfault
2022-10-28 13:40:52 +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
2ba3de79d8
chore: add comment about copy bug
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-27 21:23:17 +02:00
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
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
b516dd970f
Merge pull request #206 from flowln/changelog_height_fix
2022-10-25 11:29:14 +02:00
385c452ddf
remove checkBool function, add updateSelectAllCheckbox function
...
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com >
2022-10-24 20:49:40 -04:00
a89df42561
Simplify bool check in CopyInstanceDialog.cpp
...
Signed-off-by: Marcelo Hernandez <marcelohdez.inq@gmail.com >
2022-10-24 19:31:40 -04:00
08cd5d52fa
Merge pull request #283 from flowln/fix_abort_on_autosearch
2022-10-24 23:00:02 +02:00
d0e668e1d8
Merge pull request #211 from Hibiii/show-instace-arg
2022-10-24 22:51:30 +02:00
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
6a474a0125
fix: update icon generate script
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-24 11:18:53 +02:00
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
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
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