Sefa Eyeoglu
fcdc7a1a35
fix: fix Modrinth query when Quilt is in use
2022-04-19 10:22:50 +02:00
Sefa Eyeoglu
f13c776099
Merge pull request #449 from DioEgizio/CI/specify-build-platform
...
specify -DLauncher_BUILD_PLATFORM on CI builds (EDIT: also remove "on x")
2022-04-19 09:59:11 +02:00
DioEgizio
7b9d462fbc
remove "on x"
2022-04-18 18:31:50 +02:00
Sefa Eyeoglu
c174a1eb01
fix: don't set mod loader as important
2022-04-18 15:05:41 +02:00
Sefa Eyeoglu
ac77997a7a
fix: handle network errors when downloading modlist
2022-04-18 14:36:36 +02:00
Sefa Eyeoglu
fa352ff4d3
fix: actually check if a mod loader is selected
...
Thus also removes a suggestCurrent call from loaderFilterChanged, as it will already be triggered by setSelectedLoaderVersion
2022-04-18 14:15:02 +02:00
Sefa Eyeoglu
fd7745cbeb
Merge pull request #442 from kthchew/fix/typos
2022-04-18 13:38:54 +02:00
flow
cbbcc2d68b
fix(translation): don't translate placeholders
...
Those are modified programatically, and never show up to the user!
2022-04-17 19:24:49 -03:00
Kenneth Chew
fcbf37f60f
Fix typos and inconsistent capitalization in sort options
2022-04-17 17:58:51 -04:00
Sefa Eyeoglu
0ccbc801cf
Merge pull request #411 from kthchew/feature/menubar
2022-04-17 23:19:51 +02:00
Kenneth Chew
4c52cc414f
Improve menu bar setting string
2022-04-17 16:39:08 -04:00
Kenneth Chew
6b45386252
Disable instead of hide menu bar option on Linux
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-04-17 20:32:51 +00:00
Kenneth Chew
3acc761419
Fix bugs with instance menu bar options when opening without instances
...
- The launch option is no longer empty.
- The program now checks on startup whether an instance is selected to decide whether to disable instance options.
Also, get rid of a dynamic cast.
2022-04-17 12:44:24 -04:00
Ezekiel Smith
703bf9bb7a
Merge pull request #431 from Scrumplex/feat-quilt-modrinth
...
Query for Fabric mods if Quilt is in use
2022-04-17 13:46:22 +10:00
Sefa Eyeoglu
cab9afa45f
fix: query for Fabric mods if Quilt is in use
...
Right now we want to include Fabric mods in our searches where possible.
Modrinth allows definining multiple loaders, while Flame only allows a
single value.
As a compromise we ask for Fabric mods only on Flame and for both Fabric
and Quilt mods on Modrinth.
2022-04-16 23:40:10 +02:00
Sefa Eyeoglu
ba5946dc60
Merge pull request #336 from Scrumplex/refactor-portable
2022-04-16 21:25:05 +02:00
Kenneth Chew
9bad83a551
Use TranslatedAction instead of QAction for menu bar actions
2022-04-16 13:35:13 -04:00
Kenneth Chew
a549828655
Remove the Edit menu bar menu
...
It wouldn't bring much utility.
- The keyboard shortcuts for copy/paste/etc. already work and are well-known. The menu bar likely doesn't need to advertise them.
- There's not very many places you would be able to use these options in the main window (because there's not many places to type stuff in the main window). It would only be applicable on systems with a native menu bar that shows in all other windows as well (but again, the keyboard shortcuts still work).
Also, rename `actionWiki` -> `actionOpenWiki` to match the corresponding `on_actionOpenWiki_triggered`
2022-04-16 13:17:34 -04:00
Sefa Eyeoglu
e11d1b5202
Merge pull request #429 from Irgendwer01/develop
...
better FreeBSD support
2022-04-16 18:21:54 +02:00
Sefa Eyeoglu
b10d4d3b8f
fix: drop BUNDLE_DEST_DIR
2022-04-16 18:13:12 +02:00
Sefa Eyeoglu
6ed130fc16
fix: don't allow portable builds on macOS
2022-04-16 18:13:12 +02:00
Sefa Eyeoglu
90d4acd1a1
refactor: combine portable and system builds
...
Portable builds now have the same layout as system builds. If you want
to build a portable bundle, you now need to additionally install the
`portable` component.
For example:
$ cmake -Bbuild -DCMAKE_INSTALL_PREFIX=install ...
$ cmake --build build
$ cmake --install build
$ cmake --install build --component portable
2022-04-16 18:13:09 +02:00
Sefa Eyeoglu
a42d2afcee
Merge pull request #392 from flowln/mod_filter
2022-04-16 18:03:03 +02:00
Kenneth Chew
6a97ac603a
Use preexisting actions in the menu bar
...
The code is now much cleaner.
Because the actions already present are enabled elsewhere even when the menu bar is hidden, keyboard shortcuts added to them automatically work regardless of whether the menu bar is visible. This means that the hacky workaround related to this can be removed.
2022-04-16 03:32:08 -04:00
Kenneth Chew
e59d3a339f
Close the current window instead of the main window from the menu bar
...
Systems with native menu bars show the same menu bar for all child windows. As a result, you cannot assume that the menu bar's parent (the `MainWindow`) will be the window in focus.
2022-04-16 02:07:29 -04:00
Ezekiel Smith
db7cb12551
Merge pull request #430 from DioEgizio/make-helppages-on-their-own-dir
...
CHANGE: switch the help pages to their own dir
2022-04-16 10:18:04 +10:00
Kenneth Chew
1049507b3f
Add logged in accounts to the profiles menu bar menu
...
Additionally, add keyboard shortcuts for switching between different accounts.
2022-04-15 19:55:49 -04:00
Kenneth Chew
1303771b58
Add option to always show menu bar instead of toolbar
...
For those who like keyboard navigation at the expense of aesthetics.
2022-04-15 18:26:41 -04:00
Kenneth Chew
f6605bc3f8
Implement help (open wiki) menu bar action
2022-04-15 16:44:27 -04:00
Kenneth Chew
80ec178d5f
Fix keyboard shortcut for delete instance on some devices
...
My laptop has a key labeled "delete," but for some reason it doesn't work with `QKeySequence::Delete`. Instead it's interpreted as a backspace.
2022-04-15 16:38:26 -04:00
Kenneth Chew
b0a8bd7dfe
Improve menu bar keyboard usability
...
More reasonable (unique) menu access keys were chosen.
In addition, move the settings action from the Help menu to the Edit menu.
2022-04-15 16:29:29 -04:00
Kenneth Chew
5d8d7740ba
Only enable instance options while an instance is selected
2022-04-15 15:55:03 -04:00
Kenneth Chew
3e64935844
Add Quilt install option while creating an instance
2022-04-15 15:37:08 -04:00
Kenneth Chew
7577115c3c
Fix Fabric versions appearing for unsupported MC versions
...
Also remove an old TODO comment, mentioning an issue that was already fixed.
2022-04-15 15:37:08 -04:00
Kenneth Chew
2cb242e9b3
Show no loader selected message when add instance window first opens
...
This resolves an issue where the message only shows when selecting a mod loader and then selecting "None" again.
2022-04-15 15:37:07 -04:00
Kenneth Chew
7aeccbb6b0
Fix build on Qt 5.6
2022-04-15 15:37:07 -04:00
Kenneth Chew
8406c7f431
Add option to install mod loader during instance creation
2022-04-15 15:37:07 -04:00
flow
8e9eca6a97
ui: resize mod download dialog using its parents geometry
2022-04-15 08:49:43 -03:00
flow
5f15f51610
ui: underline search button text when changing filters
...
This hopefully makes it easier to the user to know that their changes
will only apply after hitting the search button.
I tried setting the background color, but it seems more unreliable on
cross-platform than underlining. Also, it could be worse for daltonic people,
so I don't know what to do :(
2022-04-15 08:49:43 -03:00
flow
277de41200
rework: make the filter as a tabbed widget in the dialog itself
...
Still needs a clear indication that the filter only applies after you
click the search button...
2022-04-15 08:49:43 -03:00
flow
63bce04648
fix: Polish usage in some cases
...
Also fiz some typos
2022-04-15 08:49:43 -03:00
flow
76dfb7825a
fix: 'All' filter working and get around CF API capabilities
2022-04-15 08:49:43 -03:00
flow
5cb0e75093
fix(ui): Refresh mod list when changing filtering options
2022-04-15 08:49:41 -03:00
flow
c730fd6e5f
feat: Use version filter when searching mods
2022-04-15 08:45:30 -03:00
flow
c2b97c3e3f
feat: Integrate newly created filter dialog in ModPage
2022-04-15 08:42:30 -03:00
flow
e0ab8207ed
feat: Add dialog to filter mod options in mod download
2022-04-15 08:41:12 -03:00
Irgendwer01
ecad388846
Merge branch 'PolyMC:develop' into develop
2022-04-15 13:04:25 +02:00
Irgendwer01
9a120f43c8
Update MinecraftInstance.cpp
2022-04-15 13:03:48 +02:00
Sefa Eyeoglu
4ff1306e0c
Merge pull request #185 from Scrumplex/quilt
...
Quilt support
2022-04-15 11:38:50 +02:00
DioEgizio
1dd663af6e
CHANGE: switch the help pages to their own dir
...
also renames modrinth-platform/curseforge-platform to just Mod-platform since they have the pages are basically the same
2022-04-15 11:15:17 +02:00
Irgendwer01
06d9821b2c
Update MinecraftInstance.cpp
2022-04-15 01:51:28 +02:00
Irgendwer01
abb20c65e3
better FreeBSD support
2022-04-15 01:40:25 +02:00
Sefa Eyeoglu
9fb5674233
refactor: cleanup ModLoaderType
2022-04-14 21:55:03 +02:00
Sefa Eyeoglu
18ac109e5a
fix: support Quilt from Minecraft 1.14 onwards
2022-04-14 17:20:07 +02:00
Sefa Eyeoglu
14a0e85862
fix: remove unused code
2022-04-14 16:50:04 +02:00
Regular Baf
ea3ceb382a
Update launcher/resources/multimc/scalable/discord.svg
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-04-09 23:42:08 +00:00
Regular Baf
37a30fbc3f
Update discord.svg
2022-04-09 13:22:39 +00:00
Regular Baf
99193a2d7b
Update discord.svg
2022-04-09 13:16:55 +00:00
Regular Baf
abfb99ba3f
Nevermind. It does.
2022-04-09 13:16:03 +00:00
Regular Baf
fcb311eecd
size doesnt matter?
2022-04-09 13:11:33 +00:00
Regular Baf
54e4f88ada
Attempt implementing the new discord logo
2022-04-09 13:00:27 +00:00
Sefa Eyeoglu
89125fde22
refactor: switch Quilt mappings to hashed MojMap
2022-04-09 14:56:07 +02:00
Kenneth Chew
9f3eed6ca2
Fix typos causing build failures on non-macOS systems
...
It also did the exact opposite thing I was trying to do, so that's fixed too...
2022-04-08 17:00:42 -04:00
Kenneth Chew
ab82358dcb
Show and hide the menu bar with the 'alt' key
...
Only applicable for systems without a native menu bar (i.e. almost anything that is not macOS or Ubuntu Unity). On these systems, the menu bar appears on top of the window, which does not look good next to the tool bar already up there.
When the menu bar is hidden, the keyboard shortcuts set by the menu bar are disabled. They should always work, so this also adds a workaround for that.
2022-04-08 16:21:52 -04:00
Kenneth Chew
75fddd0052
Create menubar prototype
...
Some stuff still needs to be fixed:
- The close window option always closes the main window, even if it is not the currently active window (only applicable on systems with native menu bar)
- None of the (text) editing actions are enabled
- Actions related to instances should only be active when an instance is selected
- The open wiki option ("PolyMC Help") needs to be implemented
- Delete instance keyboard shortcut does not seem to work on my system. Test further
- It would be nice if the profiles menu had all of the logged in accounts, and if they could be selected from that menu (preferably with keyboard shortcuts, probably Ctrl + 1, Ctrl + 2, ...)
2022-04-08 15:39:30 -04:00
dada513
8a2c5f5b0d
Merge pull request #407 from DioEgizio/upstream-cherrypick
2022-04-08 16:18:28 +02:00
DioEgizio
66caac0bbc
Update launcher/JavaCommon.cpp
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-04-08 11:16:00 +02:00
DioEgizio
3024dbcf2c
Apply suggestion
...
Co-authored-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
2022-04-08 08:50:32 +02:00
flow
eeae3eca67
test: add new test to Task test
...
Also adds one more check to setStatus test
2022-04-07 19:42:26 -03:00
flow
d0cda6d605
test: add basic Task unit test
...
Only only two tests for now. We can iterate on this later :^)
This is to try to avoid breaking things again!
2022-04-07 19:08:01 -03:00
flow
167e32a69f
fix: allow aborting CF modpack importing
2022-04-07 18:56:34 -03:00
flow
be2512bb4b
fix: issue with status of non-sequencial tasks
2022-04-07 18:41:32 -03:00
Sefa Eyeoglu
35cfb41a9c
fix: check for Quilt as Fabric-compatible loader
2022-04-07 18:46:09 +02:00
Sefa Eyeoglu
74cdf5350d
fix: restrict quilt-mappings versions to MC version
2022-04-07 18:46:00 +02:00
Sefa Eyeoglu
9349232bd4
refactor: dynamically get best version for intermediary mappings
2022-04-07 18:46:00 +02:00
Vladislav Laetansky
1811302deb
NOISSUE save custom offline player name
2022-04-07 18:29:15 +02:00
Petr Mrázek
e6564aa69f
NOISSUE fix error string for Xbox authorization failures
2022-04-07 18:29:10 +02:00
Petr Mrázek
566a83b245
NOISSUE prevent -version being passed to the JRE
...
We want specific JREs, always, not something that is magically resolved.
This counteracts some really bad advice recently being spread on reddit.
2022-04-07 18:28:27 +02:00
Sefa Eyeoglu
9eb9ddc668
feat: initial Quilt support
2022-04-07 18:11:40 +02:00
Ezekiel Smith
cc5261051f
Merge pull request #364 from Scrumplex/fix-i18n2
...
Fix translatable strings 2
2022-04-07 23:20:54 +10:00
Sefa Eyeoglu
fa870bc026
Merge pull request #380 from flowln/task-progress
2022-04-06 10:52:38 +02:00
Sefa Eyeoglu
99d569ed0e
Merge pull request #384 from jamierocks/technic-improvements
2022-04-06 10:52:27 +02:00
Sefa Eyeoglu
a1a7b9c151
Merge pull request #397 from DioEgizio/manymc-detect-aarch64
2022-04-06 10:52:15 +02:00
Una
dc6340bf38
Allow components to specify Java agents and JVM arguments ( #175 )
2022-04-06 08:22:24 +02:00
dada513
8732bea99b
Merge pull request #395 from HarryPeach/develop
2022-04-05 18:01:00 +02:00
Sefa Eyeoglu
5fb096d7b9
Merge pull request #345 from Scrumplex/handle-incompatible-java
2022-04-04 21:01:49 +02:00
Victor
cf8680f1ab
fix: properly detect arm64
2022-04-04 16:41:23 +02:00
Harry Peach
bd8b61651a
Check for empty slug before setting pack url
2022-04-03 23:12:46 +01:00
Ezekiel Smith
d33d5b847d
Merge pull request #387 from Scrumplex/fix-world-size
...
fix: calculate world sizes individually
2022-04-03 20:45:23 +10:00
Jamie Mansfield
b6e722a048
BuildConfig: Make Technic API base URL and build constants
2022-04-02 13:53:44 +01:00
Jamie Mansfield
7f2615b2a5
Technic: Verify checksums for pack build mods
2022-04-02 13:53:44 +01:00
Jamie Mansfield
a232c2d509
Technic: Display available versions for Solder packs
2022-04-02 13:53:44 +01:00
Jamie Mansfield
c8205fda9f
Technic: Replace inline parsing code with API models
2022-04-02 13:53:44 +01:00
Jamie Mansfield
8df88e7fbb
Technic: Add API models for Solder packs
2022-04-02 13:53:44 +01:00
Jamie Mansfield
c8092269ba
Technic: Match CurseForge pack description format
2022-04-02 13:53:44 +01:00
Jamie Mansfield
9d88f07955
Technic: Include the modpack version in instance title
2022-04-02 13:53:43 +01:00
Jamie Mansfield
f267375ac2
Technic: Prevent potential HTML injection
2022-04-02 13:53:43 +01:00
Jamie Mansfield
d44fa416ca
Technic: Allow pack API urls to be used in search
...
This mimics the behaviour that the Technic launcher has, and their
website displays API URLs for.
The big benefit of this, is to be able to install private packs now :)
2022-04-02 13:53:43 +01:00
Sefa Eyeoglu
41d7b27d43
fix: calculate world sizes individually
2022-04-02 13:29:37 +02:00
Sefa Eyeoglu
333f7cc320
Merge pull request #373 from Scrumplex/feat-world-size
2022-04-02 00:59:15 +02:00
