kb1000
db03846358
Add support for importing Modrinth packs from files
2022-05-14 20:01:09 +02:00
Sefa Eyeoglu
c6b3eccbdf
refactor: rename Modrinth classes to ModrinthMod
2022-05-14 20:00:54 +02:00
flow
84b962f256
fix: Handle icons with a dot in their names
...
E.g. some FTB modpacks.
Also fixes an issue with the name viewing on the Icon Chooser dialog
when the name was too big.
2022-05-13 17:21:35 -03:00
Sefa Eyeoglu
8dd68580a6
Merge pull request #528 from flowln/guo_ext
2022-05-13 18:17:40 +02:00
flow
dd2b324d8f
chore: add license header to remaining files
...
Also remove some unused imports
2022-05-12 18:11:55 -03:00
flow
0bce08d30f
chore: add polymc license headers to launcher/net files
2022-05-12 18:11:55 -03:00
flow
57d65177c8
fix: abort and fail logic in tasks
...
Also sets up correctly the status connections
2022-05-12 18:11:55 -03:00
flow
040ee919e5
refactor: more net cleanup
...
This runs clang-tidy on some other files in launcher/net/.
This also makes use of some JSON wrappers in HttpMetaCache, instead of
using the Qt stuff directly.
Lastly, this removes useless null checks (crashes don't occur because of
this, but because of concurrent usage / free of the QByteArray pointer),
and fix a fixme in Download.h
2022-05-12 18:11:55 -03:00
flow
efa3fbff39
refactor: remove some superfluous signals
...
Since now we're inheriting from Task, some signals can be reused.
2022-05-12 18:11:55 -03:00
flow
8c8eabf7ac
refactor: organize a little more the code in launcher/net/
...
This also reduces some code duplication by using some Task logic in
NetAction.
2022-05-12 18:11:49 -03:00
Kenneth Chew
3aea639fe4
Add UI for miscellaneous instance setting overrides
2022-05-12 17:11:06 -04:00
Kenneth Chew
046f1e6e58
Add instance overrides for miscellaneous settings
2022-05-12 17:08:06 -04:00
Kenneth Chew
527fa7ba9c
Hide temporary directory in instances folder
2022-05-09 18:34:47 -04:00
Kenneth Chew
288e7bc9c5
Make profile menu scrollable
2022-05-09 15:37:56 -04:00
timoreo22
649b8ac7c6
Merge pull request #537 from PolyMC/stable
...
Merge stable into develop
2022-05-09 18:06:56 +02:00
DioEgizio
96b2758169
fix websiteurl in curseforge modpacks
2022-05-09 17:42:17 +02:00
Kenneth Chew
40e0252d7d
Show "executable" screenshots in the screenshot manager
...
Since the readable/writable filter was removed to do this, extra code was added to enable/disable certain buttons based on whether the screenshot is readable or writable.
2022-05-09 00:54:47 -04:00
Kenneth Chew
5171d99fe5
Retranslate playtime text immediately when language is changed
2022-05-08 23:42:37 -04:00
Kenneth Chew
ea9d61c21c
Retranslate account actions after switching language
2022-05-08 23:19:23 -04:00
Sefa Eyeoglu
1e34de98ab
Merge pull request #534 from DioEgizio/stable
2022-05-08 21:43:06 +02:00
timoreo22
cab40026f2
Merge pull request #475 from Scrumplex/fix-hide-all-tokens
...
Hide all tokens for non-Debug builds for log and logfiles
2022-05-08 16:56:26 +02:00
Sefa Eyeoglu
ac66bddeda
Merge pull request #482 from TheCodex6824/mojang-auth-fix
2022-05-08 16:52:31 +02:00
Sefa Eyeoglu
c4549a5375
Update launcher/modplatform/flame/FlameModIndex.cpp
...
Co-authored-by: flow <thiagodonato300@gmail.com>
2022-05-08 16:25:51 +02:00
Sefa Eyeoglu
e9b3140d12
Update launcher/modplatform/flame/FlameModIndex.cpp
2022-05-08 16:25:45 +02:00
Ozynt
bdd2d57808
This makes more sense
2022-05-08 11:19:53 +02:00
Ryan Cao
22f5128e39
adopt changes from #497 remapped
2022-05-08 15:22:50 +08:00
flow
29a53d7e95
fix: always have the instance toolbar be vertical
...
This overrides the orientation set automatically by Qt when we start
moving the toolbar around.
2022-05-07 20:44:44 -03:00
flow
2fbb7be23b
fix: filter based on MIME type instead of plaintext suffix
...
Suffixes are unreliable in different locales, while MIME types are more
standarized.
2022-05-07 20:16:55 -03:00
dada513
0556ae4749
Merge pull request #503 from txtsd/mnemonics_fix
...
Fix mnemonics that didn't parse
2022-05-02 11:19:30 +02:00
timoreo22
546d394868
Merge pull request #475 from Scrumplex/fix-hide-all-tokens
...
Hide all tokens for non-Debug builds for log and logfiles
2022-05-02 10:45:58 +02:00
dada513
8110040f86
Merge pull request #511 from dada513/hide_java_wizard
...
add hide java wizard toggle
2022-05-01 08:48:37 +02:00
dada513
5662d41062
Update launcher/ui/pages/global/JavaPage.ui
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-04-30 16:20:05 +02:00
dada513
1e03ef484d
Update launcher/ui/pages/global/JavaPage.ui
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-04-30 16:14:48 +02:00
Sefa Eyeoglu
1d95f10090
Merge pull request #489 from kthchew/fix/old-mac-cleanup
2022-04-30 15:54:10 +02:00
dada513
dac801c8ac
add hide java wizard toggle
2022-04-30 15:19:57 +02:00
txtsd
b931dc0f93
fix(mnemonics): Add missing buddies to labels
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-04-29 01:30:47 +05:30
Ryan Cao
0507b56bed
feat: add PolyMC icon as instance icon
2022-04-27 20:30:50 +08:00
Kenneth Chew
ac405aa564
Remove old macOS data migration code
2022-04-25 19:57:47 -04:00
Sefa Eyeoglu
aad7c63282
Merge pull request #482 from TheCodex6824/mojang-auth-fix
2022-04-25 21:55:00 +02:00
TheCodex6824
1ff459d995
Use suggested error handling
2022-04-25 14:08:27 -04:00
Sefa Eyeoglu
52454ca77b
Merge pull request #480 from dschemp/develop
2022-04-25 14:26:10 +02:00
TheCodex6824
a0bafa4952
Re-add base64 decode option for Qt versions that support it
2022-04-23 11:11:55 -04:00
TheCodex6824
e56f0db11b
Remove base64 decode option that was added in Qt 5.15
2022-04-23 10:32:52 -04:00
TheCodex6824
8bcbe07c87
Fix Mojang auth failing due to Mojang rejecting requests to the profile endpoint
2022-04-22 23:39:38 -04:00
Jamie Mansfield
ba9059c7c8
ATLauncher: Replace usage of QPushButton::pressed with ::clicked
2022-04-22 20:37:55 +01:00
Jamie Mansfield
45783c1661
ATLauncher: Support using share codes
2022-04-22 20:37:55 +01:00
Daniel Schemp
71777e7a6f
added and fixed some Mnemonics in MainWindow
2022-04-22 00:31:03 +02:00
Daniel Schemp
c86ec0bd36
added: Mnemonics for Settings/APIs
2022-04-22 00:23:36 +02:00
Daniel Schemp
08b1b2669a
added: Mnemonics for Settings/Accounts
2022-04-22 00:22:50 +02:00
Daniel Schemp
94a655b055
added: Mnemonics for Settings/External Tools
2022-04-22 00:20:54 +02:00
Daniel Schemp
717067e9eb
added: Mnemonics for Settings/Proxy
2022-04-22 00:19:54 +02:00
Daniel Schemp
5a5797d914
added: Mnemonics for Settings/Custom Commands
2022-04-22 00:18:39 +02:00
Daniel Schemp
75826aca13
added: Mnemonics for Settings/Java
2022-04-22 00:16:11 +02:00
Daniel Schemp
f52b7c030f
added: Mnemonics for Settings/Minecraft+
2022-04-22 00:14:24 +02:00
Daniel Schemp
c1386bcb04
added: Mnemonics for Settings/Launcher
2022-04-22 00:12:20 +02:00
Sefa Eyeoglu
b3e1691c01
fix: hide LauncherLoginStep tokens for non-Debug builds
2022-04-20 18:33:33 +02:00
Sefa Eyeoglu
db6dae7541
fix: disable major version match for snapshots
2022-04-20 09:56:53 +02:00
dada513
4e97f2a6fe
Merge pull request #470 from kthchew/fix/ml-selector-crash
...
Fix crash if no Minecraft version is selected in the new instance screen
2022-04-20 09:08:48 +02:00
dada513
3c3ce71214
Merge pull request #467 from PolyMC/revert-429-develop
...
Revert "better FreeBSD support"
2022-04-20 08:17:19 +02:00
Kenneth Chew
0682fe544a
Fix crash if no Minecraft version is selected in the new instance screen
2022-04-19 22:20:00 -04:00
Ezekiel Smith
27e803e4a4
Merge pull request #463 from txtsd/enter_shenanigans
...
Only trigger macOS instance rename on KeyDown
2022-04-20 08:34:30 +10:00
Ezekiel Smith
405c44c9e1
Merge pull request #462 from Scrumplex/fix-world-size-sort
...
fix: use size in bytes to sort by world size
2022-04-20 08:32:38 +10:00
Sefa Eyeoglu
4c5f701b05
Revert "better FreeBSD support"
2022-04-19 21:49:54 +02:00
Sefa Eyeoglu
3ff3c335bc
Merge pull request #452 from Scrumplex/fix-download-mods-crash
2022-04-19 21:47:05 +02:00
dada513
b9d5e1bbf1
Merge pull request #451 from Scrumplex/fix-modloader-selection
2022-04-19 21:01:43 +02:00
Sefa Eyeoglu
027c666265
Merge pull request #450 from Scrumplex/fix-quilt-mod-dl
2022-04-19 20:36:37 +02:00
txtsd
ec2ac2e80c
fix: Only trigger rename on KeyPress
...
This is macOS specific
2022-04-19 18:43:51 +05:30
Sefa Eyeoglu
27c72935f8
fix: use size in bytes to sort by world size
2022-04-19 15:07:14 +02:00
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
Sefa Eyeoglu
9180c751d8
fix(launch/VerifyJava): reword log output
2022-04-02 00:54:48 +02:00
Sefa Eyeoglu
e8697068fb
fix: codestyle
2022-04-01 15:00:05 +02:00
Ezekiel Smith
269c1bbf58
Merge pull request #370 from embeddedt/develop
...
Make launcher icon grayscale for pe_light theme
2022-04-01 22:58:54 +10:00
flow
9b8493c304
feat: Use a single progress dialog when doing multiple tasks
...
This puts all mod downloading tasks inside a SequentialTask, which is,
for more than one task, a multi step task. This is handled by the
ProgressDialog by showing both the global progress of tasks executed,
and the individual progress of each of them.
2022-04-01 09:32:00 -03:00
Sefa Eyeoglu
c389a711ed
fix: remove redundant include
2022-04-01 13:14:04 +02:00
Ezekiel Smith
382548e0a7
Merge pull request #355 from dada513/flatpak_properly
...
Fix flatpak properly
2022-04-01 21:03:14 +10:00
dada513
48a6380e31
Fix modrinth usable URL in mod downloader
2022-03-31 20:39:10 +02:00
Sefa Eyeoglu
64ca96f470
feat: track and display world size
2022-03-31 18:45:17 +02:00
dada513
59b3e30821
Scrumplex moment
2022-03-31 16:11:04 +02:00
embeddedt
92e5e0e95b
Make launcher icon grayscale for pe_light theme
2022-03-30 10:51:37 -04:00
Sefa Eyeoglu
9202996c62
fix(i18n): remove brand names from translations
2022-03-29 15:25:21 +02:00
Sefa Eyeoglu
e22d54abd3
Merge pull request #344 from oynqr/build/allow-disabling-tests
2022-03-29 14:42:49 +02:00
dada513
b53ba12fa2
Merge pull request #360 from FayneAldan/patch-2
2022-03-29 14:34:14 +02:00
Sefa Eyeoglu
306df9e17f
Merge pull request #352 from Scrumplex/fix-name
...
Update Credits and Branding
2022-03-29 11:24:48 +02:00
Sefa Eyeoglu
5f2e768376
Merge pull request #356 from flowln/version_optimize
...
Improve mod versions request to Modrinth
2022-03-29 11:24:12 +02:00
Fayne Aldan
4d8bf0b621
Convert \s in Windows POLYMC_JAVA_PATHS
...
Allows you to use either `\` or `/` on Windows
2022-03-28 15:55:54 -06:00
dada513
341eb16a4c
Merge branch 'develop' of https://github.com/PolyMC/PolyMC into flatpak_properly
2022-03-28 20:55:06 +02:00
dada513
3a7eeff135
Fix
2022-03-28 20:55:03 +02:00
Fayne Aldan
659f93b1de
Fix POLYMC_JAVA_PATHS env not working on Windows
2022-03-27 17:21:34 -06:00
Sefa Eyeoglu
ea60e48d9d
chore: add license header
...
chore: add license header
2022-03-27 20:59:56 +02:00
Sefa Eyeoglu
6054abaffb
fix(credits): wrap UTF-8 text with QString
2022-03-27 20:59:56 +02:00
Sefa Eyeoglu
3a1feed723
fix: update credits
2022-03-27 20:59:56 +02:00
Sefa Eyeoglu
85f3fc9944
fix: remove "PolyMC" from strings
2022-03-27 20:59:51 +02:00
Sefa Eyeoglu
87cf38a377
Merge pull request #341 from dada513/develop
2022-03-27 20:56:04 +02:00
dada513
424f4a72ff
Inform user about possible issues when using a Portal as instance folder
2022-03-27 16:08:11 +02:00
dada513
ec6409914d
newline more like waste
2022-03-27 14:51:48 +02:00
dada513
6a25cacc3e
Merge branch 'develop' of https://github.com/PolyMC/PolyMC into develop
2022-03-27 14:51:02 +02:00
dada513
b1af689546
Add quit launcher after game stops option (Steam Deck)
...
lecense
2022-03-27 14:50:47 +02:00
dada513
0a5dfeb3d7
fix newline (scrumplex nitpick not allowed)
2022-03-27 14:44:40 +02:00
dada513
6a180f495f
more flatpak fixes
2022-03-27 14:42:02 +02:00
dada513
3672dbc5af
Fix flatpak properly
2022-03-27 12:43:49 +02:00
flow
d00c320c00
optimize: Improve mod versions request to Modrinth
...
This uses more arguments in the GET request for mod versions on the
Modrinth API, filtering what versions can be returned, decreasing load
on Modrinth servers and improving a little the time it takes for the versions to be
available to the user.
This also removes the now unneeded check on correct modloaders in
ModrinthPackIndex, since it is now filtered by the Modrinth server.
Lastly, this adds a couple of helper functions in ModModel.
2022-03-24 19:31:11 -03:00
flow
e13ca94061
chore: resolve conflicts and merge upstream
2022-03-24 18:24:51 -03:00
Sefa Eyeoglu
e02369ba6b
chore: add license header
2022-03-24 16:10:43 +01:00
Sefa Eyeoglu
82c35f2746
feat: block launch if Java is incompatible
...
Keep track of compatible Java versions from meta. Launch-step
VerifyJavaInstall will check if current instance's Java version is
compatible.
Also add override option both globally and per-instance in-case the user
doesn't care about the requirement.
2022-03-24 16:10:39 +01:00
Philipp David
a89cbf116d
Allow disabling building of tests
2022-03-23 19:48:03 +01:00
flow
f3a244e90a
fix: fix skipping one on file counting in mod version parse
2022-03-22 19:45:31 -03:00
Sefa Eyeoglu
64399dd8d6
Merge pull request #322 from oynqr/build/static-rainbow
...
Build with static rainbow
2022-03-21 16:58:37 +01:00
Sefa Eyeoglu
062fc79286
Merge pull request #298 from Scrumplex/fix-i18n
...
Fix translatable strings
2022-03-21 14:21:06 +01:00
Ezekiel Smith
2da565f5d4
Merge pull request #323 from Scrumplex/retranslate-pages
...
Retranslate all settings pages
2022-03-22 00:06:16 +11:00
Philipp David
e8373bbf65
Build with static rainbow
2022-03-21 12:47:42 +01:00
Philipp David
26acc836d9
Revert "fix: use our own prefix for rainbow lib"
...
This reverts commit 61db1c46be
.
2022-03-21 09:40:20 +01:00
Ezekiel Smith
9c22af9685
Merge pull request #315 from txtsd/display_scaling
...
Allow fractional DPI scaling
2022-03-21 11:21:21 +11:00
Sefa Eyeoglu
75d0078a38
fix: retranslate CustomCommands
2022-03-20 21:51:36 +01:00
Sefa Eyeoglu
536b1a23fc
fix: retranslate mod download pages
2022-03-20 21:51:23 +01:00
Sefa Eyeoglu
cafff5e504
chore: add license header
2022-03-20 21:40:49 +01:00
Jamie Mansfield
dd5c4b6864
App: Retranslate all pages when the language is changed
2022-03-20 20:48:12 +01:00
Jamie Mansfield
a2c85a8531
App: Retranslate page header titles
...
This fixes a bug that is only practically effects the title of the
language page not updating the header when changing the language.
2022-03-20 20:02:21 +01:00
txtsd
de4d757650
Merge pull request #311 from DioEgizio/patch-2
...
fix webp
2022-03-20 22:20:02 +05:30
Sefa Eyeoglu
702a1da0ac
fix: disable "Install Forge" button when needed
2022-03-20 15:35:35 +01:00
Sefa Eyeoglu
768007d980
fix: disable "Download mods" button when needed
...
Fixes #271
2022-03-20 15:34:13 +01:00
txtsd
2e40ab6244
(fix): Allow fractional DPI scaling
2022-03-20 20:02:24 +05:30
Ezekiel Smith
8bc6cdf55c
Merge pull request #306 from Scrumplex/limit-instance-lengths
...
Limit instance names to 128 chars
2022-03-21 01:04:40 +11:00
DioEgizio
6c0b101fed
Merge branch 'PolyMC:develop' into patch-2
2022-03-20 15:02:04 +01:00
Sefa Eyeoglu
c8fec556c0
Merge pull request #305 from flowln/gui_changes
2022-03-20 13:39:12 +01:00
DioEgizio
b7f2959353
fix
2022-03-20 13:15:56 +01:00
Sefa Eyeoglu
4899d3c458
Merge pull request #200 from Scrumplex/scrumplex-license-header
2022-03-20 12:04:39 +01:00
Sefa Eyeoglu
c311dba465
fix: limit instance names to 128 chars
2022-03-19 23:23:08 +01:00
flow
75ec4256e2
feat(ui): allow users to move toolbars to different places
2022-03-19 17:59:00 -03:00
DioEgizio
bb5a91c179
Update CMakeLists.txt
2022-03-19 19:01:51 +01:00
Sefa Eyeoglu
8225f1ac92
Merge pull request #292 from lack/offline_username_limits
...
Limit offline username to 16 characters with override
2022-03-19 16:02:28 +01:00
Jim Ramsay
90780818ca
Limit offline username to 16 characters with override
...
Offline usernames longer than 16 characters won't be able to connect to
LAN games or offline-mode servers, so just don't let it happen.
Add a checkbox to allow people to unrestrict usernames if they want.
Signed-off-by: Jim Ramsay <i.am@jimramsay.com>
2022-03-19 10:12:07 -04:00
Sefa Eyeoglu
a160bd0062
chore: add license header to files I modified
2022-03-19 12:46:56 +01:00
Sefa Eyeoglu
7e0312493b
fix(i18n): improve social platform actions
2022-03-19 12:36:04 +01:00
Sefa Eyeoglu
ccfd06ad21
fix(i18n): remove brand names from translations
2022-03-19 12:35:15 +01:00
Sefa Eyeoglu
48c2146a42
fix(i18n): fix translatable strings
2022-03-19 12:29:46 +01:00
Ezekiel Smith
abb9fa8cbd
Merge pull request #296 from flowln/right_file
...
Use primary file for mod downloading on Modrinth
2022-03-19 11:41:36 +11:00
flow
ec66c8fd3d
fix(ui): remove paste.polymc.org
2022-03-18 14:21:42 -03:00
flow
fa5fa53592
fix: Use primary file for mod download on Modrinth
2022-03-18 10:52:47 -03:00
flow
da43ed8ce1
fix silly mistakes and merge upstream
2022-03-18 07:54:47 -03:00
Sefa Eyeoglu
aedb513c9e
Merge pull request #265 from Scrumplex/fix-javacheck-appimage
...
Define JARs path relative to application root
2022-03-14 23:31:38 +01:00
flow
8409aa2571
tidy: Fix clang-tidy issues on files changed in this PR
...
The checks used are roughly the same as the ones proposed in the
clang-tidy PR (except perhaps that I used modernize-* instead of listing
them individually,though I don't think this caused any readability
detriments).
In ModrinthModel.cpp and FlameModModel.cpp I ignored the
modernize-avoid-c-arrays one, mostly because making the sorts array an
std::array would most likely increase the code complexity because of the
virtual function. Aside from that, the static_cast warning from
Application.h was not dealt with, since it's not in this PR's scope.
2022-03-14 17:43:36 -03:00
Ezekiel Smith
5b8003cbe5
Merge pull request #188 from PolyMC/removal/notifications
...
remove notifications
2022-03-15 00:51:28 +11:00
flow
f1e44291cc
add translation string
2022-03-13 13:11:35 -03:00
flow
b3b613d8b4
feat(ui): make a better "Mod download confirmation dialog"
2022-03-13 11:50:18 -03:00
Sefa Eyeoglu
bb2b344d33
fix: define jars path relative to application root
...
Fixes #117
2022-03-13 12:48:24 +01:00
flow
a3d7ad731d
fix missing translation strings
...
my mistake, sorry! ToT
2022-03-11 18:43:17 -03:00
Ezekiel Smith
07e4c4d189
Merge pull request #242 from deadmeu/develop
...
Fix missing space in "No Accounts" message
2022-03-11 14:53:05 +11:00
dada513
d814e21f0d
add matrix button
2022-03-08 18:41:23 +01:00
deadmeu
49d122a2c4
Fix missing space in "No Accounts" message
2022-03-08 23:24:11 +10:00
flow
b3c2a56ece
fix: delete semicolons at the end of .cpp file's functions
...
my lsp is weird sometimes
2022-03-07 19:55:20 -03:00
flow
9c57b54a81
refactor: move things around so that related things are close together
...
This also adds some comments around ModModel.cpp and ModPage.cpp to add
some ease of reading the code.
Also move some things from headers to cpp files.
2022-03-07 19:32:28 -03:00
flow
b131d3b2ec
refactor: move more common code to base class
...
Also removes unused imports and organize the ModModel header
2022-03-07 18:28:24 -03:00
flow
16bfafa29e
refactor: de-duplicate common code in network mod APIs
2022-03-07 17:45:28 -03:00
flow
f714adf6d2
refactor: move NetJob away from ModModel to ModAPI
...
This is done so that 1. ModAPI behaves more like an actual API instead
of just a helper, and 2. Allows for more easily creating other mod
providers that may or may not use network tasks (foreshadowing lol)
2022-03-07 16:22:57 -03:00
Ezekiel Smith
dc9e250868
Merge pull request #232 from Scrumplex/fix-help-links
...
Switch to polymc.org wiki
2022-03-08 01:22:34 +11:00
Ezekiel Smith
b6cf0359fa
Merge pull request #230 from Scrumplex/fix-iconthemes
...
Reorganize icon themes
2022-03-08 01:20:35 +11:00
flow
39bd04f06f
refactor: use Enum instead of raw int for ModLoaderType
2022-03-06 16:45:39 -03:00
flow
d755174bee
clarify some method names and comments
2022-03-06 16:04:24 -03:00
flow
1229e90817
merge upstream
2022-03-06 15:28:18 -03:00
flow
5a638fa977
refactor: move "get versions" task from page to model
...
This seems more reasonable
2022-03-06 15:23:00 -03:00
flow
5e9d49a910
refactor: use only a single unique_ptr for the api
2022-03-06 13:54:55 -03:00
Sefa Eyeoglu
6545d250e8
refactor: move help URL into buildconfig
2022-03-06 11:31:50 +01:00
Sefa Eyeoglu
b162351ff4
fix: switch to polymc.org wiki
2022-03-05 21:49:13 +01:00
Sefa Eyeoglu
3697d70b48
fix: reorganize icon themes
...
Rename MultiMC to Legacy
Simple (Colored) is now the first icon theme
Custom is now the last icon theme, which also fixes a loading issue when
Legacy was selected
Fix loading of Legacy theme
2022-03-05 20:29:54 +01:00
flow
e0c025b162
fix extra spacing in resource packs and shader packs, and move button up
...
hopefully now its finally ok
2022-03-03 09:51:46 -03:00
flow
9e443faba3
hack: hide 'Download Mods' button when not in the mods tab
2022-03-03 04:02:22 -03:00
flow
f95cebaf06
change 'Install Mods' -> 'Download Mods' and change position
2022-03-03 01:10:10 -03:00
flow
9a8599e4ba
fix windows compilation
2022-03-03 00:06:37 -03:00
flow
2d68308d49
refactor: move url creation for mods to modplatform/
...
Moves all things related to creating the URLs of the mod platforms
that go to network tasks to a single place, so that:
1. Maintaining and fixing eventual issues is more straightforward.
2. Makes it possible to factor out more common code between the
different modplatform pages
2022-03-02 23:13:04 -03:00
flow
0dd1c26cf3
refactor: extract common code in mod pages and model
...
This creates a hierarchy in which ModPage and ModModel are the parents
of every mod provider, providing the basic functionality common to all
of them.
It also imposes a unique .ui file (they were already equal before, just
duplicated basically) on all mod providers.
2022-03-02 21:52:44 -03:00
flow
881b2f2b38
refactor: Use a single indexed pack for mods
...
Since there's little difference between them, let's remove duplication
and merge them.
2022-03-02 18:49:19 -03:00
timoreo22
8bdd2befe9
Merge pull request #205 from timoreo22/fix-version-select
...
Fixed wrong version info
2022-03-01 16:56:10 +01:00
Ezekiel Smith
e1f28be151
Merge pull request #163 from txtsd/windows_data_dir
...
Replace build layouts with Launcher_PORTABLE cmake flag
2022-03-02 00:03:31 +11:00
flow
4e8f075ff3
fix: Do not loop when its not a fabric mod on Flame version validation
...
Since there's no validation for forge mods since the start, we were just
looping with no porpuse in this situation.
2022-02-27 22:02:43 -03:00
flow
075d900d45
fix: Always tell Flame API which modloader we are using
...
Fixes #206 partially. Although we don't list mods that have no
compatibility with the mod loader we are using, mods that have support
for both loaders still show up, and the versions for both the loaders
are still shown.
Also simplifies a little the logic in
FlameModIndex::loadIndexedPackVersions
2022-02-27 16:07:45 -03:00
txtsd
5d1ca33b84
Apply suggestions from code review
...
Co-authored-by: LennyMcLennington <lenny@sneed.church>
2022-02-27 08:35:47 -08:00
timoreo
ccc493cb2b
Cleanly free NetJob in flame modpack
2022-02-27 13:14:12 +01:00
timoreo
2745325ae0
Fixed wrong version info
2022-02-27 11:55:24 +01:00
Sefa Eyeoglu
88fc1e32ee
Merge pull request #201 from Scrumplex/fix-instancetype-reregistration
2022-02-26 14:37:27 +01:00
Sefa Eyeoglu
c9bf7f9896
fix: load instances no matter their instance type
2022-02-26 00:31:37 +01:00
flow
c4f4e9e620
merge upstream and resolve conflicts
2022-02-25 13:43:27 -03:00
Ezekiel Smith
f2b850ad20
Merge pull request #183 from timoreo22/fix-versions-segfault
...
Fixed segfault in mod download
2022-02-26 01:55:11 +11:00
Ezekiel Smith
ccc27d1b7c
Merge pull request #192 from Scrumplex/refactor-remove-legacy-instances
...
Drop legacy instances
2022-02-26 01:54:15 +11:00
flow
40a9828fba
fix: improve readability and set ok button as disabled by default
2022-02-23 19:17:33 -03:00
flow
04840d0638
fix(ui): add translation func to text in the confirm dialog
2022-02-23 14:44:55 -03:00
flow
38f12c50f7
Merge branch 'PolyMC:develop' into develop
2022-02-23 14:34:51 -03:00
Sefa Eyeoglu
ca8b62291f
fix: use legacy data path if it exists
2022-02-23 16:22:53 +05:30
txtsd
69d01204e0
Implement PR suggestions
2022-02-23 16:22:53 +05:30
txtsd
1e3b896fda
Replace layouts with LAUNCH_PORTABLE
2022-02-23 16:22:23 +05:30
Sefa Eyeoglu
e2c2a38005
Merge pull request #186 from theglitch76-forks/develop
...
Enable WSL support
2022-02-22 08:23:57 +01:00
flow
f8b0d6453a
fix: sort mod list in confirmation dialog
2022-02-21 23:25:33 -03:00
flow
0102e91940
feat: add confirm dialog for installing mods
...
When selecting multiple mods at once, it can become hard to keep track
of which ones you selected.
To address this, a dialog is now displayed
when you finish selecting the mods to download, showing you which ones
you selected and their filenames. From there, you can either accept it
and download the mods, or you can cancel it and go back to the mod
selection dialog.
2022-02-21 23:09:14 -03:00
flow
1004211a66
fix(ui): change text in selection button when there's no valid version
2022-02-21 22:52:50 -03:00
flow
f5cf4eb45f
feat(ui): allow downloading multiple mods from CurseForge at once
2022-02-21 21:53:21 -03:00
flow
512395e3f1
feat(ui): allow downloading multiple mods in Modrinth at once
2022-02-21 21:34:53 -03:00
flow
9c6727e27f
feat: change task container in ModDownloadDialog to a QHash
...
Previously, we used a unique_ptr to a ModDownloadTask to keep track of
the selected mod to download when we accepted the dialog.
In order to allow multiple mods to be selected at once for download,
this has been changed to a QHash where the key is the mods name (since
it doesn't seem right to allow for multiple versions of the same mod to
be downloaded at once), and the value is a pointer to the corresponding
ModDownloadTask.
2022-02-21 21:34:06 -03:00
Sefa Eyeoglu
624ab25cd4
refactor: set default InstanceType to OneSix
2022-02-21 22:59:07 +01:00
Sefa Eyeoglu
a70d1f1a91
refactor: drop LegacyInstance
2022-02-21 22:30:44 +01:00
Sefa Eyeoglu
3059f13011
refactor: drop migration for pre-component instances
2022-02-21 22:11:10 +01:00
swirl
6d1f9d4d02
fix
2022-02-21 12:44:34 -05:00
swirl
da70122d9c
remove notifications
2022-02-20 19:23:08 -05:00
Glitch
8556ff5eac
Revert ba6a97557a
...
Let evil win.
2022-02-20 15:00:23 -06:00
timoreo
adacab3349
Fixed segfault when closing window while version info download is still going
2022-02-19 15:17:45 +01:00
Sefa Eyeoglu
80a29af497
fix: typo for account disabled error messages
2022-02-18 19:18:29 +01:00
Sefa Eyeoglu
c5d9944993
feat(accounts): interrupt MSAStep when client ID doesn't match
2022-02-18 12:32:24 +01:00
Sefa Eyeoglu
14717396eb
feat(accounts): save client id in MSAStep
2022-02-18 12:32:24 +01:00
Sefa Eyeoglu
9c71f364d2
feat(accounts): add disabled account state
2022-02-18 12:32:24 +01:00
Sefa Eyeoglu
be910374dc
feat(accounts): support msa-client-id value
2022-02-18 12:32:24 +01:00
LennyMcLennington
12c8a04458
Merge pull request #173 from Scrumplex/fix-application-cpp
...
fix: improve code readability in Application.cpp
2022-02-17 23:43:59 +00:00
swirl
7b4b997a34
Merge remote-tracking branch 'upstream/develop' into develop
2022-02-17 15:47:43 -05:00
Sefa Eyeoglu
6b4469c6cc
fix: combine errors if --launch is missing
2022-02-17 15:29:09 +01:00
Sefa Eyeoglu
037b0d7190
fix: improve code readability in Application.cpp
2022-02-16 17:33:28 +01:00
Lenny McLennington
929a035f96
Revert "make wsl work"
...
This reverts commit 5779f20fa1
.
2022-02-13 18:47:54 +00:00
swirl
5779f20fa1
make wsl work
2022-02-13 13:35:15 -05:00
Sefa Eyeoglu
a309f4e721
fix: MSA = Microsoft Authentication
2022-02-12 21:27:35 +01:00
Sefa Eyeoglu
159d868b77
fix(ui): explain why 'Add Microsoft' might be disabled
2022-02-12 21:27:35 +01:00
Sefa Eyeoglu
0854e83ce4
feat: implement MSA client id override
...
Closes #11
2022-02-12 21:27:32 +01:00
Sefa Eyeoglu
bb02226870
feat(ui): add custom MSA client id setting
2022-02-12 21:05:42 +01:00
Sefa Eyeoglu
70a055bc27
Merge pull request #143 from Scrumplex/refactor-link-nbtpp-static
2022-02-12 17:47:38 +01:00
Sefa Eyeoglu
61db1c46be
fix: use our own prefix for rainbow lib
2022-02-12 17:02:54 +01:00
LennyMcLennington
7d912726d0
Merge pull request #134 from glowiak/patch-2
...
OpenBSD support and slackware build instructions
2022-02-12 03:30:24 +00:00
swirl
3cf81faabc
change "loader mods" to "mods"
...
Closes : #128
2022-02-11 22:09:47 -05:00
LennyMcLennington
bcfa3246cb
Merge pull request #146 from dada513/macos_application_support
...
[MACOS] Move app data to Application Support
2022-02-11 13:52:56 +00:00
Sefa Eyeoglu
f67871e79e
refactor(build): link nbt++ statically
2022-02-11 14:24:01 +01:00
LennyMcLennington
2341212337
Merge pull request #150 from dada513/fix_kwin_icon
...
Fix freedesktop icons. Again
2022-02-11 12:05:01 +00:00
LennyMcLennington
53ea261350
Merge pull request #151 from dada513/rss_not_begone
...
Re-add RSS feed with the new PolyMC website
2022-02-11 12:03:29 +00:00
LennyMcLennington
a17e5d0a4d
Merge pull request #129 from timoreo22/fix-mod-name
...
Fixed the download menu putting the wrong name
2022-02-10 23:41:27 +00:00
Sefa Eyeoglu
8d2e7db178
fix: update link to translations platform
2022-02-10 14:55:52 +01:00
dada513
13d41bde7f
remove unused parsing of dates (bloat)
2022-02-10 13:57:18 +01:00
dada513
d42d6fe25a
fix rss format
2022-02-10 13:57:06 +01:00
dada513
beaac54dc9
Merge remote-tracking branch 'polymc/develop' into rss_not_begone
2022-02-10 13:14:30 +01:00
dada513
70f8cb81b8
Initial RSS re-add and removed hardcoded strings
2022-02-10 13:14:25 +01:00
dada513
f8ca6b4867
Revert "refactor: remove news feed"
...
This reverts commit 361ce7818e
.
2022-02-10 12:55:07 +01:00
Lenny McLennington
35d2ae3ef7
Remove drama from readme and remove mmc discord link
2022-02-10 11:21:25 +00:00
dada513
619fcbfabf
rename LAUNCHER_DESKTOPNAME to LAUNCHER_DESKTOPFILENAME
2022-02-10 08:56:34 +01:00
dada513
292869141f
Merge remote-tracking branch 'polymc/develop' into fix_kwin_icon
2022-02-10 08:05:17 +01:00
dada513
ca9929214d
Merge remote-tracking branch 'polymc/develop' into macos_application_support
2022-02-10 08:04:59 +01:00
dada513
d72c511131
Revert "Fix freedesktop icons" and fix icon on kwin
2022-02-10 07:46:41 +01:00
Victor
d2f86cbf32
Move app data to Application Support
2022-02-09 12:23:18 +01:00
Lenny McLennington
5284d604ef
translations
2022-02-09 00:02:51 +00:00
glowiak
dba9199e58
Support OpenBSD in UpdateController.cpp
2022-02-06 09:35:48 +01:00
glowiak
e806903d7e
Support OpenBSD without patches
2022-02-06 09:32:55 +01:00
timoreo
86935068f5
Fix wrong mod file name
2022-02-04 16:24:19 +01:00
swirl
076efc4cb2
Merge branch 'update-quazip' of git://github.com/Scrumplex/PolyMC into develop
2022-02-03 14:14:12 -05:00
swirl
2177aa2a6b
Merge branch 'offline-mode-accounts' of git://github.com/NyaomiDEV/PolyMC into feature/offline_mode
2022-02-03 13:54:27 -05:00
swirl
e2952061af
Merge branch 'feature/download_mods' of git://github.com/timoreo22/PolyMC into feature/download_mods
2022-02-03 13:45:20 -05:00
swirl
f5358aa1ca
Merge branch 'develop' into feature/close_after_launch
2022-02-03 13:43:44 -05:00
swirl
3d3f9a8609
make closeAfterLaunch good
2022-02-03 12:50:24 -05:00
Petr Mrázek
3ca661127f
NOISSUE Add missing tooltip for Export Instance
action
2022-02-03 18:09:51 +01:00
swirl
407f9d9ef0
Merge remote-tracking branch 'upstream/develop' into develop
2022-02-02 11:17:04 -05:00
swirl
bff683e6d4
Merge pull request #108 from redstrate/improve_about_page
...
Improve the About page
2022-02-02 09:17:30 -05:00
timoreo22
11841c47e6
Double braindead combo
2022-02-01 22:23:34 +01:00
timoreo
71b1ac9f34
Fix braindead moments
2022-02-01 21:56:52 +01:00
Sefa Eyeoglu
c4cb7ddc4f
fix: bring back JAR Folder mods
...
what is this?
2022-01-31 21:40:59 +01:00
Sefa Eyeoglu
a8089b76c0
fix: bring back instance exports
2022-01-31 21:40:59 +01:00
Sefa Eyeoglu
0442b80a2c
refactor: simpler includes for quazip
2022-01-31 21:40:59 +01:00
Sefa Eyeoglu
81c72c2038
refactor: bring back methods that need to be reimplemented
2022-01-31 21:40:59 +01:00
Sefa Eyeoglu
3aa809b8c0
refactor: add in-tree QuaZip
2022-01-31 21:40:59 +01:00
Sefa Eyeoglu
efa414c442
refactor: initial migration to QuaZip 1.2
...
Let's move off our custom QuaZip. In the olden times we needed the
custom version of QuaZip, as it was basically unmaintained and on
SourceForge (eww). But nowadays it's maintained and on GitHub. See
new GitHub page: https://github.com/stachenov/quazip
2022-01-31 21:40:59 +01:00
timoreo
aa2c27bf69
Update to Modrinth API V2
2022-01-31 17:18:11 +01:00
Joshua Goins
0211ee3ef1
Add "PolyMC Contributors" to Credits section
...
This also adds a link to the PolyMC Contributors page on Github.
2022-01-31 09:09:58 -05:00
Petr Mrázek
2cf04d034a
Merge pull request #4300 from Ghosty141/feature/screenshot_copy
...
GH-4044 Implemented copy screenshots to the clipboard
2022-01-30 16:11:47 +01:00
bexnoss
e0a04c5031
Lock offline mode support behind insertion of at least one Minecraft account
...
Co-Authored-By: Naomi Calabretta <tony0000.ac@gmail.com>
2022-01-30 02:42:29 +01:00
bexnoss
9d23ac562f
Add offline mode support
2022-01-30 02:35:56 +01:00
swirl
0065a29901
Close after Launch setting
2022-01-29 19:04:44 -05:00
Jan200101
3aa9f5c376
Update rpm spec to support OpenSuse and conform to Fedora guidelines
2022-01-28 19:42:30 +01:00
timoreo
efc44c56a6
Fix button being present in other pages
2022-01-28 19:32:42 +01:00
timoreo22
8b790a6dd9
Merge branch 'PolyMC:develop' into feature/download_mods
2022-01-28 18:12:35 +01:00
Joshua Goins
c1aaf89baa
Improve the About page
...
Improves #106 . This more clearly marks the original MultiMC contributors,
and now correctly hides the "Build Platform" if this is set as empty. The
version label is now moved under the "PolyMC" title so it looks just a
little bit better (and matches other applications). The copyright on the
"About" page now correctly attributes the MultiMC contributors just like on
the "License" page.
2022-01-27 19:06:07 -05:00
Joshua Goins
5ac528f141
Fix icons changing when exiting the settings window
2022-01-27 18:37:57 -05:00
swirl
33aac2985a
Merge pull request #105 from Scrumplex/rss-begone
...
Remove news
2022-01-27 17:00:15 -05:00
Sefa Eyeoglu
361ce7818e
refactor: remove news feed
...
Closes #63
2022-01-27 22:59:20 +01:00
swirl
02889b7a11
Merge pull request #67 from PolyMC/feature/no_paste_ee
...
Full replacement of paste.ee
2022-01-26 17:40:49 -05:00
Lenny McLennington
0eff21a4f1
Validate Pastebin URL with regex
2022-01-26 00:34:02 +00:00
Stypox
0235eb5c28
Fix error message
...
The code is trying to get a string from a json object, and if that fails it should log "is not a string", not "is not a timestamp".
2022-01-24 11:44:47 +01:00
Petr Mrázek
8804b035b2
NOISSUE log server response when failing to fetch profile
2022-01-24 11:44:47 +01:00
Petr Mrázek
54e3438e37
NOISSUE correctly set http status code in auth reply
2022-01-24 11:44:47 +01:00
Petr Mrázek
ddfed7bb87
NOISSUE in java checker, ignore invalid lines altogether
...
Declaring them as errors is just causing problems because Java
randomly prints garbage to STDOUT now.
2022-01-24 11:44:47 +01:00
Petr Mrázek
70c04745ee
NOISSUE add some logging to profile fetching failures
2022-01-24 11:44:47 +01:00
timoreo
1d0e6bf453
Changed modrinth author data to not be a list
2022-01-24 07:23:01 +01:00
timoreo
a2d88f6df4
Fixed spacing
2022-01-24 07:12:19 +01:00
swirl
019c77f9f7
Merge pull request #52 from oynqr/develop
...
Default to system locale language
2022-01-23 15:00:26 -05:00
swirl
af20b5ee0e
support paste.polymc.org
2022-01-23 12:54:58 -05:00
Stypox
8b31c638f3
Fix error message
...
The code is trying to get a string from a json object, and if that fails it should log "is not a string", not "is not a timestamp".
2022-01-22 21:58:32 +01:00
Sefa Eyeoglu
dd76fb0ec7
feat(MSALogin): add open page & copy code button
...
Closes #55
2022-01-20 21:04:48 +01:00
Lenny McLennington
caeab926bc
PasteUpload: Trim whitespace from response body
2022-01-19 19:05:52 +00:00
timoreo
6d22794cf9
Reduce spaghettiness
2022-01-19 09:47:09 +01:00
Lenny McLennington
b50e584369
PasteUpload task changed to use 0x0.st's protocol
...
- Modified PasteUpload task to upload the log file to 0x0.st and other
services with the same protocol.
- Modified Paste settings UI to allow the user to select a custom paste
URL, simplified the settings page code.
2022-01-19 08:27:26 +00:00
timoreo
affc2521aa
Various fixes
2022-01-18 12:28:55 +01:00
Philipp David
83e1dd285a
Set default lang only if index received
2022-01-17 09:52:04 +01:00
Philipp David
b9beb3c7d2
Sort system locale to front of list
2022-01-17 09:52:04 +01:00
Philipp David
2dd2555a63
Update selected language automatically
2022-01-17 09:52:04 +01:00
Philipp David
126e6d13aa
Use isEmpty instead of 0 length check
2022-01-17 09:52:04 +01:00
Philipp David
236c0166f6
Default to system locale language
2022-01-17 09:52:04 +01:00
Lenny McLennington
55597b458c
Revert "Merge pull request #50 from bexnoss/offline-mode"
...
This reverts commit b4f750e7db
, reversing
changes made to b19e315615
.
2022-01-17 03:45:47 +00:00
Lenny McLennington
f55297eca9
Revert "Merge pull request #81 from bexnoss/fix-msa-account-refresh"
...
This reverts commit 0bc8baf117
, reversing
changes made to 81fe41a038
.
2022-01-17 03:45:33 +00:00
bexnoss
5f9270ed4b
Fix MSA account refresh
2022-01-16 23:30:17 +01:00
swirl
81fe41a038
Default to colored icons, update copyright
...
Closes : #74
2022-01-16 12:03:30 -05:00
Petr Mrázek
917f8a31e3
NOISSUE log server response when failing to fetch profile
2022-01-16 12:51:42 +01:00
Petr Mrázek
aa770b63fb
NOISSUE correctly set http status code in auth reply
2022-01-16 12:46:20 +01:00
Petr Mrázek
c1bf31cb27
NOISSUE in java checker, ignore invalid lines altogether
...
Declaring them as errors is just causing problems because Java
randomly prints garbage to STDOUT now.
2022-01-16 12:05:40 +01:00
Petr Mrázek
86d99f80c3
NOISSUE add some logging to profile fetching failures
2022-01-16 11:43:19 +01:00
timoreo
975f77756d
Added curseforge selection
2022-01-16 11:20:21 +01:00
Petr Mrázek
f78bb90ed9
GH-4125 fix it better
2022-01-15 16:25:52 -05:00
Petr Mrázek
dc129fd886
GH-4125 workaround for java printing garbage to stdout on bedrock linux
2022-01-15 16:25:52 -05:00
timoreo
621e0ba4a8
Added smart file selection
...
This might fail in a few special cases
2022-01-15 10:25:24 +01:00
timoreo
f6de472da2
Added a no version message
2022-01-15 09:06:48 +01:00
timoreo
4b37c46889
Filtering per mod loader & mc version
2022-01-15 08:51:47 +01:00
Thomas Sirack
0bbd0ac0b9
Change method of shell script fix per suggestion
...
The Launcher.in file is now modified rather than CMakeLists.txt
2022-01-14 19:28:10 -07:00
swirl
a606b47a22
pastebin URL app setting
2022-01-14 18:30:02 -05:00
swirl
a62155c1c9
preliminary stuff for paste.ee removal
2022-01-14 18:20:06 -05:00
swirl
b4f750e7db
Merge pull request #50 from bexnoss/offline-mode
...
Offline Mode Support
2022-01-14 18:03:35 -05:00
swirl
b19e315615
Set maximum memory allocated to 4GB by default
2022-01-14 17:34:50 -05:00
timoreo
2896f70cd8
Removing copyrights
2022-01-14 22:07:54 +01:00
timoreo
1a8c972aef
Fixed icons
...
Also having a mod loader is now enforced
2022-01-14 20:22:15 +01:00
bexnoss
cdaa397dcf
Reword offline mode disclaimer
2022-01-14 14:19:31 +01:00
timoreo
9e6fa8f29a
Added the downloading of the mods
2022-01-14 12:47:18 +01:00
timoreo
4d599eb118
Added modrinth icon
2022-01-14 10:51:44 +01:00
timoreo
4e9039be2d
Start of mod downloading
2022-01-14 09:56:27 +01:00
bexnoss
395e265564
Add offline mode disclaimer
2022-01-14 00:01:05 +01:00
bexnoss
46a3b4de6e
Remove unnecessary semicolon
2022-01-12 18:41:33 +01:00
bexnoss
6ecc8c5496
Remove unnecessary license header
2022-01-12 14:57:32 +01:00
bexnoss
a1ff3b1ee3
Add offline mode support
2022-01-12 14:26:02 +01:00
bexnoss
d4b522b6cb
Add offline mode UI
2022-01-12 10:36:26 +01:00
Mustafa Çalışkan
3329d94c9b
Introduce POLYMC_JAVA_PATHS env
2022-01-11 18:24:37 +03:00
Mustafa Çalışkan
a12118f1a0
Sort java versions from current to oldest
2022-01-11 17:40:58 +03:00
swirl
1d8196e11a
More rebranding
...
Closes : #39
Mostly done with rebranding now. We just need to translate some services
to PolyMC.
2022-01-10 12:47:35 -05:00
swirl
1cc7a193c2
add logo to different styles
...
Also fixed genicons to automate this.
2022-01-09 14:18:51 -05:00
swirl
e50d07f791
remove patreon stuff
...
Closes : #22
Update to 1.0.5
Remove "Forking/Redistribution" tab in About (why is it even there?)
Metainfo now corresponds to version
add discord
Completely removed Patreon.
2022-01-09 13:51:46 -05:00
Ezekiel Smith
87af5f631d
Update branding: New Logo ( #30 )
...
New logo
Co-authored-by: swirl <swurl@swurl.xyz>
2022-01-09 00:13:15 -05:00
Petr Mrázek
52420963cf
GH-4125 fix it better
2022-01-08 12:26:16 +01:00
Petr Mrázek
03d7300732
GH-4125 workaround for java printing garbage to stdout on bedrock linux
2022-01-08 11:14:07 +01:00
swirl
2c7d248703
New pixel Ouroboros logo by @karolinaabb
2022-01-06 22:42:33 -05:00
swirl
0e4ccaca02
fix icon and version
...
Closes : #16
Fixed the icon so Qt renders it properly, and actually renders it
properly in the About page. Also, scaled it up a bit
Changed launcher.svg icon to temporary Ouroboros logo
fixed genicons again
Fix version to 1.0.3 (making tag rn)
Install the PolyMC icon properly.
2022-01-03 17:46:05 -05:00
swirl
3f3c5ea247
Rebranding logo
...
add temporary Ouroboros logo, thanks Lenny for vectorizing
change logo file names
Desktop file now includes proper exec using the app binary name
fix genicons for use with libicns
2021-12-31 16:37:54 -05:00
dada513
fa98ed3ccd
Merge remote-tracking branch 'upstream/develop' into upstream_update
2021-12-31 18:05:40 +01:00
Petr Mrázek
9579231ccc
NOISSUE fix build and change how NetJob is used
...
Feed it network upfront...
2021-12-31 05:27:59 +01:00
Petr Mrázek
9cc168c526
NOISSUE fix some OS ifdefs
2021-12-31 00:36:25 +01:00
Petr Mrázek
94fdf13f4a
NOISSUE proper fix for missing profile + demo mode
2021-12-30 21:26:29 +01:00
Petr Mrázek
3efcccf334
Merge pull request #4345 from graemeg/freebsd-support
...
Adds FreeBSD support to MultiMC
2021-12-30 20:00:45 +01:00
Petr Mrázek
5e909a4e85
Merge pull request #4394 from Janrupf/develop
...
GH-4299 Fix Screenshot upload
2021-12-30 19:58:16 +01:00
Petr Mrázek
a6e59cb4f4
NOISSUE detect when user loses entitlements
2021-12-30 17:19:41 +01:00
Janrupf
be029ab360
GH-4299 Fix screenshot upload
2021-12-29 19:45:24 +01:00
Janrupf
6fe07561fe
GH-4299 Don't hard crash on when missing network
2021-12-29 19:45:15 +01:00
swirl
f25a9bc103
Completely remove Google Analytics library
2021-12-29 10:37:09 -05:00
Graeme Geldenhuys
f42c3a953c
Restore getNativePath() to its original form.
2021-12-28 21:59:24 +00:00
dada513
d821ffb829
Flatpak & Debian Packaging ( #4 )
...
Flatpak & Debian packages
2021-12-28 10:45:04 -05:00
swirl
a11162ec61
update README, delete RPM/Ubuntu packaging dirs
...
Closes : #2
Update wording/information for packages
add more of the individual Matrix rooms in case spaces don't work
add PolyMC Discord to README
Deleted RPM & Ubuntu/Debian packaging directories, will need to be moved
to separate repositories.
2021-12-26 16:01:29 -05:00
swirl
a254467184
Matrix room/space, a bit more rebranding
2021-12-24 14:28:54 -05:00
CreeperzEdge
95c9a6d8f4
Use correct title on Java check during setup
2021-12-23 00:53:02 +11:00
Lenny McLennington
18a931eaa9
Merge remote-tracking branch 'upstream/develop' into develop
2021-12-20 03:01:41 +00:00