Freshmilkymilk
b815d396e0
Merge branch 'master' of https://github.com/diktatoria/HeliosLauncher into master
...
Conflicts:
app/assets/js/microsoft.js
app/assets/js/scripts/login.js
2021-02-06 14:07:01 -07:00
Dr_Dee
68879fa7eb
add login ad multiple account support
2021-02-05 16:49:36 +01:00
Dr_Dee
731f00acc9
add "Waiting on microsoft..."
2021-02-02 21:21:24 +01:00
Dr_Dee
3ebb71b368
Merge branch 'master' of https://github.com/diktatoria/HeliosLauncher
2021-02-02 14:52:48 +01:00
Dr_Dee
b4249e7108
make login window closable
2021-02-02 14:52:44 +01:00
DrDeee
1035318b42
replace launcher name in login.js
2021-02-02 12:41:03 +01:00
DrDeee
83ba7e00b1
replace launcher name in microsoft.js
2021-02-02 12:38:57 +01:00
Freshmilkymilk
b0395280ce
Bump to v1.8.2
2021-02-01 14:26:30 -07:00
Freshmilkymilk
b43f183ad2
Bump to v1.8.2
2021-02-01 14:23:55 -07:00
Freshmilkymilk
a75e70f9ac
Fix up some small things
2021-02-01 14:21:38 -07:00
Freshmilkymilk
d02d8f1da1
Add client ID
2021-02-01 14:06:02 -07:00
Freshmilkymilk
a81923eacc
Update launcher name to match ours
2021-02-01 13:56:24 -07:00
Freshmilkymilk
1f0008d444
Merge remote-tracking branch 'MS/master' into master
2021-02-01 13:53:04 -07:00
Freshmilkymilk
8ae8d0026f
Merge branch 'master' of https://github.com/dscalzi/HeliosLauncher into master
...
Conflicts:
README.md
2021-02-01 13:47:59 -07:00
Dr_Dee
efe3a4e643
remove specific client id
2021-01-31 14:29:53 +01:00
Dr_Dee
bcf44cfd52
MLS v2
2021-01-31 13:49:17 +01:00
Daniel Scalzi
a6ca2e800c
Update executable names on README.
2021-01-20 11:03:20 -05:00
Daniel Scalzi
779a9a54ec
Dependency upgrade.
2020-12-11 16:00:55 -05:00
Daniel Scalzi
8723a192b4
Minecraft.net status works again, dependency upgrade.
2020-12-09 20:06:10 -05:00
Daniel Scalzi
c93d4922a6
Electron 11, workaround for main process debugging in VS Code.
2020-11-16 23:11:24 -05:00
Daniel Scalzi
d48abf444c
Dependency upgrade.
2020-11-09 19:25:37 -05:00
Freshmilkymilk
6825de8af4
bump version for minor release
2020-09-24 21:22:25 -06:00
Michael Anderson
54f5eb41f5
Merge pull request #7 from dscalzi/master
...
Point to https mojang endpoint.
2020-09-24 17:52:36 -06:00
Daniel Scalzi
3ea41b42e5
Point to https mojang endpoint.
2020-09-16 13:49:10 -04:00
Freshmilkymilk
4374c326e8
Merge branch 'master' of https://github.com/dscalzi/HeliosLauncher into master
...
Conflicts:
app/landing.ejs
package-lock.json
package.json
2020-09-13 21:42:25 -06:00
Daniel Scalzi
faa5f5267b
v1.8.0
2020-09-13 13:42:34 -04:00
Daniel Scalzi
c0776dcf61
Set broken mojang services to green until their API is fixed.
2020-09-13 13:35:49 -04:00
Daniel Scalzi
25e7e5aa55
Tweaks to Java discovery.
...
Add AdoptOpenJDK directory to the file scan.
Remove TLS reject unauthorized flag.
Use async/await for the fs scan function. Code was originally wrote
using fs and not fs-extra.
2020-09-13 03:05:08 -04:00
Daniel Scalzi
17e36fa5a2
Return after rejection.
2020-09-13 02:22:24 -04:00
Daniel Scalzi
2156099ea8
Electron 10.
2020-09-13 02:10:11 -04:00
Michael Anderson
6fd2e187bc
Merge pull request #6 from dscalzi/master
...
Pull from upstream
2020-09-10 11:38:12 -06:00
Daniel Scalzi
9a2c1fd9b9
Use corretto on macOS since they use an older version of Xcode. ( #70 )
...
Vendor name is now displayed above the selected Java version on the settings page. This is to allow for easier differentiation between versions (ex. Amazon Corretto vs AdoptOpenJDK).
2020-09-08 23:19:07 -04:00
Daniel Scalzi
cc86f2a257
Use --fml.modLists instead of --fml.mods to avoid potential cli length limit issues.
2020-09-05 22:43:09 -04:00
Daniel Scalzi
e6897dad2c
Dependency upgrade.
2020-09-02 19:10:28 -04:00
Michael Anderson
fc967a330e
Merge pull request #5 from dscalzi/master
...
Update from upstream
2020-08-30 14:44:42 -06:00
Daniel Scalzi
bd19b16530
Include user's displayName in server joined regex.
2020-08-25 17:11:40 -04:00
Michael Anderson
44e6935ef8
Update README.md
2020-08-24 14:20:48 -06:00
Daniel Scalzi
46853157ec
Dependency upgrade.
2020-08-10 17:41:57 -04:00
Michael Anderson
8179cb5f12
merge from upstream
2020-07-29 20:10:16 -06:00
Michael Anderson
b99f75a666
remove mojang status from landing
2020-07-29 20:04:45 -06:00
Michael Anderson
9a8ad9da1a
clean up some stuff and remove reddit image stuff
2020-07-28 20:08:53 -06:00
Michael Anderson
6c86dcab47
fix up welcome message
2020-07-20 21:22:53 -06:00
Michael Anderson
a1c036eeba
Merge branch 'master' of https://github.com/ArdaCraft/ArdaCraftLauncher
2020-07-15 23:03:35 -06:00
Michael Anderson
0a39fcef62
change distro url
2020-07-15 23:03:24 -06:00
Daniel Scalzi
0203295e7c
Dependency upgrade.
2020-07-15 20:15:28 -04:00
Michael Anderson
0052190046
Update README.md
2020-07-15 08:29:21 -06:00
Michael Anderson
2cf53c6367
add background image because
2020-07-14 20:13:37 -06:00
Michael Anderson
cba3dab38a
bump version in package.json
2020-07-14 19:54:33 -06:00
Michael Anderson
ffd4ba633b
bump version
2020-07-14 19:45:45 -06:00
Michael Anderson
bc3594f76c
Merge branch 'master' of https://github.com/ArdaCraft/ArdaCraftLauncher
2020-07-14 19:37:51 -06:00
