Commit Graph

2713 Commits

Author SHA1 Message Date
Sebastían
f6e2eae195 Merge branch 'MultiMC:develop' into develop 2021-06-18 17:35:05 -05:00
Petr Mrázek
cb22d5fb09 Merge pull request #3874 from phit/macosicon
GH-3507 Modernize MacOS Icon
2021-06-18 20:39:32 +02:00
phit
d08a2f00a2 GH-3507 Modernize MacOS Icon
full credit to @ThePotatoKing55
2021-06-18 20:27:25 +02:00
Petr Mrázek
0c147fb5ee Merge pull request #3843 from phit/adoptjdkdetection
Update Java detection
2021-06-18 19:14:15 +02:00
Petr Mrázek
09ce3d8f40 Merge pull request #3872 from phit/fixcursedropdown
GH-3731 Limit Curserforge version height
2021-06-18 19:10:18 +02:00
phit
00820df656 GH-3731 Limit Curserforge version height 2021-06-18 18:31:14 +02:00
phit
c2c288a956 NOISSUE Add BellSoft and Azul Java 2021-06-18 17:12:44 +02:00
phit
7ac6c4f3d9 NOISSUE Cleanup duplication and Microsoft JDK 2021-06-18 17:02:41 +02:00
phit
fd04ff2b08 NOISSUE Add AdoptOpenJDK Java detection 2021-06-18 16:10:48 +02:00
Petr Mrázek
434adc4cd7 Merge pull request #3870 from jamierocks/build-time-support-links
NOISSUE Specify support URLs at build time
2021-06-18 13:43:35 +02:00
Jamie Mansfield
40f41e5fbe NOISSUE Specify support URLs at build time
Support URLs (bug tracker, Discord guild, subreddit) are now specified
as cache variables in cmake, and the buttons are not shown if no value
is set for them.

