Commit Graph

3763 Commits

Author SHA1 Message Date
Kenneth Chew
7f305aad1b
Add Allow DYLD Environment Variables Entitlement to macOS build
This allows the Steam overlay to be injected into Minecraft.
2022-05-15 16:34:53 -04:00
Kenneth Chew
80908efdcb
Fix indentation of macOS resources 2022-05-15 16:33:52 -04:00
timoreo22
123ed5bd2e
Merge pull request #519 from Scrumplex/cleanup-cmake
Remove in-tree CMake modules where possible
2022-05-13 22:05:04 +02:00
Sefa Eyeoglu
8dd68580a6
Merge pull request #528 from flowln/guo_ext 2022-05-13 18:17:40 +02:00
timoreo22
c83e16aba4
Merge pull request #553 from DioEgizio/add-version-PolyMC
chore: add version of polymc area in bug report template
2022-05-13 14:42:26 +02:00
Sefa Eyeoglu
d85fc456a9
Merge pull request #557 from PolyMC/ZekeSmith-cf-api 2022-05-13 13:36:36 +02:00
Ezekiel Smith
37e8f495b4
CurseForge API Key update to PolyMC key
Use the key CurseForge provided me to use for PolyMC

*pr done on mobile if someone could test that would be great*
2022-05-12 23:39:48 +10:00
DioEgizio
512d7b07d0
chore: add version of polymc area in bug report template 2022-05-11 15:18:07 +02:00
timoreo22
649b8ac7c6
Merge pull request #537 from PolyMC/stable
Merge stable into develop
2022-05-09 18:06:56 +02:00
Sefa Eyeoglu
da25f3b84e
Merge pull request #533 from DioEgizio/patch-5 2022-05-08 21:43:18 +02:00
Sefa Eyeoglu
1e34de98ab
Merge pull request #534 from DioEgizio/stable 2022-05-08 21:43:06 +02:00
Sefa Eyeoglu
7b46f50cf1
Merge pull request #530 from ryanccn/cfcore-backport 2022-05-08 21:42:40 +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
f4237be9bd Merge pull request #492 from DioEgizio/appimage-fix 2022-05-08 16:52:14 +02:00
DioEgizio
dd11ccb3fd
bump to 1.2.2 2022-05-08 16:30:12 +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
Ryan Cao
22f5128e39
adopt changes from #497 remapped 2022-05-08 15:22:50 +08:00
Ryan Cao
ae1aa6f63e
gitignore stuff 2022-05-08 15:02:21 +08: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
Sefa Eyeoglu
f7f39854f8
Merge pull request #495 from ryanccn/big-sur-icon 2022-05-05 14:29:04 +02:00
Ryan Cao
e909cc363d
add big sur-style icon 2022-05-05 08:10:36 +08:00
Sefa Eyeoglu
0b38d878a1
fix: remove in-tree CMake modules where possible 2022-05-02 16:27:15 +02:00
Sefa Eyeoglu
d29720fbce
Merge pull request #518 from timoreo22/develop
Fix nightly.link pr comment
2022-05-02 12:23:00 +02: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
1a86f72690
Fix nightly.link pr comment 2022-05-02 11:13:46 +02:00
timoreo22
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
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
txtsd
239e4adf29
refactor(workflow): Only use ccache on Debug builds 2022-05-01 00:34:37 +05:30
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
6768768373
Remove symlink 2022-04-30 15:22:31 +02:00
dada513
dac801c8ac
add hide java wizard toggle 2022-04-30 15:19:57 +02:00
txtsd
ece5ca52b2
feat(workflow): Use ccache 2022-04-30 17:26:34 +05:30
Sefa Eyeoglu
3205d9e9da
Merge pull request #492 from DioEgizio/appimage-fix 2022-04-29 09:10:32 +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
DioEgizio
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
Sefa Eyeoglu
b94f70ea96
Merge pull request #498 from ryanccn/polymc-instance-icon
Add PolyMC icon as instance icon
2022-04-28 07:18:57 +02:00
Sefa Eyeoglu
bd946c78f3
Merge pull request #486 from icelimetea/refactor-java-launcher
Refactor some parts of NewLaunch
2022-04-28 07:18:39 +02:00
Sefa Eyeoglu
a507907443
Merge pull request #477 from flowln/iconfix_static
Always build iconfix as static library
2022-04-28 07:18:22 +02:00
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
icelimetea
884f772362 Clarify exception messages 2022-04-25 11:22:56 +01:00
Sefa Eyeoglu
bc06571dba
Merge pull request #478 from Scrumplex/update-readme 2022-04-25 11:21:21 +02:00