Commit Graph

4125 Commits

Author SHA1 Message Date
LennyMcLennington
796e58b6f2
Merge pull request #176 from PolyMC/upstream-merge
upstream merge
2022-02-17 23:34:50 +00:00
Sefa Eyeoglu
a7d37fa69a
chore: add Contributor Covenant 2022-02-17 23:55:34 +01: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
dada513
107a0ea852
fix2 2022-02-17 13:19:35 +01:00
dada513
6d7676202f
unofficial => community maintained 2022-02-17 12:53:44 +01:00
dada513
0305b7a1fd
Prepare readme for 1.1.0, mark unofficial packages as unofficial 2022-02-17 11:55:09 +01:00
dada513
02384f81c7
Merge pull request #131 from glowiak/patch-1
Add Slackware package
2022-02-17 11:32:17 +01:00
timoreo22
4536b19512
Merge pull request #171 from DioEgizio/fix-org.polymc-macos
Change: set MACOSX_BUNDLE_GUI_IDENTIFIER to org.polymc (fixes org.multimc.PolyMC)
2022-02-16 21:07:50 +01:00
glowiak
45f89c6255
Merge branch 'develop' into patch-1 2022-02-16 18:36:28 +01:00
glowiak
b1cf77e847
update 2022-02-16 18:31:34 +01:00
Sefa Eyeoglu
037b0d7190
fix: improve code readability in Application.cpp 2022-02-16 17:33:28 +01:00
Sefa Eyeoglu
ff17202b43
refactor: switch to new MSA Client ID 2022-02-16 17:03:13 +01:00
DioEgizio
a3d8313dcb
Change: set MACOSX_BUNDLE_GUI_IDENTIFIER to org.polymc instead of org.multimc 2022-02-16 15:45:16 +01:00
Sefa Eyeoglu
36841eaf63
chore(github): add issue template for RFCs 2022-02-16 12:38:28 +01:00
txtsd
e24a183dad
Only trigger GH Release on stable branch 2022-02-15 14:38:26 +05:30
txtsd
8596753a63
Allow building release builds and…
…trigger GH release using tags
2022-02-15 14:24:52 +05:30
Finn Behrens
51183bef33 nix: add meta attribute 2022-02-14 21:08:10 +01:00
Sefa Eyeoglu
2cd837896d
Merge pull request #160 from Scrumplex/custom-be-gone 2022-02-14 16:56:53 +01:00
Finn Behrens
c75ae71190 flake.nix: drop aarch64-darwin
Currently qtbase is broken on aarch64-darwin, therefor dropping support, so the check can succeed
2022-02-14 15:45:51 +01:00
Sefa Eyeoglu
48c20f5aaa
Merge pull request #164 from Scrumplex/rebase-stable
Merge stable into develop
2022-02-14 10:10:35 +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
384e0df9e1
Merge remote-tracking branch 'upstream/stable' into rebase-stable 2022-02-13 18:08:41 +01:00
LennyMcLennington
a5b06514c6
Merge pull request #161 from Scrumplex/custom-clientid
Add MSA-Client-ID override in UI
2022-02-13 14:06:27 +00: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
9ddbaaf7e8
feat: use commit hash for channel if ref not available 2022-02-12 19:04:45 +01:00
Sefa Eyeoglu
3b7cc4391a
fix: don't use custom for version channel
Closes #159
2022-02-12 18:17:56 +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
Sefa Eyeoglu
a60b2feb5f
Revert "refactor(build): link rainbow statically"
Windows build fails for some reason. Needs to be investigated later

This reverts commit 812f00eb81.
2022-02-12 16:56:35 +01:00
Sefa Eyeoglu
6ba031f048
refactor(build): link iconfix statically 2022-02-12 16:10:53 +01:00
Sefa Eyeoglu
812f00eb81
refactor(build): link rainbow statically 2022-02-12 16:10:46 +01:00
txtsd
2f6973e08b
Merge pull request #157 from txtsd/actions_fix
Adjust OpenSSL step
2022-02-12 03:15:11 -08:00
txtsd
fb14796ed7
Adjust OpenSSL step 2022-02-12 14:56:15 +05:30
LennyMcLennington
7d912726d0
Merge pull request #134 from glowiak/patch-2
OpenBSD support and slackware build instructions
2022-02-12 03:30:24 +00:00
LennyMcLennington
e3c8eb062c
Merge pull request #149 from ZekeSmith/patch-1
License for assets
2022-02-12 03:29:59 +00:00
swirl
3cf81faabc
change "loader mods" to "mods"
Closes: #128
2022-02-11 22:09:47 -05:00
LennyMcLennington
0df605e559
Merge pull request #155 from txtsd/actions
fix(ci): Unsplit OpenSSL step
2022-02-12 02:22:23 +00:00
txtsd
e97a6ef957
Unsplit OpenSSL step 2022-02-12 00:19:11 +05:30
Ezekiel Smith
c4dd8d9c72
Update LICENSE 2022-02-12 01:03:33 +10: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
timoreo22
11f892380e
Merge pull request #145 from dada513/metainfix
Update metadata
2022-02-11 13:54:14 +01:00
LennyMcLennington
fd72cb034c
Merge pull request #140 from txtsd/actions
CI: Build AppImages
2022-02-11 12:38:03 +00:00
txtsd
b9be8d08d2
Remove superfluous variable 2022-02-11 18:05:26 +05:30
txtsd
33d369d78c
Add missing deploy flags 2022-02-11 18:05:26 +05:30