Merge branch 'master' of https://github.com/dscalzi/HeliosLauncher into master

 Conflicts:
	README.md
This commit is contained in:
Freshmilkymilk 2021-02-01 13:47:59 -07:00
commit 8ae8d0026f
No known key found for this signature in database
GPG Key ID: B210214726522691
4 changed files with 288 additions and 341 deletions

View File

@ -55,7 +55,7 @@ If you download from the [Releases](https://github.com/ArdaCraft/ArdaCraftLaunch
| -------- | ---- |
| Windows x64 | `ardacraftlauncher-setup-VERSION.exe` |
| macOS | `ardacraftlauncher-VERSION.dmg` |
| Linux x64 | `ardacraftlauncher-VERSION-x86_64.AppImage` |
| Linux x64 | `ardacraftlauncher-setup-VERSION.AppImage` |
## Console
@ -137,13 +137,9 @@ Paste the following into `.vscode/launch.json`
"type": "node",
"request": "launch",
"cwd": "${workspaceFolder}",
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
"windows": {
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd"
},
"args": ["."],
"console": "integratedTerminal",
"protocol": "inspector"
"program": "${workspaceFolder}/node_modules/electron/cli.js",
"args" : ["."],
"outputCapture": "std"
},
{
"name": "Debug Renderer Process",

View File

@ -173,8 +173,8 @@ const refreshMojangStatuses = async function(){
for(let i=0; i<statuses.length; i++){
const service = statuses[i]
// Mojang API is broken for these two. https://bugs.mojang.com/browse/WEB-2303
if(service.service === 'sessionserver.mojang.com' || service.service === 'minecraft.net') {
// Mojang API is broken for sessionserver. https://bugs.mojang.com/browse/WEB-2303
if(service.service === 'sessionserver.mojang.com') {
service.status = 'green'
}

597
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -25,25 +25,25 @@
"node": "12.x.x"
},
"dependencies": {
"adm-zip": "^0.4.16",
"adm-zip": "^0.5.1",
"async": "^3.2.0",
"discord-rpc": "^3.1.4",
"ejs": "^3.1.5",
"ejs-electron": "^2.1.1",
"electron-updater": "^4.3.4",
"electron-updater": "^4.3.5",
"fs-extra": "^9.0.1",
"github-syntax-dark": "^0.5.0",
"jquery": "^3.5.1",
"request": "^2.88.2",
"semver": "^7.3.2",
"tar-fs": "^2.1.0",
"semver": "^7.3.4",
"tar-fs": "^2.1.1",
"winreg": "^1.2.4"
},
"devDependencies": {
"cross-env": "^7.0.2",
"electron": "^10.1.2",
"electron-builder": "^22.8.0",
"eslint": "^7.9.0"
"cross-env": "^7.0.3",
"electron": "^11.0.5",
"electron-builder": "^22.9.1",
"eslint": "^7.15.0"
},
"repository": {
"type": "git",