External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-24 12:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,691 Commits 18 Branches 48 Tags
6df1be94dd3f092fb6d8fae23cf8847178dcf813
Commit Graph

758 Commits

Author SHA1 Message Date
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
Sebastian-byte
c1de58cb84 Revert "Replaced username writing with a proper dropdown selection saved in a file and ordered by last used" 
This reverts commit ec8ee53c76.
 2021-05-09 17:31:09 -05:00
Mateo Pidal
41c87bd403 Replaced standard C file writing to a QT standard 2021-05-04 02:27:03 -03:00
Mateo Pidal
f869518e3f fixed indentation errors 
Signed-off-by: Mateo Pidal <pidal.mateo@gmail.com>
 2021-05-04 02:08:44 -03:00
Mateo Pidal
0164d220f4 Fixed a little mistake 
Signed-off-by: Mateo Pidal <pidal.mateo@gmail.com>
 2021-05-03 17:35:47 -03:00
Mateo Pidal
1fd8dc8da0 Increased a little the performance on common cases of the dropdown list 
Signed-off-by: Mateo Pidal <pidal.mateo@gmail.com>
 2021-05-02 04:23:33 -03:00
Mateo Pidal
ec8ee53c76 Replaced username writing with a proper dropdown selection saved in a file and ordered by last used 2021-05-02 03:55:27 -03:00
Sebastian-byte
1832103973 Merge remote-tracking branch 'upstream/develop' into develop 2021-04-21 19:43:17 -05: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
Jamie Mansfield
3a1abb555b GH-3575 Fix build on Fedora 34 
Presumably this is caused by the bump to GCC 11 in Fedora 34. See
the error that did occur below...

    ./MultiMC5/application/KonamiCode.cpp: In member function ‘void KonamiCode::input(QEvent*)’:
    ./MultiMC5/application/KonamiCode.cpp:38:23: error: comparison of integer expressions of different signedness: ‘int’ and ‘std::array<Qt::Key, 10>::size_type’ {aka ‘long unsigned int’} [-Werror=sign-compare]
       38 |         if(m_progress == konamiCode.size())
          |            ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~
 2021-04-08 18:50:07 +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
Sebastian-byte
0fe770ceaa Merge remote-tracking branch 'upstream/develop' into develop 2021-04-05 17:29:18 -05:00
Petr Mrázek
e5804b1279 NOISSUE add some logging to the system theme determination logic 2021-04-04 21:19:49 +02:00
Sebastian-byte
38728bde86 Merge remote-tracking branch 'upstream/develop' into develop 2021-04-01 19:30:43 -05:00
Petr Mrázek
43cf647642 Revert "GH-3666 Fix multi-monitor dpi scaling on windows" 
This reverts commit 34bf688479.
 2021-03-28 19:46:01 +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
Petr Mrázek
adf2301b2a Merge pull request #3684 from KGB-8375/patch-1 
GH-3666 Fix multi-monitor dpi scaling on windows
 2021-03-26 20:36:28 +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
KGB-8375
34bf688479 GH-3666 Fix multi-monitor dpi scaling on windows 
Disable qt 5.6 DPI scaling and use windows' builtin DPI scaling, which works much better on multi-monitor setups
 2021-03-26 09:54:28 -04: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
b8ee9a2a8e NOISSUE update ubuntu packaging bits 2021-03-26 01:48:37 +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
Zakhar Afonin
a10c30134a Merge pull request #12 from MultiMC/develop 
we do a little sync
 2021-03-22 12:34:05 +03:00
Petr Mrázek
4b02b3f84a NOISSUE add warning to the ATLauncher pack page 2021-03-21 20:34:28 +01:00
Sebastian-byte
2c225a552a Merge remote-tracking branch 'upstream/develop' into develop 2021-02-12 12:20:47 -05: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