Increasing version, various small fixes.
Fixed launcher.js not checking the correct return value when verifying the configured Java executable. Removed debug logging from configmanager.js. Updated dependencies.
This commit is contained in:
4 files changed
+10
-10
No files matched your search
@@ -98,7 +98,6 @@ function validateKeySet(srcObj, destObj){
|
|||||||
}
|
}
|
||||||
const validationBlacklist = ['authenticationDatabase']
|
const validationBlacklist = ['authenticationDatabase']
|
||||||
const keys = Object.keys(srcObj)
|
const keys = Object.keys(srcObj)
|
||||||
console.log(keys)
|
|
||||||
for(let i=0; i<keys.length; i++){
|
for(let i=0; i<keys.length; i++){
|
||||||
if(typeof destObj[keys[i]] === 'undefined'){
|
if(typeof destObj[keys[i]] === 'undefined'){
|
||||||
destObj[keys[i]] = srcObj[keys[i]]
|
destObj[keys[i]] = srcObj[keys[i]]
|
||||||
|
|||||||
@@ -104,7 +104,8 @@ document.getElementById('launch_button').addEventListener('click', function(e){
|
|||||||
setLaunchPercentage(0, 100)
|
setLaunchPercentage(0, 100)
|
||||||
|
|
||||||
AssetGuard._validateJavaBinary(jExe).then((v) => {
|
AssetGuard._validateJavaBinary(jExe).then((v) => {
|
||||||
if(v){
|
console.log(v)
|
||||||
|
if(v.valid){
|
||||||
dlAsync()
|
dlAsync()
|
||||||
} else {
|
} else {
|
||||||
asyncSystemScan()
|
asyncSystemScan()
|
||||||
|
|||||||
Generated
+6
-6
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "westeroscraftlauncher",
|
"name": "westeroscraftlauncher",
|
||||||
"version": "0.0.1-alpha.3",
|
"version": "0.0.1-alpha.4",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -43,9 +43,9 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"adm-zip": {
|
"adm-zip": {
|
||||||
"version": "0.4.9",
|
"version": "0.4.11",
|
||||||
"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.9.tgz",
|
"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.11.tgz",
|
||||||
"integrity": "sha512-eknaJ3Io/JasGGinVeqY5TsPlQgHbiNlHnK5zdFPRNs9XRggDykKz8zPesneOMEZJxWji7G3CfsUW0Ds9Dw0Bw=="
|
"integrity": "sha512-L8vcjDTCOIJk7wFvmlEUN7AsSb8T+2JrdP7KINBjzr24TJ5Mwj590sLu3BC7zNZowvJWa/JtPmD8eJCzdtDWjA=="
|
||||||
},
|
},
|
||||||
"ajv": {
|
"ajv": {
|
||||||
"version": "5.5.2",
|
"version": "5.5.2",
|
||||||
@@ -743,12 +743,12 @@
|
|||||||
"resolved": "https://registry.npmjs.org/discord-rpc/-/discord-rpc-3.0.0-beta.10.tgz",
|
"resolved": "https://registry.npmjs.org/discord-rpc/-/discord-rpc-3.0.0-beta.10.tgz",
|
||||||
"integrity": "sha512-b0G6O0WJkxoLQSopyNRqByXCrpBL68HXPMULVZXLjRgj+sStwOmbABM+HwBDJWF6s/uhkB/+cAgq+19x4w0SPA==",
|
"integrity": "sha512-b0G6O0WJkxoLQSopyNRqByXCrpBL68HXPMULVZXLjRgj+sStwOmbABM+HwBDJWF6s/uhkB/+cAgq+19x4w0SPA==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"discord.js": "github:discordjs/discord.js#a732402c95438f5ddda20958e5c1b2360500069a",
|
"discord.js": "github:discordjs/discord.js#a5e8f05d01e34b69b80736688704ee594b4d0900",
|
||||||
"snekfetch": "^3.5.8"
|
"snekfetch": "^3.5.8"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"discord.js": {
|
"discord.js": {
|
||||||
"version": "github:discordjs/discord.js#a732402c95438f5ddda20958e5c1b2360500069a",
|
"version": "github:discordjs/discord.js#a5e8f05d01e34b69b80736688704ee594b4d0900",
|
||||||
"from": "github:discordjs/discord.js",
|
"from": "github:discordjs/discord.js",
|
||||||
"requires": {
|
"requires": {
|
||||||
"pako": "^1.0.0",
|
"pako": "^1.0.0",
|
||||||
|
|||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "westeroscraftlauncher",
|
"name": "westeroscraftlauncher",
|
||||||
"version": "0.0.1-alpha.3",
|
"version": "0.0.1-alpha.4",
|
||||||
"description": "Custom modded launcher for Westeroscraft",
|
"description": "Custom modded launcher for Westeroscraft",
|
||||||
"productName": "WesterosCraft Launcher",
|
"productName": "WesterosCraft Launcher",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
@@ -28,7 +28,7 @@
|
|||||||
},
|
},
|
||||||
"homepage": "http://www.westeroscraft.com/",
|
"homepage": "http://www.westeroscraft.com/",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"adm-zip": "^0.4.9",
|
"adm-zip": "^0.4.11",
|
||||||
"async": "^2.6.0",
|
"async": "^2.6.0",
|
||||||
"discord-rpc": "^3.0.0-beta.10",
|
"discord-rpc": "^3.0.0-beta.10",
|
||||||
"ejs": "^2.6.1",
|
"ejs": "^2.6.1",
|
||||||
|
|||||||
Reference in new issue
Block a user