mirror of
https://github.com/dscalzi/HeliosLauncher.git
synced 2024-12-22 19:52:14 -08:00
Compare commits
3 Commits
d7d0803661
...
ee61ea4979
Author | SHA1 | Date | |
---|---|---|---|
|
ee61ea4979 | ||
|
4e2c9ce3ec | ||
|
0bc74d9c66 |
@ -468,7 +468,7 @@ class ProcessBuilder {
|
|||||||
val = this.authUser.accessToken
|
val = this.authUser.accessToken
|
||||||
break
|
break
|
||||||
case 'user_type':
|
case 'user_type':
|
||||||
val = 'mojang'
|
val = this.authUser.type === 'microsoft' ? 'msa' : 'mojang'
|
||||||
break
|
break
|
||||||
case 'version_type':
|
case 'version_type':
|
||||||
val = this.versionData.type
|
val = this.versionData.type
|
||||||
@ -566,7 +566,7 @@ class ProcessBuilder {
|
|||||||
val = this.authUser.accessToken
|
val = this.authUser.accessToken
|
||||||
break
|
break
|
||||||
case 'user_type':
|
case 'user_type':
|
||||||
val = 'mojang'
|
val = this.authUser.type === 'microsoft' ? 'msa' : 'mojang'
|
||||||
break
|
break
|
||||||
case 'user_properties': // 1.8.9 and below.
|
case 'user_properties': // 1.8.9 and below.
|
||||||
val = '{}'
|
val = '{}'
|
||||||
|
@ -180,7 +180,11 @@ function saveSettingsValues(){
|
|||||||
if(v.type === 'number' || v.type === 'text'){
|
if(v.type === 'number' || v.type === 'text'){
|
||||||
// Special Conditions
|
// Special Conditions
|
||||||
if(cVal === 'JVMOptions'){
|
if(cVal === 'JVMOptions'){
|
||||||
sFn(v.value.split(' '))
|
if(!v.value.trim()) {
|
||||||
|
sFn([])
|
||||||
|
} else {
|
||||||
|
sFn(v.value.trim().split(/\s+/))
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
sFn(v.value)
|
sFn(v.value)
|
||||||
}
|
}
|
||||||
|
44
package-lock.json
generated
44
package-lock.json
generated
@ -28,9 +28,9 @@
|
|||||||
"winreg": "^1.2.4"
|
"winreg": "^1.2.4"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"electron": "^17.2.0",
|
"electron": "^18.0.1",
|
||||||
"electron-builder": "^22.14.13",
|
"electron-builder": "^22.14.13",
|
||||||
"eslint": "^8.11.0"
|
"eslint": "^8.12.0"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "16.x.x"
|
"node": "16.x.x"
|
||||||
@ -495,9 +495,9 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"node_modules/@types/node": {
|
"node_modules/@types/node": {
|
||||||
"version": "14.18.12",
|
"version": "16.11.26",
|
||||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.12.tgz",
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.26.tgz",
|
||||||
"integrity": "sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A=="
|
"integrity": "sha512-GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ=="
|
||||||
},
|
},
|
||||||
"node_modules/@types/plist": {
|
"node_modules/@types/plist": {
|
||||||
"version": "3.0.2",
|
"version": "3.0.2",
|
||||||
@ -1573,13 +1573,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/electron": {
|
"node_modules/electron": {
|
||||||
"version": "17.2.0",
|
"version": "18.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/electron/-/electron-17.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/electron/-/electron-18.0.1.tgz",
|
||||||
"integrity": "sha512-eNXhPVEUofkgAeqRFvTizzYecoCMyS0Rar08WZHSAw9wjfZXawYMvTpjjjk9GiX9W/+Cjxua4YtGn5bOTabc0A==",
|
"integrity": "sha512-8y3nxmK+v/tiuaR8yd4K83ApHxgomMIPAEl3J+2Jfv/D5G6M3KnvxNlNiNoTXI8uOegfmoqiDm5/2xlWFLzfLQ==",
|
||||||
"hasInstallScript": true,
|
"hasInstallScript": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@electron/get": "^1.13.0",
|
"@electron/get": "^1.13.0",
|
||||||
"@types/node": "^14.6.2",
|
"@types/node": "^16.11.26",
|
||||||
"extract-zip": "^1.0.3"
|
"extract-zip": "^1.0.3"
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
@ -1767,9 +1767,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/eslint": {
|
"node_modules/eslint": {
|
||||||
"version": "8.11.0",
|
"version": "8.12.0",
|
||||||
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.11.0.tgz",
|
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.12.0.tgz",
|
||||||
"integrity": "sha512-/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA==",
|
"integrity": "sha512-it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@eslint/eslintrc": "^1.2.1",
|
"@eslint/eslintrc": "^1.2.1",
|
||||||
@ -4869,9 +4869,9 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"@types/node": {
|
"@types/node": {
|
||||||
"version": "14.18.12",
|
"version": "16.11.26",
|
||||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.12.tgz",
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.26.tgz",
|
||||||
"integrity": "sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A=="
|
"integrity": "sha512-GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ=="
|
||||||
},
|
},
|
||||||
"@types/plist": {
|
"@types/plist": {
|
||||||
"version": "3.0.2",
|
"version": "3.0.2",
|
||||||
@ -5723,12 +5723,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"electron": {
|
"electron": {
|
||||||
"version": "17.2.0",
|
"version": "18.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/electron/-/electron-17.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/electron/-/electron-18.0.1.tgz",
|
||||||
"integrity": "sha512-eNXhPVEUofkgAeqRFvTizzYecoCMyS0Rar08WZHSAw9wjfZXawYMvTpjjjk9GiX9W/+Cjxua4YtGn5bOTabc0A==",
|
"integrity": "sha512-8y3nxmK+v/tiuaR8yd4K83ApHxgomMIPAEl3J+2Jfv/D5G6M3KnvxNlNiNoTXI8uOegfmoqiDm5/2xlWFLzfLQ==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@electron/get": "^1.13.0",
|
"@electron/get": "^1.13.0",
|
||||||
"@types/node": "^14.6.2",
|
"@types/node": "^16.11.26",
|
||||||
"extract-zip": "^1.0.3"
|
"extract-zip": "^1.0.3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -5877,9 +5877,9 @@
|
|||||||
"devOptional": true
|
"devOptional": true
|
||||||
},
|
},
|
||||||
"eslint": {
|
"eslint": {
|
||||||
"version": "8.11.0",
|
"version": "8.12.0",
|
||||||
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.11.0.tgz",
|
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.12.0.tgz",
|
||||||
"integrity": "sha512-/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA==",
|
"integrity": "sha512-it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"@eslint/eslintrc": "^1.2.1",
|
"@eslint/eslintrc": "^1.2.1",
|
||||||
|
@ -42,9 +42,9 @@
|
|||||||
"winreg": "^1.2.4"
|
"winreg": "^1.2.4"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"electron": "^17.2.0",
|
"electron": "^18.0.1",
|
||||||
"electron-builder": "^22.14.13",
|
"electron-builder": "^22.14.13",
|
||||||
"eslint": "^8.11.0"
|
"eslint": "^8.12.0"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
Loading…
Reference in New Issue
Block a user