Sebastian-byte
b7ce6a63dc
Resolved merge conflict
2021-06-25 18:46:21 -05:00
Petr Mrázek
dc3a4cebce
Merge pull request #3896 from jamierocks/mib-suffix
...
NOISSUE Use MiB suffix for Java memory options
2021-06-25 12:27:57 +02:00
Jamie Mansfield
c77f5285e3
NOISSUE Close optional mod dialog with Install button
...
This was a silly ommision I made.
2021-06-23 15:49:31 +01:00
Jamie Mansfield
d8598d6901
NOISSUE Use MiB suffix for Java memory options
2021-06-23 09:57:55 +01:00
Sebastían
42f29a9f29
Merge branch 'MultiMC:develop' into develop
2021-06-22 16:45:48 -05:00
Petr Mrázek
27d3ae145a
Merge pull request #3888 from jamierocks/atl-version-selection-width
...
NOISSUE Fix ATLauncher version selection combo box width
2021-06-22 19:57:49 +02:00
max
5beb7edfff
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2021-06-22 09:50:07 +03:00
Jamie Mansfield
4ba0c9c298
NOISSUE Support mod grouping and dependencies
2021-06-21 16:29:16 +01:00
Jamie Mansfield
74311a54cf
NOISSUE Support ATLauncher optional mods
2021-06-21 16:29:11 +01:00
Jamie Mansfield
a87c64d7d1
NOISSUE Fix ATLauncher version selection combo box width
...
Resolves a bug that was introduced with [1], furthermore and in
specific relation to the intent of said commit, this brings the
version selection combo box inline with other mod platforms.
[1] f7c144c393
2021-06-21 15:26:10 +01:00
phit
e439ce6e0b
NOISSUE Fix Modplatform Scrollbars properly
2021-06-20 22:59:58 +02:00
phit
f6d6e4c1c4
NOISSUE Fix FTB Legacy Pack Selection
2021-06-20 22:52:10 +02:00
Petr Mrázek
bace6fec1b
Merge pull request #3880 from phit/fix/GH-3720
...
GH-3720 Fix UI inconsistencies with Modplatforms
2021-06-20 22:39:03 +02:00
Petr Mrázek
a487234968
Revert "GH-3507 Modernize MacOS Icon"
...
This reverts commit d08a2f00a2
2021-06-20 21:53:02 +02:00
phit
f7c144c393
GH-3720 Fix UI inconsistencies with Modplatforms
...
Fixes GH-3118
Fixes GH-3720
Fixes GH-3731
Icons and Ok button state will now switch consistently when moving
between tabs. ATLaunchers packlist is now no longer redownloaded
each time you open its Tab. All lists are striped now. And all
search and filter fields now have a placeholder text.
2021-06-20 01:03:17 +02:00
Sebastían
308a0bd627
Merge branch 'MultiMC:develop' into develop
2021-06-19 14:43:53 -05:00
Jamie Mansfield
81d4dc09cc
NOISSUE Add notice re MSA to login dialog
...
This commit should be reverted when support for Microsoft/Xbox
authentication is introduced.
2021-06-19 20:31:49 +01:00
Petr Mrázek
5f8d07c009
Merge pull request #3875 from jamierocks/feature/gh-3033
...
GH-3033 Add filtering for version components
2021-06-19 12:50:21 +02:00
Petr Mrázek
25955c0817
Merge pull request #3877 from Zetabite/feature_offline_status_log
...
NOISSUE Add info for instance launch mode and server status when online
2021-06-19 11:59:04 +02:00
Adrian
6db6ebe37f
NOISSUE Add info for instance launch mode and server status when online
2021-06-19 03:15:21 +02:00
Jamie Mansfield
b246fc171e
GH-2971 Brand mod model for resource/texture pack pages
2021-06-19 00:59:48 +01:00
Jamie Mansfield
c92b44e6d6
GH-3719 Translate some missing strings when changing locale
2021-06-19 00:14:36 +01:00
Jamie Mansfield
e148cfbbfd
NOISSUE Don't translate logged entries
2021-06-18 23:57:58 +01:00
Sebastían
f6e2eae195
Merge branch 'MultiMC:develop' into develop
2021-06-18 17:35:05 -05:00
Jamie Mansfield
c0f72488d0
GH-3033 Add filtering for version components
2021-06-18 23:21:12 +01:00
phit
d08a2f00a2
GH-3507 Modernize MacOS Icon
...
full credit to @ThePotatoKing55
2021-06-18 20:27:25 +02:00
phit
00820df656
GH-3731 Limit Curserforge version height
2021-06-18 18:31:14 +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
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
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
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
Jamie Mansfield
efa3bb33f5
NOISSUE Disable 'Install Forge' button when game is running
2021-06-03 15:03:19 +01: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
ffd5dd948c
Launching the game now possible. Feature parity with master branch
2021-05-30 16:03:22 +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
Janrupf
52c1150522
NOISSUE Add --server argument for --launch
2021-05-23 14:42:20 +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
f0eb5b4a0c
NOISSUE Register settings for setting a server
2021-05-22 13:28:23 +02:00
Janrupf
2e2a5d0943
NOISSUE Required UI elements for setting a server
2021-05-22 13:15:59 +02:00
Sebastían
fa6e3ba869
Merge branch 'MultiMC:develop' into develop
2021-05-18 17:51:12 -05:00
Petr Mrázek
deac64e0a2
Merge pull request #3787 from JoelTroch/feature/gh-3450
...
GH-3450 Add checkboxes to display and record game time
2021-05-15 00:35:05 +02:00
Joël Troch
de089195cd
GH-3450 Add checkboxes to display and record game time
2021-05-13 19:38:24 +02:00
Sebastian-byte
aa04069265
Fix indent
2021-05-09 17:40:01 -05:00