This is an early-stage move towards debranding the MultiMC codebase,
and will (hopefully) alleviate support requests coming to us from
illicit forks.
2021-06-18 12:24:20 +01:00
Sebastían
89978aa5e5 Update download links 2021-06-14 17:30:55 -05:00
Max
167b6bd405 Dehardcode account providers (#38)
* Dehardcode account providers

* Fix crash on creation

* Add dynamic 'add account dialog' provider selector

* Fix typo and add newlines

* Rename loginType to provider

* Rename MojangAccount to Account and MojangAccountList to AccountList

* Fix json save error
2021-06-14 12:51:25 +03:00
Zakhar Afonin
396400b60d UI improvement: Ely.by skins in launcher 2021-06-12 08:46:53 +03:00
Sebastían
dca3b28325 Actually update the links this time 2021-06-11 16:01:15 -05:00
Sebastían
e19730d3ba Disable build on push, closes #36 2021-06-11 15:49:46 -05:00
Sebastían
9e5e5a5fd8 Use actions checkout for clone 2021-06-11 15:42:35 -05:00
Zakhar Afonin
897078882b Fixed wrong repo in CI main.yml 2021-06-11 22:22:30 +03:00
Max
576d78fb7f UI Improvement: Display account type (#33)
* Add account type column in accounts page

* Show account type in account chooser

* Allow set skin and delete skin only on mojang accounts

* Rename Offline mode to Local
2021-06-11 22:18:35 +03:00
Sebastían
915a85f00f Update download links 2021-06-10 17:34:27 -05:00
Zakhar Afonin
53ae05d675 Revert "Ely.by skin support implemented with room for the future"
This reverts commit a6a627ab2d.
2021-06-10 21:39:11 +03:00
Zakhar Afonin
a6a627ab2d Ely.by skin support implemented with room for the future 2021-06-10 21:36:41 +03:00
Max
6df1be94dd Authlib injector, local auth server and ely by accounts support (#31)
* Add injector

* Add uuid generation for profile

* Add auth server emulator

* Start auth server on random port and bypass it to injector

* Run injector only when account type is dummy

* Clean authlib injector

* Add ely by authentication

* Remove old comments

* Add response status text to auth server

* Fix json value access

as done by @maximmasterr
2021-06-10 17:00:54 +03:00
Sebastían
4db5965f89 Merge branch 'MultiMC:develop' into develop 2021-06-09 17:29:17 -05:00
Petr Mrázek
9fafe3ffe6 Merge pull request #3833 from jamierocks/disable-forge-btn-when-game-running
NOISSUE Disable 'Install Forge' button when game is running
2021-06-09 21:54:22 +02:00
Jamie Mansfield
3390367d93 NOISSUE Support CurseForge modpacks using Fabric Loader 2021-06-09 20:49:26 +01:00
Sebastían
44f1e93776 Update download links 2021-06-08 20:21:05 -05:00
Sebastían
228e4bf079 Seems like Actions uses batch files 2021-06-08 19:32:26 -05:00
Sebastían
726cce8cf6 Get build number automatically
Somewhat a workaround for #30
2021-06-08 19:24:01 -05:00
Jamie Mansfield
6dd1fdbaf9 NOISSUE Fail pack installation for download errors for FTB
This effectively reverts the changes made in [1] to resolve GH-3304.

[1] 05ffcf706b
2021-06-03 15:16:03 +01:00
Jamie Mansfield
efa3bb33f5 NOISSUE Disable 'Install Forge' button when game is running 2021-06-03 15:03:19 +01:00
Zakhar Afonin
4fdf06b46a Merge pull request #28 from AfoninZ/feature-accounts
Feature accounts
2021-05-31 20:43:39 +03:00
Zakhar Afonin
356905aa75 Fixed: a dummy profile now gets created regardless of game being launched once 2021-05-30 17:22:15 +03:00
Zakhar Afonin
1c23483425 Profiles of both types now can be created. Ready for review 2021-05-30 17:08:55 +03:00
Zakhar Afonin
0e436b45f2 Dummy profile support as a workaround for accounts.json not loading 2021-05-30 16:52:53 +03:00
Zakhar Afonin
ffd5dd948c Launching the game now possible. Feature parity with master branch 2021-05-30 16:03:22 +03:00
Zakhar Afonin
431af1cd62 Initial support for alternative login types 2021-05-30 12:23:21 +03:00
Zakhar Afonin
18d24678fe Removes the existing "crack". Will be replaced by proper support of different account types. 2021-05-26 14:28:59 +03:00
Zakhar Afonin
7bb9a94210 Merge branch 'MultiMC:develop' into develop 2021-05-25 17:58:05 +03:00
Petr Mrázek
60b686f014 Merge pull request #3804 from Janrupf/feature/default-server
Add ability to select a server to join in the instance settings
2021-05-24 02:41:54 +02:00
Petr Mrázek
3a8068e75f Merge pull request #3803 from phit/patch-1
NOISSUE Fix new Oracle Java Detection on Windows
2021-05-24 02:41:08 +02:00
Janrupf
52c1150522 NOISSUE Add --server argument for --launch 2021-05-23 14:42:20 +02:00
Janrupf
58ab005f7e NOISSUE Add missing license header 2021-05-22 18:10:17 +02:00
Janrupf
ea6c42a93c NOISSUE Allow joining servers from the servers page 2021-05-22 18:07:08 +02:00
Janrupf
f33fe05e5f NOISSUE Use minecraft logic for parsing adresses 2021-05-22 17:24:37 +02:00
Janrupf
d97f13b4aa NOISSUE Use Vanilla logic for resolving servers 2021-05-22 17:00:14 +02:00
Janrupf
0ccd7223fd NOISSUE Make LauncherPart aware of server to join 2021-05-22 16:33:16 +02:00
Janrupf
23a706bbae NOISSUE Resolve minecraft server using DNS SRV 2021-05-22 16:14:25 +02:00
Janrupf
cc6cd0648a NOISSUE Add server launch arguments 2021-05-22 13:54:34 +02:00
Philip T
f78152d725 NOISSUE Fix new Oracle Java Detection on Windows
Those were changed with Java 9 https://docs.oracle.com/javase/9/install/installation-jdk-and-jre-microsoft-windows-platforms.htm#JSJIG-GUID-47C269A3-5220-412F-9E31-4B8C37A82BFB
2021-05-22 13:37:51 +02:00