4
0
mirror of https://github.com/AltarikMC/Launcher synced 2024-11-24 06:39:50 +01:00

Merge branch 'master' into microsoft-auth

This commit is contained in:
Quentin Legot 2021-08-29 14:18:02 +02:00 committed by GitHub
commit ba8b4b1bff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 53 additions and 53 deletions

18
package-lock.json generated
View File

@ -1649,9 +1649,9 @@
}
},
"electron": {
"version": "13.1.9",
"resolved": "https://registry.npmjs.org/electron/-/electron-13.1.9.tgz",
"integrity": "sha512-By4Zb72XNQLrPb70BXdIW3NtEHFwybP5DIQjohnCxOYONq5vojuHjNcTuWnBgMvwQ2qwykk6Tw5EwF2Pt0CWjA==",
"version": "13.2.1",
"resolved": "https://registry.npmjs.org/electron/-/electron-13.2.1.tgz",
"integrity": "sha512-/K0Uw+o3+phbHtrVL6qDFVJqmeRF6EIPwVeUHEH5R8JNy13f4X3RouKjQzVyY/Os8fEqYHGFONWhD6q6g750HQ==",
"dev": true,
"requires": {
"@electron/get": "^1.0.1",
@ -1660,9 +1660,9 @@
},
"dependencies": {
"@types/node": {
"version": "14.17.9",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.9.tgz",
"integrity": "sha512-CMjgRNsks27IDwI785YMY0KLt3co/c0cQ5foxHYv/shC2w8oOnVwz5Ubq1QG5KzrcW+AXk6gzdnxIkDnTvzu3g==",
"version": "14.17.11",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.11.tgz",
"integrity": "sha512-n2OQ+0Bz6WEsUjrvcHD1xZ8K+Kgo4cn9/w94s1bJS690QMUWfJPW/m7CCb7gPkA1fcYwL2UpjXP/rq/Eo41m6w==",
"dev": true
},
"debug": {
@ -3386,9 +3386,9 @@
"dev": true
},
"minecraft-launcher-core": {
"version": "3.16.8",
"resolved": "https://registry.npmjs.org/minecraft-launcher-core/-/minecraft-launcher-core-3.16.8.tgz",
"integrity": "sha512-0amflttrl/Ad+Q7DSPXbWYRdUdTCquZB+H/K/JbU6ZAx4VwfjSa08ancEYDktAlEBUwswzhiEpkf+Xgs0PWWng==",
"version": "3.16.7",
"resolved": "https://registry.npmjs.org/minecraft-launcher-core/-/minecraft-launcher-core-3.16.7.tgz",
"integrity": "sha512-g1EbjLbd0fZGE0XbjVbCuL+/OGZi6S+alObXBEov4EtqMD2e1vC6YKtGRWewJ5ydl8LL1d0RF6Gp9rzGXwtpfg==",
"requires": {
"adm-zip": "^0.4.13",
"checksum": "^0.1.1",

View File

@ -1,44 +1,44 @@
{
"name": "altarik-launcher",
"author": "Altarik",
"version": "0.4.1",
"description": "Altarik Launcher",
"main": "src/server/main.js",
"repository": "AltarikMC/Launcher",
"bugs": "https://github.com/AltarikMC/Launcher/issues",
"keywords": [],
"contributors": [
"SexiestCHiba"
],
"maintainers": [
"SexiestCHiba"
],
"os": [
"win32"
],
"license": "BSD-3-Clause",
"scripts": {
"start": "electron-forge start",
"test": "electron .",
"package": "electron-forge package",
"make": "electron-forge make"
},
"devDependencies": {
"@electron-forge/cli": "^6.0.0-beta.59",
"@electron-forge/maker-squirrel": "^6.0.0-beta.59",
"electron": "^13.1.9"
},
"dependencies": {
"axios": "^0.21.1",
"electron-is-dev": "^2.0.0",
"electron-log": "^4.4.1",
"electron-squirrel-startup": "^1.0.0",
"extract-zip": "^2.0.1",
"hasha": "^5.2.2",
"minecraft-launcher-core": "^3.16.7",
"msmc": "^2.2.0"
},
"config": {
"forge": "./config.forge.js"
}
}
{
"name": "altarik-launcher",
"author": "Altarik",
"version": "0.4.1",
"description": "Altarik Launcher",
"main": "src/server/main.js",
"repository": "AltarikMC/Launcher",
"bugs": "https://github.com/AltarikMC/Launcher/issues",
"keywords": [],
"contributors": [
"SexiestCHiba"
],
"maintainers": [
"SexiestCHiba"
],
"os": [
"win32"
],
"license": "BSD-3-Clause",
"scripts": {
"start": "electron-forge start",
"test": "electron .",
"package": "electron-forge package",
"make": "electron-forge make"
},
"devDependencies": {
"@electron-forge/cli": "^6.0.0-beta.59",
"@electron-forge/maker-squirrel": "^6.0.0-beta.59",
"electron": "^13.2.1"
},
"dependencies": {
"axios": "^0.21.1",
"electron-is-dev": "^2.0.0",
"electron-log": "^4.4.1",
"electron-squirrel-startup": "^1.0.0",
"extract-zip": "^2.0.1",
"hasha": "^5.2.2",
"minecraft-launcher-core": "^3.16.7",
"msmc": "^2.2.0"
},
"config": {
"forge": "./config.forge.js"
}
}