Commit Graph

250 Commits

Author SHA1 Message Date
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
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
8723a192b4
Minecraft.net status works again, dependency upgrade. 2020-12-09 20:06:10 -05: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
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
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
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
9a8ad9da1a clean up some stuff and remove reddit image stuff 2020-07-28 20:08:53 -06:00
Michael Anderson
0a39fcef62 change distro url 2020-07-15 23:03:24 -06:00
Michael Anderson
fcef514ca1 update vars 2020-07-14 19:37:21 -06:00
Michael Anderson
ae398a06af make background come from reddit. Need to add some checks but it works 2020-07-11 12:44:33 -06:00
Michael Anderson
b6c93ecda9 Merge branch 'master' of https://github.com/ArdaCraft/ArdaCraftLauncher 2020-07-10 22:37:47 -06:00
Michael Anderson
5d6deb7c70 update icons 2020-07-10 22:37:23 -06:00
Michael Anderson
65ada67d30
Merge pull request #2 from dscalzi/master
MD5 comparisons should be case insensitive.
2020-07-09 09:15:23 -06:00
Daniel Scalzi
6b755fef15
MD5 comparisons should be case insensitive. 2020-07-07 22:47:22 -04:00
Michael Anderson
560172f556 init base launcher 2020-07-07 19:44:59 -06:00
Daniel Scalzi
eeaa2e98d0
Update RPC game joined regex. (closes #80) 2020-06-29 11:28:55 -04:00
Daniel Scalzi
bec1385c55
Fix bug in autoconnect check. 2020-06-29 10:31:05 -04:00
Daniel Scalzi
f795b28d23
Fix launching on 1.8.9 and 1.9.4 (resolves #79). 2020-06-23 15:03:17 -04:00
Daniel Scalzi
b09cd2ef28
Re-enable --server and --port on patched 1.15.2 builds. (#74) 2020-06-12 19:56:57 -04:00
Daniel Scalzi
1bdb413ab5
Fix autoconnect for 1.13, 1.14. Disabled on 1.15+.
Autoconnect is causing a OpenGL stack overflow exception on 1.15+ for some reason. Disabled it for now.
Finally changed .westeroscraft to .helioslauncher.
2020-06-09 13:10:06 -04:00
Daniel Scalzi
71b25d3e5c
Minor fixes and improvements.
Fixed issue with passing fullscreen argment to 1.13+, although it doesnt seem to be working well clientside.
Improved the forge version check logic.
Fixed launch area toggling and added a min linger time so that the transition doesnt look abrupt.
Upgraded dependencies.
2020-06-08 14:00:07 -04:00
Daniel Scalzi
7f821f36d7
Add support for 1.12.2 compiled with ForgeGradle 3. (#73)
The latest 1.12.2 builds have been upgraded to ForgeGradle 3. Handling is slighly different, as the version.json
format is different and no longer stored in the universal jar. You have to provide the version.json as a VersionManifest
module, the same as 1.13+. The rest of the launch handling hasn't changed.

Nebula supports the new 1.12.2 format.
2020-06-02 19:30:12 -04:00
Daniel Scalzi
8726638a23
Electron 9, Fixed breaking changes from 7 and 8.
Fixed file selectors not behaving properly due to breaking change in Electron 7 (#67).
Renamed shell.openItem to shell.openPath (Electron 9 breaking change).

Resolves #67.
2020-05-21 21:02:58 -04:00
Daniel Scalzi
b3f8ff9595 Fix dmg executable name. 2020-05-19 20:31:35 -04:00
VolanDeVovan
9d1aa497a7
Send across ipc only unique value (#56)
* Send across ipc only unique value

* Fix equality check.

Co-authored-by: Daniel Scalzi <d_scalzi@yahoo.com>
2020-04-11 20:44:20 -04:00
Daniel Scalzi
141a753893
Electron 8. 2020-03-18 19:54:46 -04:00
Daniel Scalzi
1a2e9f3be4
Ensure libs are properly added to classpath as .jar 2020-03-08 21:10:43 -04:00
Daniel Scalzi
96db607912
Fix mod loading for 1.7.10.
The launcher was never intended for use with 1.7.10, however since people
do use it for this version I generated a 1.7.10 distribution with Nebula
and tested it out. Several bugs were identified and fixed.

* Don't prefix modList paths with absolute on 1.7.10.
* Allow library overrides.

Forge 1.7.10 updates mojang's guava version. As such the library
resolver now supports overriding mojang libraries through the
distribution.json.

Fixes #45.
2020-01-18 12:02:00 -05:00
Daniel Scalzi
19ee187f10
Electron v7, dependency upgrade, lint. 2019-11-16 17:17:55 -05:00
Oskar Stawiarski
9761c1d9d0 Older forge versions don't support lenient json. (#40) 2019-11-16 17:02:00 -05:00