Sebastian-byte
c908c1b5ef
Fix conflict
2021-07-23 16:34:31 -05:00
Jamie Mansfield
211cfb4af7
NOISSUE Disable Install Forge button on 1.17 (and above)
...
It appears that Minecraft Forge for Minecraft 1.17 will require setting
JVM arguments to operate, this is not currently possible with MultiMC's
meta.
Therefore, when Forge for 1.17 is released a solution will need to be
looked into.
2021-07-22 20:50:58 +01:00
Leland Liu
1762d2fc7d
Added total playtime
2021-07-22 20:26:59 +02:00
Petr Mrázek
9e9281f06e
Merge pull request #3728 from jamierocks/sort-languages
...
NOISSUE Sort languages alphabetically by their key
2021-07-22 18:15:46 +02:00
Sebastian-byte
59ffdc8ff6
Revert all the disaster
2021-07-13 19:50:52 -05:00
Sebastian-byte
869a92b2a2
Revert "Merge pull request #9 from MultiMC/develop"
...
This reverts commit ccc86e4e02 , reversing
changes made to 306c655ab5 .
2021-07-13 19:44:51 -05:00
Sebastían
5019fafeb7
Merge branch 'develop' into develop
2021-07-13 19:31:59 -05:00
Sebastían
ccc86e4e02
Merge pull request #9 from MultiMC/develop
...
Update MultiMC5 Base
2021-07-13 19:27:53 -05:00
Jamie Mansfield
74f5255eef
GH-3930 Track duration of previous game sessions
2021-07-13 17:01:53 +01:00
Jamie Mansfield
4401b9e137
NOISSUE Specify Imgur client ID at build time
2021-07-13 15:15:42 +01:00
Jamie Mansfield
20c393321c
NOISSUE Use constants for user agents
...
Here lies yet another early-stage move to debrand the MultiMC codebase,
as well as reducing the burden of updating strings across the codebase
for a future MultiMC6.
2021-07-13 15:15:33 +01:00
Sebastían
5c7e38135f
Merge branch 'MultiMC:develop' into develop
2021-07-06 19:52:27 -05:00
Jamie Mansfield
220971fadd
GH-1949 Allow ATLauncher pack downloads to be aborted
2021-07-06 15:22:41 +01:00
Jamie Mansfield
d5c4489313
GH-1949 Allow Technic pack downloads to be aborted
...
This supports both 'single zip' modpacks and Solder packs, through the
Technic mod platform page.
2021-07-06 15:22:26 +01:00
Jamie Mansfield
db392b4994
GH-1949 Allow modpacks.ch pack downloads to be aborted
2021-07-06 15:12:07 +01:00
Jamie Mansfield
d1a142f040
GH-1949 Allow Legacy FTB pack downloads to be aborted
...
It looks like this was just an mistake when implementing support for
legacy FTB.
2021-07-06 15:10:35 +01:00
Sebastían
ce90c2ec78
Merge branch 'MultiMC:develop' into develop
2021-07-01 20:04:00 -05:00
Jamie Mansfield
2e78b64058
NOISSUE Fix detection for 32-bit Azul or Bellsoft Java
...
Co-authored-by: Pedro Cunha <pedroagracio@gmail.com >
2021-06-30 00:54:19 +01:00
Jamie Mansfield
c15bd655f1
NOISSUE Cache file downloads for modpacks.ch
2021-06-28 22:36:32 +01:00
Jamie Mansfield
f51efc9109
NOISSUE Verify file checksums for modpacks.ch
2021-06-28 22:09:52 +01:00
Sebastian-byte
6d6218a21b
Fix indent in some other files
2021-06-25 20:00:40 -05:00
Sebastian-byte
9bc4a1241c
Fix indent
2021-06-25 19:46:20 -05:00
Sebastian-byte
b7ce6a63dc
Resolved merge conflict
2021-06-25 18:46:21 -05:00
Jamie Mansfield
a20a7e987f
NOISSUE Fail launch if minimum Java requirement is not met
...
This will fail launch in the following conditions:
1. A version greater than or equal to Minecraft 17w13a, and less than
21w19a - and the Java version is less than 8.
2. A version greater than or equal to Minecraft 21w19a - and the Java
version is less than 16.
2021-06-23 21:24:25 +01:00
Jamie Mansfield
7c0fdaa730
NOISSUE Check mod and config checksums for ATLauncher
2021-06-23 18:20:25 +01:00
Sebastían
42f29a9f29
Merge branch 'MultiMC:develop' into develop
2021-06-22 16:45:48 -05:00
Petr Mrázek
5479fbec92
Merge pull request #3819 from jamierocks/atl-optional-mods
...
NOISSUE Support ATLauncher optional mods
2021-06-22 19:55:53 +02:00
Colbie Dison
ba8af797a9
Add detection of manually installed JDKs in /opt
2021-06-22 11:56:05 -05:00
max
04f580b0bc
Fix launch offline
2021-06-22 11:22:30 +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
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
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
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
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
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
3390367d93
NOISSUE Support CurseForge modpacks using Fabric Loader
2021-06-09 20:49:26 +01: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
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
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