diff --git a/app/assets/distribution.json b/app/assets/distribution.json index 27a4805a..4d2effbc 100644 --- a/app/assets/distribution.json +++ b/app/assets/distribution.json @@ -1335,16 +1335,6 @@ "url": "" } }, - { - "id": "1.13.2-forge-25.0.63", - "name": "Minecraft Forge (version.jar)", - "type": "VersionJar", - "artifact": { - "size": 16089640, - "MD5": "0d20673fc03f9c6a60279146ee1b1a14", - "url": "" - } - }, { "id": "1.13.2-forge-25.0.63", "name": "Minecraft Forge (version.json)", diff --git a/app/assets/images/SealCircle.ico b/app/assets/images/SealCircle.ico new file mode 100644 index 00000000..e37b95df Binary files /dev/null and b/app/assets/images/SealCircle.ico differ diff --git a/app/assets/images/WesterosSealSquare_old.png b/app/assets/images/WesterosSealSquare_old.png deleted file mode 100644 index 076018cb..00000000 Binary files a/app/assets/images/WesterosSealSquare_old.png and /dev/null differ diff --git a/app/assets/js/assetguard.js b/app/assets/js/assetguard.js index ce49a15e..c0de4ae1 100644 --- a/app/assets/js/assetguard.js +++ b/app/assets/js/assetguard.js @@ -1407,10 +1407,10 @@ class AssetGuard extends EventEmitter { const type = ob.getType() if(type === DistroManager.Types.ForgeHosted || type === DistroManager.Types.Forge){ if(Util.mcVersionAtLeast('1.13', server.getMinecraftVersion())){ + // Read Manifest for(let sub of ob.getSubModules()){ if(sub.getType() === DistroManager.Types.VersionManifest){ - const versionFile = path.join(self.commonPath, 'versions', sub.getIdentifier(), `${sub.getIdentifier()}.json`) - resolve(JSON.parse(fs.readFileSync(versionFile, 'utf-8'))) + resolve(JSON.parse(fs.readFileSync(sub.getArtifact().getPath(), 'utf-8'))) return } } diff --git a/app/assets/js/distromanager.js b/app/assets/js/distromanager.js index 6b812ab5..400d6150 100644 --- a/app/assets/js/distromanager.js +++ b/app/assets/js/distromanager.js @@ -190,9 +190,6 @@ class Module { case exports.Types.VersionManifest: this.artifact.path = path.join(ConfigManager.getCommonDirectory(), 'versions', this.getIdentifier(), `${this.getIdentifier()}.json`) break - case exports.Types.VersionJar: - this.artifact.path = path.join(ConfigManager.getCommonDirectory(), 'versions', this.getIdentifier(), `${this.getIdentifier()}.jar`) - break case exports.Types.File: default: this.artifact.path = path.join(ConfigManager.getInstanceDirectory(), serverid, pth) diff --git a/package-lock.json b/package-lock.json index 0934c30f..1b829959 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,9 +31,9 @@ } }, "@types/node": { - "version": "10.12.27", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.27.tgz", - "integrity": "sha512-e9wgeY6gaY21on3ve0xAjgBVjGDWq/xUteK0ujsE53bUoxycMkqfnkUgMt6ffZtykZ5X12Mg3T7Pw4TRCObDKg==", + "version": "10.12.30", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.30.tgz", + "integrity": "sha512-nsqTN6zUcm9xtdJiM9OvOJ5EF0kOI8f1Zuug27O/rgtxCRJHGqncSWfCMZUP852dCKPsDsYXGvBhxfRjDBkF5Q==", "dev": true }, "acorn": { @@ -806,9 +806,9 @@ } }, "electron": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/electron/-/electron-4.0.6.tgz", - "integrity": "sha512-r2ow/EmDibjoCNJp35mB1CcPs2xBF9fp2eoWuUOJmpVQyzdba6EnqsSD1BxwXzF9vQ5WkQ2UbfXBIvpomrdioQ==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/electron/-/electron-4.0.7.tgz", + "integrity": "sha512-KYQ9SJZFWNKqoq6XjKW1bLFHjmAGeSC3XNuhHK/Sd2MK5H5sO3iKjvZU/YhiBUtkB/cBSkOdQTVEaLcMwU8l3A==", "dev": true, "requires": { "@types/node": "^10.12.18", @@ -995,9 +995,9 @@ "dev": true }, "eslint": { - "version": "5.14.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.14.1.tgz", - "integrity": "sha512-CyUMbmsjxedx8B0mr79mNOqetvkbij/zrXnFeK2zc3pGRn3/tibjiNAv/3UxFEyfMDjh+ZqTrJrEGBFiGfD5Og==", + "version": "5.15.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.15.1.tgz", + "integrity": "sha512-NTcm6vQ+PTgN3UBsALw5BMhgO6i5EpIjQF/Xb5tIh3sk9QhrFafujUOczGz4J24JBlzWclSB9Vmx8d+9Z6bFCg==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -1006,7 +1006,7 @@ "cross-spawn": "^6.0.5", "debug": "^4.0.1", "doctrine": "^3.0.0", - "eslint-scope": "^4.0.0", + "eslint-scope": "^4.0.2", "eslint-utils": "^1.3.1", "eslint-visitor-keys": "^1.0.0", "espree": "^5.0.1", @@ -1056,9 +1056,9 @@ } }, "eslint-scope": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz", - "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.2.tgz", + "integrity": "sha512-5q1+B/ogmHl8+paxtOKx38Z8LtWkVGuNt3+GQNErqwLl6ViNp/gdJGMCjZNxZ8j/VYjDNZ2Fo+eQc1TAVPIzbg==", "dev": true, "requires": { "esrecurse": "^4.1.0", diff --git a/package.json b/package.json index e66281f4..07e6e6f5 100644 --- a/package.json +++ b/package.json @@ -41,9 +41,9 @@ }, "devDependencies": { "cross-env": "^5.2.0", - "electron": "^4.0.6", + "electron": "^4.0.7", "electron-builder": "^20.38.5", - "eslint": "^5.14.1" + "eslint": "^5.15.1" }, "repository": { "type": "git",