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
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
flow
f26be00571
fix: abort search if we're already trying to download a pack
...
Meaning we don't have to wait for the searches to finish in the
background to finally start the modpack download, when we have already
selected it -_-
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-13 13:49:06 -03:00
flow
83654a193e
refactor+fix: Make FTB install task similar to other install tasks
...
In particular, this changes the order so that the instance gets created
before downloading the mods (like other install tasks), and the mod download
directly puts the files in the staging folder (like the others), instead
of that weird makeCached and copy stuff.
This fixes some issues with modpack downloads from FTB, like creating an
instance with no mods in it.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-13 13:27:52 -03:00
flow
b2a5d8daf4
fix: don't include opted out versions with the 'Any' filter on the MD
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-12 10:26:14 -03:00
flow
fda3f1352e
feat: add image support for the news reader :^)
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-11 16:11:08 -03:00
flow
d194b02e28
fix: prevent images overriding content when changing pages
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-11 15:51:54 -03:00
Tayou
aaba99dc10
Update launcher/ui/MainWindow.cpp
...
make " Offline" string for profilers translatable
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com>
2022-10-11 14:58:34 +02:00
Tayou
93a2e0f777
Merge Launch Buttons
...
Signed-off-by: Tayou <tayou@gmx.net>
2022-10-10 23:23:06 +02:00
Sefa Eyeoglu
71f3c6b461
feat: add clear metadata action
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-10 12:48:25 +02:00
Sefa Eyeoglu
aabcca5059
Merge pull request #1175 from Ozynt/patch-1
2022-10-09 20:20:05 +02:00
Ozynt
7e67fd8c79
Update LaunchController.cpp
...
Signed-off-by: Ozynt <104643560+Ozynt@users.noreply.github.com>
2022-10-09 13:20:50 +02:00
Ozynt
fecf1ffcb9
Update LaunchController.cpp
...
Signed-off-by: Ozynt <104643560+Ozynt@users.noreply.github.com>
2022-10-09 13:19:38 +02:00
Sefa Eyeoglu
fafc9cf9ca
Merge pull request #1033 from Scrumplex/multi-arch-support
2022-10-08 20:12:40 +02:00
Sefa Eyeoglu
3111e6a721
chore: add missing license headers
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-08 20:12:07 +02:00
flow
28f84902f6
Merge pull request #1185 from DioEgizio/fix-tooltip
...
Fix outdated 'Disable mod metadata' button's warning message.
2022-10-08 14:34:59 -03:00
Trisave
ebee50eedc
Improve default light and dark themes ( #1174 )
2022-10-08 14:33:24 -03:00
flow
e0ef09dfe1
Merge pull request #1183 from Scrumplex/fix-capabilities-first-run
2022-10-08 14:29:14 -03:00
flow
d7992ab29d
feat: add image support for FTB packs
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-08 14:12:05 -03:00
flow
60f19f305e
feat: add image support for modrinth modpack pages
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-08 14:12:03 -03:00
flow
d99976f5d7
fix: make mod and modpack caches separate for Modrinth
...
This makes it similar to CF mods / modpacks. The mods cache is
maintained with the same name because it most likely has more data it
in, so this commit will affect existing caches as minimally as possible.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-08 14:11:20 -03:00
flow
db158a5735
feat: add image support for mod pages
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-08 14:11:20 -03:00
flow
ea3be17220
feat: add widget for a text browser with image support
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-08 14:11:20 -03:00
DioEgizio
f26049009e
fix: mod updating isn't upcoming anymore :p
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-10-08 16:20:46 +02:00
Sefa Eyeoglu
787234a53a
Merge pull request #1163 from flowln/fix_list_icons
2022-10-08 12:12:38 +02:00
Sefa Eyeoglu
fc3a64056c
Merge pull request #1154 from Scrumplex/epic-formatting-codes
2022-10-08 12:12:26 +02:00
Sefa Eyeoglu
6ebc9abb80
fix: update capabilities before first-run wizard
...
On first run, the condition for the wizard would return, before running
updateCapabilities(). This moves that call up, as its only dependency is
the settings system.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-06 14:46:13 +02:00
txtsd
f315025a8d
Merge pull request #1167 from Scrumplex/epic-commandline
2022-10-02 00:41:34 +05:30
stoltsvensk
8e43d97133
Microsoft account only
...
Signed-off-by: stoltsvensk <104643560+stoltsvensk@users.noreply.github.com>
2022-10-01 16:47:23 +02:00
Sefa Eyeoglu
7ccafdc993
fix: add missing includes to fix Qt 6.4 build
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-09-30 19:56:01 +02:00
Sefa Eyeoglu
0dca9cb6b8
Merge pull request #1162 from Trial97/feature/Replace-toml-library
2022-09-30 19:44:45 +02:00
Sefa Eyeoglu
11c44c676c
fix: remove unused MACOS_HINT
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-09-26 13:28:46 +02:00
flow
370c3aa598
Merge pull request #894 from flowln/update_from_external_source
...
epic PR
2022-09-26 08:25:12 -03:00
Sefa Eyeoglu
1cdadafdf8
refactor: use QCommandLineParser instead
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-09-26 13:21:27 +02:00
timoreo
dd6f670dec
fix: Fixed memory leak
...
Signed-off-by: timoreo <contact@timoreo.fr>
2022-09-26 11:50:55 +02:00
timoreo
9ff364b0d3
huge nit: added const refs, everywhere
...
Signed-off-by: timoreo <contact@timoreo.fr>
2022-09-26 11:50:31 +02:00
Sefa Eyeoglu
58a5331f7b
Merge pull request #1164 from Scrumplex/fix-sort-languages
2022-09-25 19:50:55 +02:00
Alexandru Ionut Tripon
ed261f0af9
Update launcher/minecraft/mod/tasks/LocalModParseTask.cpp
...
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2022-09-25 20:38:55 +03:00
ErogigGit
8a4f1c66f8
Allow double clicking to mark for dowload
...
Signed-off-by: Erogig <erogigabyte@gmail.com>
2022-09-24 22:37:51 +02:00
Sefa Eyeoglu
b187231b0e
fix: sort languages by their name instead of key
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-09-24 11:53:41 +02:00
Sefa Eyeoglu
60b38de69f
fix: fallback for languages without a native name
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-09-24 11:48:33 +02:00
Trial97
600c49f7f0
Replaced tomlc99 with tomlplusplus
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2022-09-24 00:10:27 +03:00
flow
e7380e70a3
fix: use placeholder icon when the project has no icon in MR
...
Projects with no icon return a null icon URL in Modrinth's API.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-23 18:05:58 -03:00
flow
3df8594f19
feat: change project item delegate for modrinth modpacks
...
more info! \ ^-^/
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-23 16:59:40 -03:00
flow
ee4a829293
fix: remove manual icon resize in ModModel
...
THis fixes a FIXME, now that we fixed the issue :o
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-23 16:59:40 -03:00
flow
1862f3c124
fix: set icon sizes correctly in ProjectItemDelegate
...
no more dumb hacks with icons!!
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-23 16:59:40 -03:00
Sefa Eyeoglu
777ab3416f
feat: also format resource/texture pack names
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-09-21 15:00:28 +02:00
Sefa Eyeoglu
ecf5ab75e7
feat: support more formatting codes
...
also fix some crashes
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-09-21 14:59:01 +02:00
flow
4f6d964217
fix: don't change groups when updating an instance
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:10 -03:00
flow
06019f01e3
feat: add dialog to ask whether to chaneg instance's name
...
This prevents custom names from being lost when updating, by only
changing the name if the old instance name constains the old version,
so that we can update it if the user whishes to.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:10 -03:00
flow
ddde885084
fix: show warning in case there's no old index when updating
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:10 -03:00
flow
be8c6f218c
refactor: setAbortStatus -> setAbortable
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:10 -03:00
flow
9eb35ea7c8
fix: don't load specific settings for managed pack info
...
This avoids loading all settings for all instances when searching for
one with a specific managed pack name.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:10 -03:00
flow
d2fdbec41d
fix: move file deletion to the end of the instance update
...
This makes it harder for problems in the updating process to affect the
current instance. Network issues, for instance, will no longer put the
instance in an invalid state.
Still, a possible improvement to this would be passing that logic to
InstanceStaging instead, to be handled with the instance commiting
directly. However, as it is now, the code would become very spaguetti-y,
and given that the override operation in the commiting could also put
the instance into an invalid state, it seems to me that, in order to
fully error-proof this, we would need to do a copy operation on the
whole instance, in order to modify the copy, and only in the end
override everything an once with a rename. That also has the possibility
of corrupting the instance if done without super care, however, so I
think we may need to instead create an automatic backup system, with an
undo command of sorts, or something like that. This doesn't seem very
trivial though, so it'll probably need to wait until another PR. In the
meantime, the user is advised to always backup their instances before
doing this kind of action, as always.
What a long commit message o.O
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:09 -03:00
flow
2dd372600c
fix: some abort-related issues
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:09 -03:00
flow
eda6cf11ef
feat(ui): improve info dialog before updating an instance
...
Adds a 'Cancel' option, and add a note about doing a backup before
updating.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:09 -03:00
flow
68facd6b93
fix(ui): hook up abort status signal in ProgressDialog
...
Now we have a visual indication on when tasks are abortable!
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:09 -03:00
flow
87002fb8f8
fix: hook up setAbortStatus in instance import tasks
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:09 -03:00
flow
6a50fa35ec
feat: add canAbort() status change in Task
...
By now, it's a recurring pattern of wanting to restrict aborting in
certain situations. This avoids further code duplication, and adds a
signal that external users can hook up to to respond to such change.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:09 -03:00
flow
6541570969
fix: simplify abort handling and add missing emits
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:09 -03:00
flow
4b0ceea894
fix: correctly set managed pack fields in CF pack
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:09 -03:00
flow
8c0816c166
feat: add override awareness to CF modpack updating
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:08 -03:00
flow
be769d07f1
fix: correctly set all managed pack fields in Modrinth pack
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:08 -03:00
flow
3a9d58e31c
feat: add override handling in modrinth pack update
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:08 -03:00
flow
7024acac06
feat: add override helper functions
...
These help us keep track of relevant metadata information about
overrides, so that we know what they are when we update a pack.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:08 -03:00
flow
6131346e2f
refactor: change the way instance names are handled
...
While working on pack updating, instance naming always gets in the way,
since we need both way of respecting the user's name choice, and a
standarized way of getting the original pack name / version.
This tries to circunvent such problems by abstracting away the naming
schema into it's own struct, holding both the original name / version,
and the user-defined name, so that everyone can be happy and world peace
can be achieved! (at least that's what i'd hope :c).
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:08 -03:00
flow
eed73c9078
refactor: clean up InstanceImportTask a bit
...
Also removes a divide by two in the download progress
(why was it there???)
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:08 -03:00
flow
795d6f35ee
feat: add curseforge modpack updating
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:08 -03:00
flow
ebd46705d5
refactor: move creation of CF file download task to a separate function
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:08 -03:00
flow
72d2ca234e
refactor: move flame modpack import to separate file
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:07 -03:00
flow
2246c3359b
refactor: add throw_on_blocked
arg to Flame file parse
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:07 -03:00
flow
242fb156a2
feat: add 'getFiles' by fileIds route in Flame API
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:07 -03:00
flow
208ed73e59
feat: add early modrinth pack updating
...
Still some FIXMEs and TODOs to consider, but the general thing is here!
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:36:06 -03:00
flow
4441b37338
refactor: move modrinth modpack import to separate file
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:32:36 -03:00
flow
941d75824a
refactor: add instance creation abstraction and move vanilla
...
This is so that 1. Code is more cleanly separated, and 2. Allows to more
easily add instance updating :)
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:32:36 -03:00
flow
ec9ddc4f22
chore: add helper function for copying managed pack data between insts.
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-20 18:32:36 -03:00
Sefa Eyeoglu
98b6f90172
fix: add more legacy architectures
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-09-20 16:01:08 +02:00
Sefa Eyeoglu
7e280de361
refactor: drop 64-bit check
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-09-20 16:01:08 +02:00
Sefa Eyeoglu
7bd8bd13fe
feat: support multiarch system classifiers
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-09-20 16:01:06 +02:00
Sefa Eyeoglu
09e85e948c
refactor: introduce RuntimeContext
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-09-20 15:59:43 +02:00
Sefa Eyeoglu
9ec1c00887
fix: register JavaRealArchitecture for MinecraftInstance
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-09-20 15:58:56 +02:00
Sefa Eyeoglu
a24d589845
fix: ensure all resource folders exist
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-09-20 10:39:05 +02:00
Sefa Eyeoglu
ebbcc9f6da
fix: actually render color codes for texture packs
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-09-20 10:26:15 +02:00
Sefa Eyeoglu
23fc453fae
fix: comments and naming of texture pack stuff
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-09-20 10:26:15 +02:00
Sefa Eyeoglu
aad6f74db6
fix: tests
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-09-20 10:26:15 +02:00
Sefa Eyeoglu
07dcefabcb
feat: add texture pack parsing
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-09-20 10:26:15 +02:00
txtsd
40c68595d7
Merge pull request #1150 from flowln/fix_crash_on_game_quit
2022-09-20 09:41:59 +05:30
txtsd
fe9a4fece4
Merge pull request #1142 from flowln/better_fs
2022-09-20 09:00:19 +05:30
flow
0873b8d304
fix: prevent container detaching in ResourceFolderModel
...
and use const accessors whenever we can!
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-16 20:12:31 -03:00
flow
c9eb584ac8
fix: prevent deletes by shared pointer accidental creation
...
This fixes the launcher crashing when opening the game :iea:
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-16 20:12:30 -03:00
flow
10493bd44a
fix: move newly allocated resources to the main thread
...
This avoids them getting deleted when the worker thread exits, due to
thread affinity on the created thread.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-16 20:12:30 -03:00
flow
9e35230467
fix: memory leak when getting mods from the mods folder
...
friendly reminder to always delete your news.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-16 20:12:30 -03:00
flow
81e326571b
fix: enable demo launch only on supported instances
...
e.g. >= 1.3.1 instances
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-15 19:27:42 -03:00
flow
1b2a7de4e2
fix: show 'demo' instead of 'offline' in log when in demo mode
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-15 18:44:18 -03:00
flow
11216d200c
change: move demo action to "Play offline" menu
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-15 18:44:18 -03:00
jopejoe1
777be6a48d
Add 'Ctrl+Alt+O' Shortcut to launch demo instance.
...
Signed-off-by: jopejoe1 <johannes@joens.email>
2022-09-15 18:44:18 -03:00
jopejoe1
29dcb9d274
Added Launch Demo button.
...
Signed-off-by: jopejoe1 <johannes@joens.email>
2022-09-15 18:44:18 -03:00
Sefa Eyeoglu
1ca2be0039
Merge pull request #982 from DavidoTek/windarkmode2
2022-09-14 13:17:17 +02:00
flow
ee0fb2d0e0
fix: use std::wstring for Windows filenames
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-12 13:07:24 -03:00
flow
c496ad1237
chore: make DirNameFromString add normal duplicate identifier
...
Wrap the number in parenthesis to be similar to other software.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-12 13:07:24 -03:00
flow
277fa21f5f
refactor: remove Win32 'crap' in FileSystem
...
We should use std::filesystem symlink and hardlink functions instead.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-12 13:07:23 -03:00
flow
1cf949226e
refactor: use std::filesystem for overrides
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-12 13:07:23 -03:00
flow
be3fae6511
refactor: use std::filesystem for path deletion
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-12 13:07:23 -03:00
flow
5932f36285
refactor: use std::filesystem for file copy
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-12 13:07:23 -03:00
flow
30abb65368
Merge pull request #1133 from Scrumplex/refactor-tests
...
Move tests to a separate folder, to fix issues and improve maintenance
2022-09-12 12:57:55 -03:00
Sefa Eyeoglu
4c7d3a103c
refactor: restructure tests
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-09-11 22:29:01 +02:00
flow
a091245793
fix: emit signals when aborting NetJob
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-10 09:10:16 -03:00
flow
7cf2c3be0f
fix: start at least one task in ConcurrentTask
...
This allows us to emit all the necessary stuff when we're finished in
the case of starting a task with no subtasks. In particular, this caused
the mod updater to not work properly :)
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-07 12:11:42 -03:00
flow
f65d506f26
Merge pull request #997 from flowln/fix_major_version_filter
2022-09-07 10:34:50 -03:00
flow
333dbca01e
Merge pull request #1105 from flowln/better_resource_packs
...
Add basic resource pack parsing and fix issues
2022-09-07 08:30:36 -03:00
flow
42eb265624
refactor: create mod pages and filter widget by factory methods
...
This takes most expensive operations out of the constructors.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-07 08:29:58 -03:00
flow
8a65726e9d
fix: use more robust method of finding matches for major version
...
This uses the proper version list to find all MC versions matching the
major number (_don't say anything about SemVer_ 🔫 ).
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-07 08:27:53 -03:00
flow
1b0ca47682
Merge pull request #939 from flowln/mod_downloader_improve
...
Some more UI / UX improvements to the mod downloader!
2022-09-07 08:27:11 -03:00
flow
8e3f5c3305
Merge pull request #966 from flowln/refactor_tasks
...
Reduce code duplication in tasks, fix some bugs and add some tests
2022-09-07 08:26:28 -03:00
timoreo
4817f0312d
Fixed up a warning
...
Signed-off-by: timoreo <contact@timoreo.fr>
2022-09-06 14:32:19 +02:00
Sefa Eyeoglu
b70a82c609
Merge pull request #1111 from PolyMC/revert-1067-classpath-epicness
2022-09-05 20:06:33 +02:00
Sefa Eyeoglu
25d1e0c4e6
Merge pull request #1107 from DioEgizio/smaller-about
2022-09-05 17:52:16 +02:00
Sefa Eyeoglu
8e3356f11a
Merge pull request #1034 from Scrumplex/detect-performance-features
2022-09-05 17:45:17 +02:00
Sefa Eyeoglu
1b559c7776
Revert "Move classpath definition into NewLaunch itself"
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-09-05 17:37:10 +02:00
DioEgizio
d5583f0f02
make the about dialog smaller
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-09-04 14:32:33 +02:00
flow
bedd3c50b6
fix: improve handling of unrecognized pack formats
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-03 15:05:23 -03:00
flow
43a7af3f44
fix: removing mods with their metadata as well
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-03 13:37:23 -03:00
flow
9db27c6acc
fix: crash when adding resource packs directly in the folder
...
This fixes an issue in which, when adding a new resource pack externally
to PolyMC, when the resource pack view was open, would crash poly.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-03 13:37:22 -03:00
flow
42c81395b3
fix: race condition on ResourceFolderModel tests
...
This (hopefully) fixes the race contiditions that sometimes got
triggered in tests.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-03 13:37:22 -03:00
flow
3b13e692d2
feat: move resource pack images to QPixmapCache
...
This takes care of evicting entries when the cache gets too big for us,
so we can add new entries without much worries.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-03 13:37:22 -03:00
flow
0331f5a1eb
feat(tests): add tests for resource pack parsing
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-03 13:37:22 -03:00
flow
8a7e117f6b
refactor: move resource pack file parsing utilities to separate namespace
...
This makes it easier to use that logic in other contexts.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-03 13:37:22 -03:00
flow
9b984cedac
feat: add image from pack.png to resource packs
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-03 13:37:22 -03:00
flow
dd9e30b24a
feat: add resource icon to InfoFrame
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-03 13:37:21 -03:00
flow
6a93688b2e
fix: filtering in regex search in resource packs
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-03 13:37:21 -03:00
flow
3ab17a97a8
fix: sorting by pack format
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-03 13:37:21 -03:00
flow
f21ae66265
feat: add basic resource pack parsing of pack.mcmeta
...
This parses the pack format ID and the description from the local file,
from both a ZIP and a folder, and hooks it into the model.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-03 13:37:21 -03:00
flow
afa1a5e932
feat: modify InfoFrame and ResourcePackPage to show ResourcePack info
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-03 13:37:21 -03:00
flow
050768c266
feat: add more resource pack info
...
Adds pack format id and description to ResourcePack, that'll be parsed
from pack.mcmeta.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-03 13:37:21 -03:00
flow
cda2bfc240
feat: allow specifying factory for resources in BasicFolderLoadTask
...
This allows us to hook our own resource type, that possibly has more
content than the base Resource, to it.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-09-03 13:37:20 -03:00
Sefa Eyeoglu
2f167b1512
Merge pull request #1095 from flowln/ensure_file_path_in_override
2022-09-01 09:54:22 +02:00
flow
ba3ac85356
Merge pull request #1067 from Scrumplex/classpath-epicness
...
Move classpath definition into NewLaunch itself
2022-08-31 18:28:29 -03:00
flow
ec29cedeb7
Merge pull request #1080 from flowln/eternal_cache
...
Never invalidate libraries cache entries by time elapsed
2022-08-31 18:28:07 -03:00
flow
064ae49d2b
fix: make MultipleOptionsTask inherit directly from SequentialTask
...
It's not a good idea to have multiple concurrent tasks running on a
sequential thing like this one.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-28 16:29:02 -03:00
flow
247f99ce2f
feat(test): add more tests to Tasks
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-28 16:29:01 -03:00
flow
7b6d269904
refactor: make NetJob inherit from ConcurrentTask as well!
...
Avoids lots of code duplication
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-28 16:29:01 -03:00
flow
87a0482b8b
refactor: make MultipleOptionsTask inherit from ConcurrentTask too
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-28 16:29:01 -03:00
flow
e899699918
refactor: make SequentialTask inherit from ConcurrentTask
...
In a way, sequential tasks are just concurrent tasks with only a single
task running concurrently, so we can remove LOTS of duplicated logic :)
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-28 16:29:01 -03:00
flow
bdf464e792
fix: abort logic running subsequent tasks anyways some times
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-28 16:29:01 -03:00
flow
c410bb4ecb
fix: 'succeeded while not running' spam in ConcurrentTask
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-28 16:29:01 -03:00
flow
a720bcc637
fix: bogus progress update when the total step progress was zero
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-28 16:29:01 -03:00
flow
369a8cdc74
fix: only try to start tasks that are really there
...
This fixes an annoying issue where concurrent tasks would try to start
multiple tasks even when there was not that many tasks to run in the
first place, causing some amount of log spam.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-28 16:29:00 -03:00
flow
3f4e55be4f
fix: ensure destination file paths exist when overriding folders
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-28 16:28:23 -03:00
flow
2186b134a4
fix: Mod type enum -> Resource type enum
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-28 14:47:52 -03:00
Sefa Eyeoglu
f371ec210c
Merge pull request #1052 from flowln/resource_model
2022-08-28 16:52:53 +02:00
Sefa Eyeoglu
afcd669d2f
Merge pull request #965 from flowln/fat_files_in_memory
...
Refactor a bit EnsureMetadataTask and calculate hashes in a incremental manner
2022-08-28 11:03:12 +02:00
DioEgizio
13184eb8e9
fix: fix urls on ftb legacy
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-08-24 12:31:38 +02:00
flow
ddf1e1ccee
fix: make FML libraries cache eternal
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-21 13:47:49 -03:00
flow
5ac4e73697
fix: make libraries cache eternal
...
This restores the behavior prior to PR #920 .
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-21 13:47:49 -03:00
flow
6be59b53f1
feat: add eternal cache entries
...
Those are entries that don't get stale over time, so we don't invalidate
them if they 'expire'.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-21 13:47:49 -03:00
flow
0b81b283bf
fix: LGTM warnings
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-20 10:49:56 -03:00
flow
e2ab2aea32
change: add enable/disable to resources
...
TIL that zip resource packs, when disabled, actually have the effect of
not showing up in the game at all. Since this can be useful to someone,
I moved the logic for it to the resources.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-20 10:49:54 -03:00
flow
c3ceefbafb
refactor+fix: add new tests for Resource models and fix issues
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-20 10:49:23 -03:00
flow
e7cf9932a9
refactor: simplify Mod structure
...
No need to keep track of pointers left and right. A single one already
gives enough headaches!
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-20 10:48:51 -03:00
flow
0c9d03f5df
fix(tests): add timeout on ModFolderModel's tests
...
If the update never ends, the signal is not emitted and we become stuck
in the event loop forever. So a very lenient timer is added to prevent
that.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-20 10:48:01 -03:00
flow
92aa24ae34
fix: don't give shared pointer to obj. external to the model
...
It causes some weird problems and adds refcounting overhead.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-20 10:48:00 -03:00
flow
97a74d5c1f
refactor: adapt rest of the codebase to the new resource model
...
In order to access the ModFolderModel from the ModFolderPage, i created
a new m_model for the correct type, shadowing the m_model of type
ResourceFolderModel. This creates two shared_ptr references to the same object,
but since they will have the same lifetime, it doesn't generate a memory
leak.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-20 10:47:58 -03:00
flow
256f8094f5
refactor: make Resource Pack model inherit from ResourceFolderModel
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-20 10:47:11 -03:00
flow
1e2f0ab308
refactor: move more tied logic to model and move logic to the resources
...
This moves the QSortFilterProxyModel to the resource model files,
acessible via a factory method, and moves the sorting and filtering to
the objects themselves, decoupling the code a bit.
This also adds a basic implementation of methods in the
ResourceFolderModel, simplifying the process of constructing a new model
from it.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-20 10:47:08 -03:00
flow
af2cf2734d
refactor: move things around in the mod model
...
Makes the method order in the cpp file the same as in the header file.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-20 10:46:33 -03:00
flow
ec62d8e973
refactor: move general code from mod model to its own model
...
This aims to continue decoupling other types of resources (e.g. resource
packs, shader packs, etc) from mods, so that we don't have to
continuously watch our backs for changes to one of them affecting the
others.
To do so, this creates a more general list model for resources, based on
the mods one, that allows you to extend it with functionality for other
resources.
I had to do some template and preprocessor stuff to get around the
QObject limitation of not allowing templated classes, so that's sadge :c
On the other hand, I tried cleaning up most general-purpose code in the
mod model, and added some documentation, because it looks nice :D
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-20 10:45:01 -03:00
flow
3225f514f6
refactor: move general info from Mod to Resource
...
This allows us to create other resources that are not Mods, but can
still share a significant portion of code.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-20 10:41:59 -03:00
flow
2d63c86022
feat: make Task a QRunnable
...
This makes it possible to run a task in another thread.
I added a variable to toggle debug prints because they seem to trigger
an assertion on Qt internals when the task in on another thread. Of
course, this isn't awesome, but can wait until we improve our logging.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-20 10:41:59 -03:00
Sefa Eyeoglu
afb9ebcd99
fix: distinguish Coremods
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-08-20 12:53:13 +02:00
Sefa Eyeoglu
92d7e44525
Merge pull request #878 from flowln/lazy_settings
2022-08-20 12:50:56 +02:00
Sefa Eyeoglu
a517f442ea
Merge pull request #1023 from flowln/better_shared_ptr
2022-08-20 12:50:50 +02:00
Sefa Eyeoglu
311758233b
Merge pull request #1044 from flowln/better_orphan_fix
2022-08-20 12:50:43 +02:00
Sefa Eyeoglu
6e086eb808
Merge pull request #992 from Scrumplex/refactor-version
2022-08-20 12:50:25 +02:00
Sefa Eyeoglu
7e8644430c
Merge pull request #1007 from Gingeh/disable-update-button
2022-08-20 12:50:19 +02:00
Sefa Eyeoglu
70a8f6743a
Merge pull request #919 from kumquat-ir/download-all-blocked
2022-08-20 12:50:01 +02:00
Sefa Eyeoglu
d5a2185030
Merge pull request #1068 from TayouVR/improvedWindowsJavaCheck
2022-08-19 14:26:36 +02:00
Tayou
26f31e9288
use qEnvironmentVariable instead of qgetenv in JavaUtils
...
Signed-off-by: Tayou <tayou@gmx.net>
2022-08-18 23:59:35 +02:00
Sefa Eyeoglu
e654e66839
Merge pull request #1049 from flowln/waiting_for_news_-_-
2022-08-18 22:53:41 +02:00
Tayou
bb4861cf0d
check for java installs in PATH on windows
...
this should find java installs from scoop as well as any other installer, that registers java in the PATH environment variable.
Signed-off-by: Tayou <tayou@gmx.net>
2022-08-18 18:24:32 +02:00
Sefa Eyeoglu
01505910f4
refactor: move classpath definition into NewLaunch itself
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-08-18 18:14:01 +02:00
Sefa Eyeoglu
ab766a0598
Merge pull request #968 from magneticflux-/utf8-logging
...
Decode process lines as UTF-8
2022-08-18 10:44:01 +02:00
Mitchell Skaggs
3c4b45c9e7
Use C locale codec for decoding
...
This should correctly decode multi-byte non-UTF-8 text, such as Windows-936 (Simplified Chinese)
Signed-off-by: Mitchell Skaggs <skaggsm333@gmail.com>
2022-08-13 10:39:05 -05:00
flow
93507a263b
fix: hide 'More news...' button if the news aren't loaded yet
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-12 17:41:11 -03:00
Sefa Eyeoglu
1175461030
refactor: switch to new versioning scheme
...
The new versioning system is based on the versioning system used by the
GNOME Foundation for the GNOME desktop.
We are dropping the "major version" as defined by SemVer and move to a
version number with a most and least significant number.
The most significant number must be incremented, if there are new
features or significant changes since last major release.
Otherwise, the least significant number must be incremented, if there
are only minor changes since the last release. New features or
significant changes mustn't be introduced by a bump of the least
significant number.
If a minor change would introduce small user-facing changes (like a
message-box or slight UI changes), it could still be classified as a
minor change.
At the end of the day, a human shall decide, if a change is minor or
significant, as there is no clear line that would separate a "minor" and
a "significant" change in a GUI-application.
Definitions:
feature: New user-facing functionality
significant change: Something that changes user-facing behavior
minor change: Something that fixes unexpected behavior
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-08-12 14:22:24 +02:00
flow
2f5e55bea0
fix: only remove orphaned metadata on first opening
...
This avoids deleting the metadata while one is updating their mods.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-11 13:11:56 -03:00
timoreo
c375e7b4df
Merge pull request #897 from jamierocks/atl-updating-initial
2022-08-11 08:50:05 +02:00
timoreo
5d188c69ed
Merge pull request #1039 from budak7273/fix-world-safety-nag-title-text
2022-08-11 07:33:13 +02:00
timoreo
1a5986abe0
Merge pull request #920 from flowln/metacache_fix
2022-08-11 07:32:43 +02:00
Robb
cebac3c10e
Make new title strings translatable
...
Signed-off-by: Robb <computerguy440+gh@gmail.com>
2022-08-10 12:07:24 -05:00
timoreo
a5da3db966
Merge pull request #1018 from Scrumplex/fix-infinite-auth-loop
2022-08-10 18:14:26 +02:00
Robb
cd30f75173
fix: Make world safety nag title text match the action being performed instead of always saying 'Copy World'
...
Signed-off-by: Robb <computerguy440+gh@gmail.com>
2022-08-09 16:01:21 -05:00
Mitchell Skaggs
94df4ceb36
Fix use of Qt 5.14 enum
...
Signed-off-by: Mitchell Skaggs <skaggsm333@gmail.com>
2022-08-09 00:17:53 -05:00
Mitchell Skaggs
a14476c5fb
Replace local 8-bit decoding with UTF-8 decoding
...
Handles incomplete byte sequences using `QTextDecoder`
Signed-off-by: Mitchell Skaggs <skaggsm333@gmail.com>
2022-08-08 23:54:01 -05:00
Sefa Eyeoglu
d82bb29919
fix: don't apply GameMode/MangoHud, if they aren't supported
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-08-08 21:19:46 +02:00
Sefa Eyeoglu
33af0c6a7c
refactor: don't include mangohud's library path
...
This could cause issues on some environments. Users should just put
MangoHud libs into global LD_LIBRARY_PATH, just like with any other
library
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-08-08 21:16:37 +02:00
Sefa Eyeoglu
68f3f98bc3
feat: detect GameMode and MangoHud's presence
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-08-08 21:16:37 +02:00
Sefa Eyeoglu
f873cd5b1a
refactor: store current capabilities
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-08-08 21:16:37 +02:00
flow
7b27f200b1
fix: don't mutate QHash while iterating over it
...
Even though it was using a QMutableHashIterator, sometimes it didn't
work quite well, so this is a bit better.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-05 16:30:12 -03:00
flow
f4b207220c
fix: add some more nullptr checks / protection
...
die sigsegv 🔫
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-05 15:10:44 -03:00
flow
d835e1d14e
refactor: simplify smart pointers more
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-05 11:38:46 -03:00
flow
75f92de8f8
Merge pull request #1017 from flowln/kill_orphan_metadata
...
Remove orphaned metadata to avoid problems with auto-updating instances
2022-08-04 12:57:20 -07:00
flow
362ecdb583
refactor+fix: use QSharedPointer for shared_qobject_ptr
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-04 15:33:51 -03:00
Sefa Eyeoglu
355762aa30
fix: emit abort in LaunchController
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-08-04 10:07:36 +02:00
Sefa Eyeoglu
be4fb65470
fix: Add root path detection on OpenBSD
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-08-03 21:14:32 +02:00
Sefa Eyeoglu
4ed296bad4
fix: allow user to interrupt launch after 3 tries
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-08-03 20:38:40 +02:00
Gingeh
a8aa862919
Move large condition into a new lambda
...
Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>
2022-08-03 16:39:30 +10:00
flow
31ba1de53b
fix: remove orphaned metadata to avoid problems with auto-updating insts
...
Just as my master has taught me. 🔫
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-02 16:15:39 -03:00
Gingeh
f33b31e048
Check for running instance when re-opening the mod folder page and when selecting mods
...
Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>
2022-08-02 14:14:45 +10:00
Gingeh
0d10ebb7ca
Update launcher/ui/pages/instance/ModFolderPage.h
...
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>
2022-08-02 12:50:25 +10:00
flow
4a8abc948e
fix: prevent segfault due to callbacks into deleted objects
...
Since network requests are, for the most part, asynchronous, there's a
chance a request only comes through after the request sender has already
been deleted.
This adds a global (read static) hash table relating models for the mod
downloader to their status (true = alive, false = destroyed). It is a
bit of a hack, but I couldn't come up with a better way of doing this.
To reproduce the issue before this commit: scroll really quickly through
CF mods, to trigger network requests for their versions and description.
Then, in the middle of it close the mod downloader. Sometimes this will
create a crash.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-01 18:34:15 -03:00
Gingeh
77b640b76b
Disable "Check for Updates" and "Download Mods" while the game is running
...
Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>
2022-08-01 20:56:05 +10:00
Gingeh
a8dfe98b1a
Disable "Check for Updates" if all mods are removed
...
Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>
2022-08-01 20:56:05 +10:00
flow
cee41b87f7
fix(ui): force redraw of mod list when (de)selecting a mod
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-01 07:33:31 -03:00
flow
7a95314e42
feat(ui): remember mod download dialog's geometry
...
Makes it consistent with other modal dialogs.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-01 07:33:31 -03:00
flow
6aaf1f4f21
feat: lazy-load CF mod descriptions
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-01 07:33:30 -03:00
flow
368a0ddd44
feat: add mod descriptions to CF mods
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-01 07:33:30 -03:00
flow
0808a10b7b
feat: cache mod versions
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-01 07:33:30 -03:00
flow
6f052baa94
refactor: use function cb instead of class cb in getVersions
...
I've discovered even more functional programming! :^)
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-01 07:33:30 -03:00
flow
5bc67d3f6b
feat: cache extra mod info (like links and body)
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-01 07:33:30 -03:00
flow
74c6c5cfbc
refactor: use function cb instead of class cb in getModInfo
...
I've discovered functional programming :^)
This makes this route more fit for general use.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-01 07:33:30 -03:00
flow
158b7fd166
feat+refactor: clean up ProgressWidget and add progress indicatior to
...
mod downloader
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-01 07:33:30 -03:00
flow
c3f647dc96
feat: add (semi) instant searching in mod downloader
...
It has a delay of 350ms from the last typed character to search, in
order to cache small changes while typing.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-01 07:33:30 -03:00
flow
5936c7b65c
change: preserve search term across different mod providers
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-01 07:33:29 -03:00
flow
a8bcd85c93
feat+refactor: add shortcuts to mod downloader and clean up
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-01 07:33:29 -03:00
flow
127b558f95
change: change button names to be more user-friendly
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-01 07:33:29 -03:00
flow
6e9a27f40f
feat: display the 'body' of a MR mod on the mod downloader
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-01 07:33:29 -03:00
flow
4a13dbe3bb
feat: create delegate for project item views
...
This allows us to define custom painting for list view items. In
particular, this is applied to the mod downloader, in order to allow
displaying both the mod name and mod description, and settings their
effects (like bold or underline) independent of each other.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-01 07:33:29 -03:00
flow
0f61f5ba03
fix(ui): missing tr() in mod download dialog's title
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-08-01 07:33:29 -03:00
kumquat-ir
9c105914f0
use BlockedModsDialog for ftb packs as well
...
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2022-07-31 15:05:47 -04:00
kumquat-ir
579582740e
Merge remote-tracking branch 'origin/develop' into download-all-blocked
...
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2022-07-31 14:54:50 -04:00
Ryan Cao
b15544c163
Trash instances instead of deleting (when possible) ( #549 )
...
Squashed because of :pofat: commit history
2022-07-30 14:42:33 -03:00
LennyMcLennington
94a63e3859
Merge pull request #941 from Scrumplex/bump-cxx-standard
...
Bump to C++17
2022-07-30 17:10:59 +01:00
timoreo
74120fe1f3
Merge pull request #699 from Scrumplex/resolve-ftb-mods-cf
2022-07-28 09:43:39 +02:00
DavidoTek
b4e8abd0ad
feat: win32 enable dark titlebar for dark theme
...
Signed-off-by: DavidoTek <54072917+DavidoTek@users.noreply.github.com>
2022-07-26 23:25:17 +02:00
flow
336f1f4f50
Merge pull request #974 from flowln/accounts_qt6
...
Fix adding multiple accounts in Qt6
2022-07-26 16:08:05 -03:00
flow
1ce0f0e7a5
fix: progress dialog going away even if the task was not aborted
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-26 20:33:33 +02:00
flow
fbf1901d86
refactor: shuffle some things around to improve readability
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-26 20:33:33 +02:00
flow
0382f33c46
fix(ui): pump events to show "Copying modpack files..." text
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-26 20:33:33 +02:00
flow
13372f3f99
chore: clean up FTBPackInstallTask a bit and connect missing signals
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-26 20:33:33 +02:00
flow
e741cb7f0a
fix: add abort handlign in Flame's FileResolvingTask
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-26 20:33:33 +02:00
Sefa Eyeoglu
fb289c6b17
chore: add license headers
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-26 20:33:29 +02:00
Sefa Eyeoglu
75a7ea55d4
feat: implement mod resolving for FTB
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-26 20:33:10 +02:00
Sefa Eyeoglu
86573a5ccd
Merge pull request #961 from flowln/fix_resource_filter
2022-07-26 20:14:18 +02:00
flow
6fe55a79f1
fix: use const qualifier for operator==() and allow other comparisons
...
This fixes an implicit behavior changed by C++17.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-26 15:11:56 -03:00
flow
1a6cb9ee99
chore: add some debugging prints in AccountList
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-26 15:11:56 -03:00
LennyMcLennington
65a945f968
Merge pull request #956 from flowln/jar_mods_aa
...
Fix segmentation fault when using jar mods
2022-07-25 06:57:40 +01:00
flow
a9e8ed5087
fix: pump events and do a queued start for concurrent tasks
...
Heavy workloads can consume a ton of time doing their stuff, and starve
the event loop out of events. This adds an event processing call after
every concurrent task has been completed, to decrease the event loop
stravation on such loads.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-24 17:46:54 -03:00
flow
00520b6a0e
feat: add hashing tasks to the sequential task in ModUpdateDialog
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-24 17:46:54 -03:00
flow
e6f2a3893a
refactor+feat: improve code separation in ensure metadata
...
... and avoid calculating the same hash multiple times
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-24 17:46:54 -03:00
flow
631a93bcd8
refactor: add a HashUtils place for hashing stuff
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-24 17:46:54 -03:00
flow
b1763353ea
feat: do incremental calculation of CF's hash
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-24 17:46:53 -03:00
flow
15ec1abb6a
feat: use QIODevice for calcuating the JAR hash on Modrinth
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-24 17:46:53 -03:00
flow
cfda8dbb2b
refactor: use QIODevice instead of a whole QByteArray for hash calc.
...
This allows Qt to do its thing and optimize the data gathering from the
JAR.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-24 17:46:53 -03:00
flow
3aa2003951
fix: filter in external resource pages not working
...
For some reason, using setFilterFixedString() doesn't seem to update the
QRegularExpression object with a new value, instead leaving it empty. It
updates QRegExp just fine, so maybe that's an Qt bug? o.O
Anyway, using regex in the filter is kinda cool actually :D
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-23 23:50:56 -03:00
flow
0e473f4570
Merge pull request #951 from flowln/performace_tab_fix
...
Hide the entire performance tab on the instance settings in non-Linux OSes
2022-07-23 18:31:04 -03:00
flow
1157436a24
fix: sigsegv when trying to use jar mods
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-23 14:24:24 -03:00
flow
813dfbd2d3
fix: hide the entire performance tab on instance settings in non-Linux
...
"just woke up after a major release has just been made" coding style
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-23 13:29:39 -03:00
Sefa Eyeoglu
ba7dfb360c
fix: actually substitute variables in pre/post launch
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-23 17:51:58 +02:00
timoreo
6aad750fe0
Merge pull request #893 from Scrumplex/refactor-env-handling
2022-07-23 14:08:10 +02:00
Sefa Eyeoglu
c65f5f7728
Merge pull request #877 from Scrumplex/refactor-offline-accounts
2022-07-23 13:54:36 +02:00
timoreo
74b62727af
Merge pull request #947 from flowln/unicode_uhh
2022-07-23 13:38:48 +02:00
Sefa Eyeoglu
2e94562f79
fix: treat accounts as offline, if auth servers are down
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-23 12:38:01 +02:00
flow
439e7bbf4e
change: unicode chars for folders and disabled mods in mod list
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-22 17:45:27 -03:00
txtsd
75cfaf0672
Merge pull request #938 from Scrumplex/fix-i18n3
2022-07-22 22:45:53 +05:30
flow
33853b6107
fix: use single-space unicode char for checkmark in mod list
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-22 11:48:08 -03:00
flow
ab6e1b112b
change(cache): use cache-specific http headers for their lifetime
...
This uses the 'Age', 'Cache-Control' and 'Expires' HTTP headers to more
accurately set up the cache lifetime, falling back to a static 1-week
time if they're not present in the response.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-21 19:19:24 -03:00
Sefa Eyeoglu
c666c3e251
refactor!: bump to C++17 and C17
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-20 14:22:10 +02:00
Sefa Eyeoglu
9cc1773fa7
fix: move HTML code outside of translation
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-20 10:15:21 +02:00
Sefa Eyeoglu
e78c7af715
Merge pull request #936 from Scrumplex/fix-windows-crap-2
2022-07-20 10:07:10 +02:00
Sefa Eyeoglu
fd2b206997
fix: support LD_* for OpenBSD
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-19 18:07:58 +02:00
Sefa Eyeoglu
2d53c7c5b2
refactor: filter values in environment variables
...
Before this change, you had to specify custom LD_* variables using the
prefix GAME_LD_*. Now instead of dropping all LD_* variables by default,
we should just filter them and remove the values we *know* are from our
start script.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-19 18:07:58 +02:00
Sefa Eyeoglu
28ae5d710e
fix: fix translations for mod updater
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-19 18:03:45 +02:00
Sefa Eyeoglu
8fc1653b0c
fix: fix Java Checker on Windows, again
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-19 11:12:11 +02:00
kumquat-ir
20b1723e78
merge origin/develop
...
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2022-07-18 14:05:23 -04:00
kumquat-ir
be78afeee5
qtcreator moment
...
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2022-07-18 14:03:06 -04:00
flow
0cb47cf7d7
fix: dark placeholder text in dark background on dark theme
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-18 14:25:00 -03:00
flow
54b335711a
fix: raw-pointers and leaks in ModFolderLoadTask
...
Co-authored-by: timoreo <contact@timoreo.fr>
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:56:23 -03:00
flow
6bb8332b4b
fix: bogus returns in EnsureMetadataTask
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:43:12 -03:00
flow
de9e304236
fix: std::list -> QList
...
Qt6 removed Qlist::toStdList() 😭
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:45 -03:00
flow
650af5eb64
change: use ModStatus as a simple member instead of a pointer
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:44 -03:00
flow
47bdcb6050
feat: make second metadata pass concurrent
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:44 -03:00
flow
58dc3e93d3
fix: clean up execWithTask in Progress Dialog
...
This prevents weird problems, such as dialogs being non-modal when they
should be!
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:44 -03:00
flow
79b0a16f7a
fix: try finding a good height for short changelogs
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:44 -03:00
flow
2b65ee433f
fix: changelogs with too much space between lines
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:44 -03:00
flow
001bbef9ee
fix: don't use shared_ptr for a background task T_T
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:44 -03:00
flow
c4316e81e6
change: make Mod a QObject used as a pointer
...
Prevents problems when copying it around!
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:44 -03:00
flow
fac63541a4
fix: work around HoeDown bug(?) in changelog line breaks
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:44 -03:00
flow
dfd6cb29be
feat: improve changelog and sort updatable mods
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:44 -03:00
flow
5f75e531e6
fix: handling around disabled mods
...
Don't update disabled mods to prevent mod duplication. Also, chop
filename in the metadata with a '.disabled'.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:43 -03:00
flow
a7648d60ce
fix: don't require non-essential items in mod index
...
Also adds slug field.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:43 -03:00
flow
52c45c2d32
feat: add some mod api calls
...
- Get Project: Already existed but required a specific caller type. This
is more general.
- Get Projects: A single call to multiple of the above
Both providers support these calls.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:43 -03:00
flow
fd6755c93f
change: mod metadata improvements
...
- Use slug instead of name
- Keep temporary status before having local details
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:43 -03:00
flow
a53ee2e35c
fix: mod parsing of 'String-fied' version (i.e. OpenBlocks)
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:43 -03:00
flow
4e6978ff6f
feat: improve metadata gen. networking and performance
...
This makes the metadata generation code a lot messier and harder to use,
but there's not really much else that can be done about it while
preserving all it's capabilities :(
At least we now have speed
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:43 -03:00
flow
91a5c4bdcb
feat: add metadata get/delete via mod id
...
This is, in many cases, more reliable than name comparisons, so it's
useful specially in cases where a mod changes name between versions
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:43 -03:00
flow
9a07ede615
fix: filter out opted-out mods in mod downloader
...
Maintains Pre-Updater behaviour
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:43 -03:00
flow
dfab55112b
feat: remove existing mod when updating/redownloading it
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:42 -03:00
flow
1709b47bb7
fix: don't double add mods in mod downloader/updater
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:42 -03:00
flow
2d10c246a8
feat: add update mods to the ui / mod model
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:42 -03:00
flow
6e2869834f
feat: add mod update dialog
...
This subclasses the Review mods dialog to make a "Update review" one.
Also, all the necessary components built until now are put together in a
coherent unity that checks and generates metadata on-the-fly and checks for
mod updates, while giving and receiving feedback to the user.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:42 -03:00
flow
b8b71c7dd2
feat: add mod update check tasks
...
Those tasks take a list of mods and check on the mod providers for
updates. They assume that the mods have metadata already.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:42 -03:00
flow
c3f6c3dd82
feat: add changelog to mod providers
...
The Modrinth changelog is fairly straight-forward, as it's given to us
directly with the API call we already did. Flame, on the other hand,
requires us to do another call to get the changelog, so it can introduce
quite a heavy performance impact. This way, we make it optional to get
such changelog.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:42 -03:00
flow
844b245776
feat: add EnsureMetadataTask
...
This task is responsible for checking if the mod has metadata for a
specific provider, and create it if it doesn't.
In the context of the mod updater, this is not the best architecture,
since we do a single task for each mod. However, this way of structuring
it allows us to use it later on in more diverse scenarios.
This way we decouple this task from the mod updater, trading off some performance
(though that will be mitigated when we have a way of running arbitrary tasks
concurrently).
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:42 -03:00
flow
4bcf8e6975
feat: add api call to flame
...
Call added:
- Get Fingerprints Matches
- Get Mod File Changelog
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:42 -03:00
flow
0e52112016
feat: add some api calls to modrinth
...
Calls added:
- Get version from hash
- Get versions from hashes
- Latest version of a project from a hash, loader(s), and game version(s)
- Latest versions of multiple project from hashes, loader(s), and game version(s)
Some of those are not used yet, but may be of use later on, so we have
it if we need it :)
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:41 -03:00
flow
32a9545360
libs: add murmur2 library
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:41 -03:00
flow
9a44c92211
feat: add MultipleOptionsTask
...
This is a variation of a Sequential Task, in which a subtask failing
will prompt the next one to execute, and a subtask being successful will
stop the task.
This way, this can be used for easily managing fallbacks with tasks. :D
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:41 -03:00
flow
dd6aabf9ab
feat: add ChooseProviderDialog
...
Allows you to prompt the user for choosing a (mod) provider. This should
be fairly independent of the mod updater logic, so it can be used for
other ends later down the road :^)
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:41 -03:00
flow
91776311c7
fix: allow aborting upload tasks
...
This maintains the same behaviour as the Download task.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:41 -03:00
flow
882c82f82c
fix: always update global progress of sequential tasks
...
Previously, it would not update the global counter if the subTask didn't
update its progress, even though progress was being made.
This also prevents a segmentation fault while aborting the task.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:41 -03:00
flow
43b9db6e45
change: allow deleting mods while preserving their metadata
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:41 -03:00
flow
032ceefa1d
feat: add some helping methods to WideBar
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:41 -03:00
flow
05fa266e6b
fix: provide default value to is_indexed in ModDownloadTask
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-17 11:33:40 -03:00
Sefa Eyeoglu
56085310cb
Merge pull request #913 from Gingeh/cape-without-skin
2022-07-17 09:57:03 +02:00
kumquat-ir
6a1d611fd1
Restore ScrollMessageBox
...
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2022-07-17 02:40:27 -04:00
flow
c8a72c876d
fix: add missing HttpMetaCache entry for CF mods
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-16 21:25:29 -03:00
flow
ec87a8ddfc
fix: add expiration time to cache entries
...
This is to prevent problems where the cache entry would still be used
way after the remote resource got updated. The limit is hardcoded for 1
week, which I think is a reasonable time, but this could be further
tweaked.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-16 21:25:28 -03:00
kumquat-ir
33e34ebb83
Add "Open All" button to blocked mods dialog
...
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
2022-07-16 19:14:54 -04:00
Sefa Eyeoglu
396b3c3952
fix: add missing full-stop to message
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-16 21:26:23 +02:00
Sefa Eyeoglu
17ea51ce27
fix: fix memory leak on Windows
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-16 20:08:08 +02:00
Gingeh
4dfc01899a
Make skin upload optional
...
Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>
2022-07-15 12:23:11 +10:00
flow
509f7bd018
fix: move time record overrides to BaseInstance
...
This is needed so that we can show time stats in the UI without having
to load all type-specific settings, which would make all the previous
changes useless :c
This is apparently done with console settings too, so I don't think
there's a problem doing this too :>
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-12 21:15:59 -03:00
Sefa Eyeoglu
a4672ba00f
fix: remove unnecessary code for Windows
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-11 19:09:20 +02:00
Sefa Eyeoglu
c0bf267bae
fix: fix unicode issue with JavaChecker on Windows
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-11 18:53:20 +02:00
Sefa Eyeoglu
8f4d7ac655
Merge pull request #678 from Scrumplex/improvements-around-proprietary-services
2022-07-11 14:56:09 +02:00
Kenneth Chew
eae8a2914e
Remove use of obsolete method
...
Fixes Qt 6 build
Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com>
2022-07-10 19:09:58 -04:00
Sefa Eyeoglu
b3b76d5d56
Merge branch 'develop' into feature/sparkle-mac
...
# Conflicts:
# .github/workflows/build.yml
2022-07-10 19:38:30 +02:00
Sefa Eyeoglu
eb33a87ff5
fix: remove TODOs
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-10 18:11:13 +02:00
Jamie Mansfield
bf560f4594
ATLauncher: Move the UI support implementation into it's own class
...
This will allow it to be used in multiple locations.
2022-07-10 11:27:42 +01:00
Sefa Eyeoglu
f464b347b2
fix: install TLS plugins for release builds
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
eb5ed50824
fix: set UNICODE and _UNICODE for Qt 5 builds
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
3b4539de79
chore: update license headers
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
3e4d1c04de
fix: include TLS plugins in bundle
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
15c5bbcf22
fix: fix slots for Qt 6
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
c363423718
refactor: fix deprecation up to Qt 6
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
e58158c3cd
feat: add Qt 6 support to CMake
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-10 12:19:14 +02:00
Sefa Eyeoglu
ff2cd50bfa
refactor: replace QRegExp with QRegularExpression
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-10 12:17:52 +02:00
Sefa Eyeoglu
984692dc62
refactor: fix deprecation up to Qt 5.15
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-10 12:17:52 +02:00
Jamie Mansfield
a7fc23dd96
ATLauncher: Reset existing directory if required
2022-07-10 11:15:48 +01:00
txtsd
c1bcbf8c63
Merge pull request #880 from Scrumplex/fix-loader-importance
...
Make loader components not important
2022-07-10 15:44:17 +05:30
Jamie Mansfield
9e69b8fe1b
ATLauncher: Parse keeps and deletes from pack manifests
2022-07-10 11:05:11 +01:00
Jamie Mansfield
e0ae631d59
ATLauncher: Add modes to install task and display appropriate message
...
This will display the update/reinstall message for the installation
method currently in use..
2022-07-10 10:55:05 +01:00
dada513
3b187b5246
Merge pull request #876 from Scrumplex/revert-updater-stuff
...
Revert "fix: remove updater if it is not used"
2022-07-10 10:50:03 +02:00
Sefa Eyeoglu
e6fe701727
Merge pull request #808 from Scrumplex/fix-lgtm-warnings
2022-07-09 01:10:59 +02:00
flow
35a698ef72
Merge pull request #884 from jopejoe1/ftbuifixed
...
Updated FTB Classic layout
2022-07-08 16:19:14 -03:00
flow
998271414e
Merge pull request #890 from Scrumplex/fix-technic-forge
...
Fix Technic instances using Forge
2022-07-08 16:18:59 -03:00
Sefa Eyeoglu
4ab0e70a9a
fix(technic): map loader libraries to components properly
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-08 17:28:06 +02:00
Sefa Eyeoglu
08989bde5e
Merge pull request #839 from flowln/modrinth_packs_bug_hunt
2022-07-08 16:25:35 +02:00
Sefa Eyeoglu
87cbff391c
fix: disable MSA login if it is NOT supported
...
Co-authored-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
962923bbce
chore: add missing license headers
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
311b081e60
feat: add validation for Flame key and MSA client ID
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
4103948132
feat: track capabilities of application
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
906f26698b
fix: spelling of CF
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
8a1a583afe
refactor: rename references to CurseForge to Flame
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-08 16:25:03 +02:00
jopejoe1
9e19b73ce6
Updated FTB Classic layout
...
Signed-off-by: jopejoe1 <johannes@joens.email>
2022-07-07 23:18:13 +02:00
Sefa Eyeoglu
301b811310
fix: make loader components not important
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-07 09:58:03 +02:00
flow
273cf3d565
feat: lazy-load MinecraftInstance settings
...
Makes the startup go fast!
vrum
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-06 17:17:54 -03:00
flow
f432cfd73a
change: put settings initialization in a separate function
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-06 16:18:09 -03:00
Sefa Eyeoglu
ffa756ccee
fix: remove tests for updater
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-06 18:13:51 +02:00
Sefa Eyeoglu
e210a4b244
Revert "fix: remove updater if it is not used"
...
This reverts commit 2ff0aa09e3
.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-06 18:13:51 +02:00
Sefa Eyeoglu
f1902a4471
Merge pull request #794 from Scrumplex/resolve-jars-dynamically
2022-07-06 17:40:09 +02:00
Sefa Eyeoglu
04b865adae
Merge pull request #707 from Jan200101/PR/gamemode
...
Add Performance related settings
2022-07-06 17:11:43 +02:00
Jan200101
cad581388f
Add Performance related settings
...
Integrates support for Feral Gamemode, discrete GPU support for Mesa and the proprietary Nvidia driver and MangoHud support
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
2022-07-06 09:34:14 +02:00
flow
e5f6dc1b14
fix: aborts when using a Qt build with assertions enabled
...
Preventing undefined behaviour hooray! :D
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-03 12:44:19 -03:00
flow
145da82cd8
fix: show invalid version even when there's none
...
Having a blank instead of _anything_ is bad UX. Instead, even when
there's not a valid version (most likely disabled redistribution), we
show a message in the UI, to differentiate from the loading state.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-03 12:43:05 -03:00
flow
64776d6bac
feat+fix: cache Flame modpack versions
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-03 12:43:05 -03:00
flow
64d123f524
fix: use better naming for Modrinth pack versions
...
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-03 12:43:04 -03:00
flow
0ec4ade683
feat+fix: cache versions and extra info in Modrinth packs
...
When you change a copy thinking you're changing the original data smh
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-03 12:43:04 -03:00
flow
4bfc445cf8
fix: add progress indicator on Flame mod resolution dialog
...
This code is super :pofat: omg
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-03 12:43:04 -03:00
flow
4232b1cedb
fix: don't use uniform sizes in Modrinth modpack viewer
...
Apparently, when Qt sees an icon with the height smaller than the rest,
with this option set, it will change the height of all other items to be
that one, causing #828 .
While we do lose some performance changing this option, the issue is
gone, so :|
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-03 12:43:00 -03:00
Sefa Eyeoglu
474d77ac57
feat: resolve JARs dynamically
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-03 17:31:01 +02:00
Sefa Eyeoglu
278d2169da
fix: initialize accountIsOnline to fix build
...
CMAKE_BUILD_TYPE=Release makes the build fail otherwise.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-07-03 14:32:31 +02:00
Sefa Eyeoglu
5599b5a337
Merge pull request #855 from Gingeh/account-list
2022-07-03 12:55:36 +02:00
flow
cd22da9c62
Merge pull request #864 from ivanpu/uncensored-offline
...
Don't censor "offline" word when that's the access token
2022-07-02 17:56:04 -03:00
flow
fb75c23f4e
Merge pull request #784 from Scrumplex/refactor-cmake
...
Refactor tests
2022-07-02 17:50:08 -03:00
Ezekiel Smith
7f22994f68
Merge pull request #831 from flowln/abort_connections
...
Add missing connections to the abort signal in some tasks
2022-07-03 01:50:36 +10:00
Ezekiel Smith
7aba7b6064
Merge pull request #818 from flowln/tiny_mod_icons
...
Always scale mod icons to the right size
2022-07-03 01:49:09 +10:00
Ezekiel Smith
e32030f364
Merge pull request #860 from kthchew/fix/status-version
...
Show MC version of instance in status bar
2022-07-03 01:47:27 +10:00
Ivan Puntiy
b40619bcbd
don't censor offline access token
2022-07-02 18:05:33 +03:00
timoreo
fe2e1d931f
Merge pull request #786 from flowln/concurrent_tasks_slimmed
2022-07-01 20:09:18 +02:00
timoreo
2e17e78052
Merge pull request #845 from flowln/news_in_launcher
2022-07-01 20:04:06 +02:00
Sefa Eyeoglu
8cec4b60a6
fix: update NewLaunch package name
2022-07-01 19:50:41 +02:00
flow
02201631e7
feat: use ConcurrentTask for mod downloads
...
Way faster :)
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-01 08:34:17 -03:00
flow
8e80b4bfc1
feat: add ConcurrentTask
...
This tasks (or rather, meta-task) has the ability to run several other
sub tasks concurrently.
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-07-01 08:34:10 -03:00
Sefa Eyeoglu
63dfc0633f
Merge pull request #652 from flowln/mod_page
2022-07-01 10:00:36 +02:00
Kenneth Chew
79840f0fca
Remove redundant type name from status bar
...
The type name is always "Minecraft", so it showed "Minecraft X.X.X (Minecraft)"
2022-06-30 23:02:56 -04:00
Kenneth Chew
06bf7b0f31
Fix Minecraft version not appearing in status bar
2022-06-30 23:02:56 -04:00
Gingeh
dbb63b97bd
Merge branch 'PolyMC:develop' into account-list
2022-07-01 10:43:41 +10:00
Gingeh
b5d2570fe2
Change Online status to Ready
2022-06-30 22:17:15 +10:00
flow
5f951e8f21
change: better regex for removing 'The' when sorting mods
...
Teh :|
Co-authored-by: timoreo22 <timo.oreo34@gmail.com>
2022-06-30 07:04:47 -03:00
Sefa Eyeoglu
286f82cc99
Merge pull request #826 from kthchew/fix/kill-menubar
2022-06-30 11:50:43 +02:00
timoreo22
ed5415aeb8
Merge pull request #837 from DioEgizio/fix-sort-mr
2022-06-30 08:24:51 +02:00
Gingeh
bef79df6bb
Disable the refresh button for offline accounts
2022-06-30 09:08:53 +10:00
Gingeh
91b5f0228d
add tr() to offline account name
...
Co-authored-by: flow <flowlnlnln@gmail.com>
2022-06-30 08:59:41 +10:00
Gingeh
84bd5ace6c
Move account checkboxes to the profile column (oops)
2022-06-29 19:58:41 +10:00
Gingeh
63589d2ba9
Rename profile column to username and update the tooltip
2022-06-29 18:49:06 +10:00
Gingeh
d6f4ff26b5
Disable skin buttons for offline accounts
2022-06-29 18:46:39 +10:00
Gingeh
b606a2e040
Make the profile and account name columns use all available space
2022-06-29 18:45:36 +10:00
Gingeh
f685139d89
Move the profile name column to the left
2022-06-29 18:43:29 +10:00
Gingeh
68d6ce60a9
Don't show account name for offline accounts
2022-06-29 18:42:01 +10:00
Ezekiel Smith
774ed044fc
Merge pull request #827 from kthchew/fix/menubar-separator
...
Workaround Qt bug to fix menu bar separators on macOS
2022-06-27 01:14:15 +10:00
Ezekiel Smith
9cc235cde0
Merge pull request #811 from jn64/fix/window-title
...
Fix duplicate name in window title
2022-06-27 01:13:58 +10:00
flow
9ef38171e2
fix: use clicked
instead of pressed
signal for button clicks
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-06-26 08:10:52 -03:00
flow
455e4de6f3
feat: add news reader dialog
...
Makes it easier to read about new blog posts! Yay :D
2022-06-25 20:15:16 -03:00
flow
4e319254dd
fix: use right name for the content of a News entry
2022-06-25 20:14:27 -03:00
DioEgizio
04e8780dd0
fix(modrinth): fix sorting
2022-06-24 10:47:02 +02:00
DioEgizio
0fe4384067
Update launcher/ui/pages/modplatform/flame/FlamePage.ui
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-06-23 17:58:54 +02:00
DioEgizio
bdfcd0b99e
chore(flame): reword warning
2022-06-23 17:06:49 +02:00
flow
5da87d1904
fix: add missing connections to the abort signal
...
Beginning with efa3fbff39
, we separated
the failing and the aborting signals, as they can mean different
things in certain contexts. Still, some places are not yet changed to
reflect this modification. This can cause aborting of progress dialogs
to not work, instead making the application hang in an unusable satte.
This goes through some places where it's not hooked up yet, fixing their
behaviour in those kinds of situation.
2022-06-22 20:20:39 -03:00
Sefa Eyeoglu
04e822acfb
fix: remove old reference to launchermeta
2022-06-22 20:47:47 +02:00
Kenneth Chew
c31fce3621
Workaround Qt bug to fix menu bar separators on macOS
2022-06-22 00:34:04 -04:00
Kenneth Chew
5c05cf2206
Disable launch actions in menu bar when last instance is deleted
...
This caused a crash when the action was selected!
2022-06-21 19:19:55 -04:00
Kenneth Chew
d4e544c62c
Separate the kill and launch instance actions
2022-06-21 19:19:55 -04:00
Ezekiel Smith
90025ed45d
Merge pull request #812 from jn64/fix/about-labels
...
Make version labels in About dialog selectable
2022-06-22 01:13:43 +10:00
Ezekiel Smith
964151d9c7
Merge pull request #817 from flowln/zip_ensure_path
...
Don't create unnecessary folders when extracting ZIPs
2022-06-22 01:13:23 +10:00
Ezekiel Smith
409c9bf9d2
Merge pull request #778 from Scrumplex/track-real-architecture
...
Track real CPU architecture for instances
2022-06-22 01:13:10 +10:00
flow
a135c06bcf
fix: scale mod icons to the right size
2022-06-21 06:41:56 -03:00
jn64
fa6829a6a1
Set beam cursor on selectable labels
2022-06-20 14:28:38 +08:00
jn64
5335540c33
Rename main window
2022-06-20 13:45:36 +08:00
flow
7f62de3854
fix: don't create unnecessary folders when extracting ZIPs
2022-06-19 22:03:02 -03:00
jn64
0afa2e92d5
Make GitHub link focusable by keyboard
2022-06-18 22:20:38 +08:00
jn64
6d1b166ad7
Make labels selectable
...
User can copy version/build info easily.
2022-06-18 22:19:23 +08:00
jn64
4b6ddfb89b
Add version to Qt applicationDisplayName
2022-06-18 20:00:28 +08:00
Sefa Eyeoglu
9ec260619b
fix: fix warnings reported by LGTM.com
2022-06-17 16:34:32 +02:00
flow
03e454b71d
Merge pull request #694 from Technous285/develop-1
...
Add OpenBSD support
2022-06-15 06:32:14 -03:00
DioEgizio
1f6cef6f8a
fix https://github.com/PolyMC/PolyMC/issues/798
2022-06-15 09:11:23 +02:00
Ezekiel Smith
e6b1a1fa76
Merge pull request #716 from flowln/mod_perma_2
...
Hide index folder on Windows
2022-06-14 23:58:35 +10:00
Ezekiel Smith
3e8d450741
Merge pull request #665 from jamierocks/h-managed-packs
...
PackPlatforms: Record where packs come from
2022-06-14 23:54:44 +10:00
Ezekiel Smith
27239b2dde
Merge pull request #634 from flowln/donate_links
...
More links for CF / Modrinth mods / modpacks
2022-06-14 23:52:00 +10:00
Sefa Eyeoglu
effe46db86
refactor: move away from UnitTest.cmake
2022-06-14 14:44:49 +02:00
Sefa Eyeoglu
e25cdd9d12
refector: move download action to ExternalResourcesPage
2022-06-14 07:04:31 -03:00
flow
d394235ee0
refactor: Create a more clear hierarchy for some instance pages
...
Previously, the Shaders, Texture packs and Resource packs tabs had as
parent the ModFolderPage, making it so that making changes only to the
Mods page would require checking the id of the page for the correct one.
This was hackish and error-prone.
Now, those pages all inherit from a single class, ExternalResourcesPage,
that handles the basic behaviour of all of them, while allowing for
individual modification in code.
This is still not a clear separation, since internally, all those
resources are derived from Mods, so for now there's still some awkward
common code :/
2022-06-14 07:04:31 -03:00
Sefa Eyeoglu
349fc4143d
Merge pull request #714 from Scrumplex/fix-tests
...
Fix mod metadata tests
2022-06-13 23:10:35 +02:00
Sefa Eyeoglu
4be9e6a0bc
refactor: make is_indexed false by default
...
Co-authored-by: flow <flowlnlnln@gmail.com>
2022-06-13 22:07:42 +02:00
Sefa Eyeoglu
d08815bbc1
Merge pull request #759 from flowln/mod_perma_3
2022-06-12 19:17:08 +02:00
flow
794022d399
Merge pull request #783 from Scrumplex/fix-avoid-settings-register-warnings
...
Avoid re-registering InstanceType
2022-06-12 13:46:46 -03:00
flow
4448418b63
fix: segfault when the same mod is present enabled and disabled at once
...
This maintains the previous behaviour
2022-06-12 09:44:03 -03:00
flow
9f1f37e780
fix: correctly handle disabled mods with metadata
...
im stupid
2022-06-12 09:25:25 -03:00
flow
40ccd1a469
fix: handling of incomplete mods
...
(i.e. mods without ModDetails that may have metadata)
2022-06-12 09:25:21 -03:00
Sefa Eyeoglu
a4ef0940ed
chore: add license headers
2022-06-12 13:50:58 +02:00
Sefa Eyeoglu
2ff0aa09e3
fix: remove updater if it is not used
2022-06-12 13:39:47 +02:00
Sefa Eyeoglu
32217a774f
fix(tests): wait until ModFolderModel has updated
2022-06-12 13:33:17 +02:00
Sefa Eyeoglu
8856c8cd62
refactor(test): fix loading mod metadata setting
2022-06-12 13:33:17 +02:00
flow
e843b8e188
fix(test): fix packwiz test
2022-06-12 13:33:17 +02:00
Sefa Eyeoglu
c4f2e3a955
Merge pull request #771 from flowln/modrinth_multiple_downloads
2022-06-12 10:50:57 +02:00
Sefa Eyeoglu
91301ec7fe
Merge pull request #632 from ryanccn/macos-app-heuristic
2022-06-12 10:46:49 +02:00
Ryan Cao
13b03e7e50
Update Application.cpp
2022-06-12 11:44:04 +08:00
Sefa Eyeoglu
8a0aa5a0c8
fix: avoid re-registering InstanceType
2022-06-11 23:06:42 +02:00
dada513
2bd8e7dca4
Merge pull request #780 from flowln/guo_ext_2
2022-06-11 19:45:51 +02:00
dada513
d75571ffa1
Merge pull request #773 from vancez/fix-launch-button
2022-06-11 19:41:02 +02:00
dada513
2ee4b6768d
Merge pull request #770 from flowln/technic_links
2022-06-11 19:34:59 +02:00
flow
37160f973f
fix: account for the dequeued url when checking the number of urls
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-06-11 14:31:50 -03:00
Sefa Eyeoglu
51258ab28c
Merge pull request #709 from Scrumplex/fix-instancetypes
...
Always store InstanceType
2022-06-11 19:29:46 +02:00
flow
29e5a213a5
fix: dequeue first added file in mrpack import
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-06-11 14:19:51 -03:00
Sefa Eyeoglu
2d261607df
Merge pull request #732 from MrMelon54/develop
2022-06-11 19:14:26 +02:00
flow
54144154f9
fix: apply client overrides in mrpacks
...
another oopsie x.x
2022-06-11 13:44:31 -03:00
Sefa Eyeoglu
81daffe68e
fix: remove file filter from translation
2022-06-11 14:10:42 +02:00
flow
2ea20a8b29
fix: allow discovering mrpacks in languages without dot
2022-06-11 07:12:59 -03:00
Sefa Eyeoglu
2257c875f5
Merge pull request #708 from ryanccn/custom-user-agent
2022-06-11 10:53:58 +02:00
Sefa Eyeoglu
8a2e8ad953
feat: track real CPU architecture for instances
2022-06-11 10:48:58 +02:00
Vance
fa5b1d9978
change slot name
2022-06-10 15:48:18 +08:00
Ryan Cao
529fb07b42
I changed my mind
2022-06-10 15:18:47 +08:00
Vance
4a261cac1a
fix: update toolbar when instance state changes
2022-06-10 10:25:13 +08:00
flow
b3c8f9d508
revert: don't check modrinth whitelisted hosts
...
people didn't seem to like it, and its not required
2022-06-09 19:57:51 -03:00
flow
1b878030aa
fix: enable using more than one download url in mrpacks
...
Kinda, it's ugly and hackish, since we don't have the facilities to
do this properly (yet!)
2022-06-09 19:54:50 -03:00
flow
46e403b20b
fix: properly parse mrpacks without the 'env' field
...
It's optional, so some files may not have it (like most of FO).
2022-06-09 19:53:29 -03:00
flow
1b1f728c58
fix: allow opening external links in technic modpack page
2022-06-09 18:46:19 -03:00
MrMelon
1d9797660b
QString::locateAwareCompare() is better for human-like sorting
2022-06-07 15:27:57 +01:00
MrMelon
89d4405563
Simplify sorting logic to a single std::sort call
2022-06-06 22:18:19 +01:00
flow
8966364648
Merge pull request #685 from kthchew/fix/technic-quilt
...
Add Quilt support for Technic modpacks
2022-06-06 18:03:05 -03:00
MrMelon
1c60e9b4fc
Add initial sorting function
2022-06-06 21:51:08 +01:00
Ryan Cao
757fa1410c
Update launcher/Application.cpp
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-06-05 23:52:21 +08:00
Sefa Eyeoglu
7a3acc3249
refactor(ui): use tabs for APIPage
2022-06-04 22:04:36 +02:00
DioEgizio
91b85f9919
Revert "Merge pull request #315 from txtsd/display_scaling"
...
This reverts commit fcf728f3b5
.
2022-06-04 17:09:11 +02:00
Ryan Cao
4cecba8787
make $LAUNCHER_VER actually work
2022-06-04 22:59:57 +08:00
Ryan Cao
5930acc418
change UI to scroll
...
let me just say, this does not look right
2022-06-04 22:54:05 +08:00
flow
c2a43c6f40
fix: hide .index folder on Windows
2022-06-04 11:02:59 -03:00
Sefa Eyeoglu
1ab00ca8b2
Merge pull request #426 from flowln/mod_perma
...
Add on-disk mod metadata information
2022-06-04 13:23:38 +02:00
Sefa Eyeoglu
778baa6dbe
fix: always store InstanceType
2022-06-04 11:59:12 +02:00
Ryan Cao
25ab121e42
feat: custom user-agent
2022-06-04 15:33:17 +08:00
Technous285
38ff76d2b8
Add OpenBSD support
...
Adds OpenBSD support.
2022-06-02 02:02:42 +10:00
glowiak
1a004f0c4d
Update MCEditTool.cpp
2022-06-01 15:50:43 +02:00
glowiak
7d21bf15e8
Update UpdateController.cpp
2022-06-01 15:50:02 +02:00
Sefa Eyeoglu
a88ad8025b
Merge pull request #682 from istudyatuni/fix-add-account-behaviour
2022-06-01 10:13:35 +02:00
Ryan Cao
e06bf17d13
Merge branch 'PolyMC:develop' into macos-app-heuristic
2022-06-01 00:12:14 +08:00
Kenneth Chew
7ac16ed073
Use QStringList
instead of QSet<QString>
...
Co-authored-by: flow <flowlnlnln@gmail.com>
2022-05-30 14:40:20 -04:00
Kenneth Chew
3585e4764b
Add Quilt support for Technic modpacks
2022-05-30 14:14:03 -04:00
Sefa Eyeoglu
9054ee18a1
Merge pull request #505 from flowln/improve_download_ux
2022-05-30 13:41:02 +02:00
Ilia
9d8b95107d
fix: do not show the "profile select" dialog if the user refused to add an account
2022-05-30 13:33:07 +03:00
timoreo
2746251dcd
Fix modrinth search filters
2022-05-29 18:23:34 +02:00
Sefa Eyeoglu
adf1e1982a
fix: remove unnecessary translation ( #674 )
2022-05-29 16:14:01 +02:00
Sefa Eyeoglu
f5405e835e
Merge pull request #624 from ryanccn/global-jvm-args
...
Make global JVM arguments multi-line
2022-05-29 16:10:55 +02:00