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
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
b246fc171e
GH-2971 Brand mod model for resource/texture pack pages
2021-06-19 00:59:48 +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
00820df656
GH-3731 Limit Curserforge version height
2021-06-18 18:31:14 +02: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
Jamie Mansfield
efa3bb33f5
NOISSUE Disable 'Install Forge' button when game is running
2021-06-03 15:03:19 +01: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
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
Jamie Mansfield
87dbe82474
NOISSUE Support custom,latest,recommended loader versions for ATL
...
This provides support for modpacks using the new loader mechanism in
ATLauncher and using a non-specific version target.
2021-04-16 01:51:23 +01:00
Petr Mrázek
8b926d29d7
NOISSUE fix build
2021-04-08 22:28:55 +02:00
Petr Mrázek
4ac38991ad
Merge pull request #3691 from phit/feature/fixcurse
...
NOISSUE Curseforge makeover
2021-04-08 22:07:03 +02:00
Jamie Mansfield
d6dc22d57c
NOISSUE Handle JSON exceptions in ATLauncher support
...
Thanks to phit for pointing this out :)
2021-04-08 18:51:04 +01:00
phit
1f8408c793
NOISSUE Curseforge makeover
...
update UI to match other modpack platforms
add sorting
add version selection, fixes GH-3667
add installing beta versions, fixes GH-3611
2021-04-08 19:32:34 +02:00
Petr Mrázek
5400d4e613
Merge pull request #3690 from jamierocks/ftb-search-edge
...
NOISSUE Fix edgecase where new searches won't be processed
2021-03-26 20:37:48 +00:00
Jamie Mansfield
8e6400e8d8
NOISSUE Fix edgecase where new searches won't be processed
...
This resolves an issue with the modpacks.ch search functionality, in
which a search issued while one is currently in progress won't be made
and the UI won't allow for the search to be made after.
Reproduction Steps:
1. Open the FTB pane in the Add Instance Dialog
2. Perform a search while MMC is still performing the initial search
The search won't be performed, the existing search will have been
aborted, and you are unable to try the search again (without trying a
different search in the meantime).
This was caused by 2 things:
1. A search cannot be re-attempted, and this logic doesn't consider
failures.
2. The failure slot wasn't called when the NetJob was aborted, so
the search would never be performed - but the term would be
stored as if it had (trigering point 1).
I have resolved this by doing 2 things:
1. If the failure slot is called, set a searchState of Failed. Allow
search re-attempts in this case.
2. If there is a present NetJob, abort and reset it. The immediately
continue with the search.
2021-03-26 20:03:57 +00:00
phit
ba13e33ccc
GH-3633 assume latest MC version, if CurseForge pack supports multiple
...
right now these are unused anyway
2021-03-26 14:18:47 +01:00
Petr Mrázek
369a243f1f
Merge pull request #3682 from kb-1000/rename-twitch-curseforge
...
NOISSUE rename Twitch to flame internally for consistency and to CurseForge for user displayed strings
2021-03-26 00:38:58 +00:00
Petr Mrázek
1db6985be2
Merge pull request #3681 from kb-1000/fix-moc-warning
...
NOISSUE fix MOC warning complaining about an unused MOC file include
2021-03-26 00:37:25 +00:00
kb1000
a0cb1a0d42
NOISSUE rename Twitch to flame internally for consistency and to CurseForge for user displayed strings
2021-03-24 00:59:43 +01:00
kb1000
7acad35c3f
NOISSUE fix MOC warning complaining about an unused MOC file include
2021-03-23 23:05:10 +01:00
kb1000
4f3328e71c
NOISSUE disable datapacks button in the world screen if no world is selected
2021-03-23 21:54:48 +01:00
Petr Mrázek
4b02b3f84a
NOISSUE add warning to the ATLauncher pack page
2021-03-21 20:34:28 +01:00
Petr Mrázek
1edcd9b86e
NOISSUE implement deleting skins
2021-02-11 02:23:00 +01:00
Jamie Mansfield
152d476f20
NOISSUE Add search to ATLauncher
2021-02-11 00:57:07 +00:00
Petr Mrázek
40bdb0ffd6
Merge pull request #3593 from jamierocks/atl/description-view
...
NOISSUE Show ATLauncher pack descriptions in text browser
2021-02-10 18:38:04 +01:00
Jamie Mansfield
6eabd336ee
NOISSUE Show FTB pack descriptions in text browser
2021-02-10 16:57:46 +00:00
