Commit Graph

3758 Commits

Author SHA1 Message Date
0bce08d30f chore: add polymc license headers to launcher/net files 2022-05-12 18:11:55 -03:00
57d65177c8 fix: abort and fail logic in tasks
Also sets up correctly the status connections
2022-05-12 18:11:55 -03:00
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
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
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
649b8ac7c6 Merge pull request #537 from PolyMC/stable
Merge stable into develop
2022-05-09 18:06:56 +02:00
da25f3b84e Merge pull request #533 from DioEgizio/patch-5 1.2.2 2022-05-08 21:43:18 +02:00
1e34de98ab Merge pull request #534 from DioEgizio/stable 2022-05-08 21:43:06 +02:00
7b46f50cf1 Merge pull request #530 from ryanccn/cfcore-backport 2022-05-08 21:42:40 +02:00
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
ac66bddeda Merge pull request #482 from TheCodex6824/mojang-auth-fix 2022-05-08 16:52:31 +02:00
f4237be9bd Merge pull request #492 from DioEgizio/appimage-fix 2022-05-08 16:52:14 +02:00
dd11ccb3fd bump to 1.2.2 2022-05-08 16:30:12 +02:00
c4549a5375 Update launcher/modplatform/flame/FlameModIndex.cpp
Co-authored-by: flow <thiagodonato300@gmail.com>
2022-05-08 16:25:51 +02:00
e9b3140d12 Update launcher/modplatform/flame/FlameModIndex.cpp 2022-05-08 16:25:45 +02:00
22f5128e39 adopt changes from #497 remapped 2022-05-08 15:22:50 +08:00
ae1aa6f63e gitignore stuff 2022-05-08 15:02:21 +08:00
f7f39854f8 Merge pull request #495 from ryanccn/big-sur-icon 2022-05-05 14:29:04 +02:00
e909cc363d add big sur-style icon 2022-05-05 08:10:36 +08:00
d29720fbce Merge pull request #518 from timoreo22/develop
Fix nightly.link pr comment
2022-05-02 12:23:00 +02:00
0556ae4749 Merge pull request #503 from txtsd/mnemonics_fix
Fix mnemonics that didn't parse
2022-05-02 11:19:30 +02:00
1a86f72690 Fix nightly.link pr comment 2022-05-02 11:13:46 +02:00
25d380f051 Merge pull request #510 from txtsd/ccache_gha
CI Speedup [1/3]: Use ccache to speed up CI builds
2022-05-02 10:47:28 +02:00
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
8110040f86 Merge pull request #511 from dada513/hide_java_wizard
add hide java wizard toggle
2022-05-01 08:48:37 +02:00
239e4adf29 refactor(workflow): Only use ccache on Debug builds 2022-05-01 00:34:37 +05:30
5662d41062 Update launcher/ui/pages/global/JavaPage.ui
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-04-30 16:20:05 +02:00
1e03ef484d Update launcher/ui/pages/global/JavaPage.ui
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-04-30 16:14:48 +02:00
1d95f10090 Merge pull request #489 from kthchew/fix/old-mac-cleanup 2022-04-30 15:54:10 +02:00
6768768373 Remove symlink 2022-04-30 15:22:31 +02:00
dac801c8ac add hide java wizard toggle 2022-04-30 15:19:57 +02:00
ece5ca52b2 feat(workflow): Use ccache 2022-04-30 17:26:34 +05:30
3205d9e9da Merge pull request #492 from DioEgizio/appimage-fix 2022-04-29 09:10:32 +02:00
b931dc0f93 fix(mnemonics): Add missing buddies to labels
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-04-29 01:30:47 +05:30
efe4e7df06 fix some appimage issues building with qt 5.15.2
some users are having weird scaling issues since we're using qt 5.12.8 for the appimage
2022-04-28 18:17:02 +02:00
b94f70ea96 Merge pull request #498 from ryanccn/polymc-instance-icon
Add PolyMC icon as instance icon
2022-04-28 07:18:57 +02:00
bd946c78f3 Merge pull request #486 from icelimetea/refactor-java-launcher
Refactor some parts of NewLaunch
2022-04-28 07:18:39 +02:00
a507907443 Merge pull request #477 from flowln/iconfix_static
Always build iconfix as static library
2022-04-28 07:18:22 +02:00
0507b56bed feat: add PolyMC icon as instance icon 2022-04-27 20:30:50 +08:00
ac405aa564 Remove old macOS data migration code 2022-04-25 19:57:47 -04:00
aad7c63282 Merge pull request #482 from TheCodex6824/mojang-auth-fix 2022-04-25 21:55:00 +02:00
1ff459d995 Use suggested error handling 2022-04-25 14:08:27 -04:00
52454ca77b Merge pull request #480 from dschemp/develop 2022-04-25 14:26:10 +02:00
884f772362 Clarify exception messages 2022-04-25 11:22:56 +01:00
bc06571dba Merge pull request #478 from Scrumplex/update-readme 2022-04-25 11:21:21 +02:00
1e8ad3d979 Merge pull request #408 from jamierocks/atl-share-codes 2022-04-25 11:21:10 +02:00
b0a469baab Use java.util.logging instead of custom logging 2022-04-24 15:10:35 +01:00
c968c1be78 Refactor some parts of NewLaunch 2022-04-24 14:45:01 +01:00
a0bafa4952 Re-add base64 decode option for Qt versions that support it 2022-04-23 11:11:55 -04:00
e56f0db11b Remove base64 decode option that was added in Qt 5.15 2022-04-23 10:32:52 -04:00