flow
7f441f5b87
Merge pull request #228 from bensuperpc/change_cast
2022-10-23 14:28:33 -03:00
he3als
0aac85dda1
Replace tab with spaces in flat_white.qrc
...
Signed-off-by: he3als <65787561+he3als@users.noreply.github.com>
2022-10-23 14:35:33 +01:00
he3als
4777a45722
Fix new flat white icons
...
Signed-off-by: he3als <65787561+he3als@users.noreply.github.com>
2022-10-23 14:32:35 +01:00
jn64
01db80d19a
Fix version labels width
...
Make labels fit to the contents, so Ibeam cursor doesn't appear
over empty space. Should have been done with 90025ed
2022-10-23 03:35:23 +08:00
flow
8b28ed67ae
Merge pull request #234 from AliceDTRH/fix/dedupejava
2022-10-22 13:14:26 -03:00
AliceDTRH
b2789fef0f
Use correct variable for Windows
...
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com>
2022-10-22 17:19:34 +02:00
he3als
46fe7e77b3
DCO Remediation Commit for he3als <65787561+he3als@users.noreply.github.com>
...
I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: d87f743a2b92dfd659f1a6e65dfc7a99e1c13e80
2022-10-22 16:14:50 +01:00
he3als
99e1c13e80
fix: add flat_white to code
2022-10-22 15:50:06 +01:00
he3als
a6e65dfc7a
Add new flat white icons
2022-10-22 15:40:39 +01:00
AliceDTRH
1471eddc7e
Deduplicates java installs before passing it on
...
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com>
2022-10-22 16:40:31 +02:00
he3als
89fd84d916
Merge branch 'PrismLauncher:develop' into develop
2022-10-22 15:30:40 +01:00
Jamie Mansfield
0e17eee096
ATLauncher: Fix pack installation always aborting
...
I made a mistake during when cherry picking a previous commit, this
applies the change - and fixes installing ATLauncher packs.
2022-10-22 15:22:30 +01:00
flow
81f1305270
Merge pull request #215 from forkiesassds/develop
2022-10-22 10:48:00 -03:00
Sefa Eyeoglu
24e4db676a
Merge pull request #224 from jamierocks/atl-abort-close-optional-mods-dialog
2022-10-22 15:31:53 +02:00
Sefa Eyeoglu
6e21a9829d
Merge pull request #225 from Scrumplex/fix-segfault-fileresolver
2022-10-22 15:31:46 +02:00
flow
4e99e10cbd
Merge pull request #218 from getchoo/change-jars-path
2022-10-22 10:18:58 -03:00
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
