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
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: d87f743a2b92dfd659f1a6e65dfc7a99e1c13e80
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
flow
7eecf454e8
fix: remove max height logic for mod update changelogs
...
It's not worth it to keep this, it's just a heuristic that fails from
time to time.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-21 14:07:43 -03:00
leo78913
ccf7d1e0c4
material design icons
...
Signed-off-by: leo78913 <leo3758@riseup.net>
2022-10-21 14:04:04 -03:00
leo78913
e4b5cd23e6
the trashcan icons dont look like trash now
...
Signed-off-by: leo78913 <leo3758@riseup.net>
2022-10-21 13:49:31 -03:00
circuit10
ff2f40f5e1
Fix typo
...
Signed-off-by: circuit10 <heath.mitchell27@gmail.com>
2022-10-21 16:28:04 +01:00
Sefa Eyeoglu
12d8409e65
Merge pull request #39 from Sebbl0508/mod_dialog_fontsize
2022-10-21 15:25:28 +02:00
leo78913
8db89b4cfb
Merge branch 'PrismLauncher:develop' into menu-icons
2022-10-20 17:54:43 -03:00
leo78913
31dc92dafe
add icons to the instance menu and 4 new icons:
...
delete
rename
tag
export
Signed-off-by: leo78913 <leo3758@riseup.net>
2022-10-20 17:48:57 -03:00
flow
01b90809e8
fix: memory leak when finishing blocked mods job
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-20 16:55:22 -03:00
flow
0a7383a4e1
fix: hide ProgressDialog when failing/succeeding tasks
...
WHY IS QT LIKE THAT AAAAAAAA
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-20 16:54:39 -03:00
Chrono-byte
88341b923a
fix contributor notices in AboutDialog.cpp for license compliance
...
Signed-off-by: Chrono-byte <me@disilla.org>
2022-10-20 15:14:26 -04:00
flow
5d27633821
fix: show a single line in ProjectItem's desc. when there's no more space
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-20 15:03:46 -03:00
Sebastian Rueth
b46c4a81e0
check space requirements of project description
...
if there isn't enough space for 2 lines of project description, only
draw one
Signed-off-by: Sebastian Rueth <sebastian.rueth@protonmail.com>
2022-10-20 08:02:05 +02:00
flow
d6479e133d
fix: properly center project descriptions
...
In particular, this takes into account the space used by the title, so
(hopefully) there won't be problems with custom themes with that.
Signed-off-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Sebastian Rüth <sebastian.rueth@protonmail.com>
2022-10-19 20:12:50 +02:00
Sebastian Rüth
50bbf2aacc
fix text clipping
...
Signed-off-by: Sebastian Rüth <sebastian.rueth@protonmail.com>
2022-10-19 20:12:50 +02:00
Sefa Eyeoglu
4e08f28246
Merge pull request #31 from flowln/who_needs_webview
2022-10-19 14:28:29 +02:00
Sefa Eyeoglu
46c57e120f
Merge pull request #27 from flowln/ftb_install_improve
2022-10-19 13:51:35 +02:00
Sefa Eyeoglu
61fbc5a791
refactor: replace with new logo
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-19 13:08:23 +02:00
Samisafool
8201d1df02
Rename
...
Signed-off-by: Samisafool <thenerdiestguy@gmail.com>
2022-10-19 15:02:43 +05:30
Fayne Aldan
888a87463e
Add fallback for multimc.cfg
...
Signed-off-by: Fayne Aldan <FayneAldan@gmail.com>
2022-10-18 14:40:34 -06:00
flow
3a95a3b7c1
fix: don't take item from a possibly empty list
...
The list gets destroyed when we take the last object, so things explode.
😔
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-18 16:51:42 -03:00
DioEgizio
fb4cf0b75d
Merge pull request #55 from flowln/config_add_fallback
2022-10-18 19:50:34 +02:00
he3als
92dfd659f1
Fix .QRC file for flat white icons
2022-10-18 17:54:26 +01:00
he3als
d87f743a2b
Add flat white icons
...
This is mainly for dark mode users, as I think that the regular colour of the flat icons do not look good with dark mode.
2022-10-18 17:49:35 +01:00
Cleo John
83ceb26151
Streamline Button changes to improve source readability.
2022-10-18 17:28:23 +02:00
flow
32cdfb871c
fix: add fallback for polymc.cfg
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-18 12:22:42 -03:00
flow
801e7da5ee
feat: allow specifying fallbacks to INI files
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-18 12:22:42 -03:00
Sefa Eyeoglu
3405fd91c6
Merge pull request #33 from DioEgizio/remove-useless-actions
2022-10-18 15:31:32 +02:00
DioEgizio
194822f11e
Merge pull request #28 from flowln/fix_copy
2022-10-18 15:27:53 +02:00
Sefa Eyeoglu
98963d4cdf
Merge pull request #29 from Scrumplex/feat-clear-metadata
2022-10-18 15:25:56 +02:00
DioEgizio
804ef36b20
Merge pull request #26 from Scrumplex/armhf
2022-10-18 15:24:33 +02:00
DioEgizio
e05fe77bfe
feat: remove redundant actions from instance toolbar and redundant "instance"s
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-10-18 14:43:29 +02:00
Sefa Eyeoglu
6db3f68ae1
refactor: use correct data path
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-18 13:58:50 +02:00
Sefa Eyeoglu
3ac398ac49
fix: use display name in code
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-18 09:50:27 +02:00
Sefa Eyeoglu
722194405a
refactor: initial rebrand
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-18 09:37:59 +02:00
DioEgizio
87d35f0d16
fix: remove some unused libs
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-10-15 20:16:15 +02:00
Sefa Eyeoglu
c089f9b59f
Merge pull request #1203 from DioEgizio/macos-legacy
2022-10-15 15:24:30 +02:00
flow
8bc529be3d
fix: include hidden files when copying instances
...
fixes instance ccopy on linux .-.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-15 09:20:31 -03:00
Sefa Eyeoglu
303628bb05
refactor: support system ghc-filesystem
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-15 13:13:38 +02:00
Sefa Eyeoglu
3b92ec8e82
chore: clang-format RuntimeContext
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-15 12:43:15 +02:00
Sefa Eyeoglu
545944cb0d
refactor: support armhf
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-15 12:41:16 +02:00
flow
c90a88b6b6
fix: correct ftb legacy too
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-14 12:18:06 -03:00
flow
124097d3a5
feat!: use ghc/filesystem in place of std's one if needed
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-14 14:08:48 +02:00
flow
c520faed6d
feat: add gulrak/filesystem submodule
...
... for old macs that don't have std::filesystem in their stdlib.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-14 14:08:42 +02:00
flow
dfa220ef02
fix: issues with aborts (again)
...
i hate it
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-13 15:10:35 -03:00
