Altarik/Launcher
4
0
Fork 0
mirror of https://github.com/AltarikMC/Launcher synced 2024-11-25 06:49:51 +01:00
Code

Merge pull request #33 from AltarikMC/dependabot/npm_and_yarn/electron-13.1.4

Browse Source 
Bump electron from 13.1.1 to 13.1.4
This commit is contained in:
Quentin Legot 2021-07-01 21:01:27 +02:00 committed by GitHub
commit c41c73c985
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package-lock.json generated
View File

@ -1660,9 +1660,9 @@
} }
}, },
"electron": { "electron": {
"version": "13.1.1", "version": "13.1.4",
"resolved": "https://registry.npmjs.org/electron/-/electron-13.1.1.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-13.1.4.tgz",
"integrity": "sha512-kySSb5CbIkWU2Kd9mf2rpGZC9p1nWhVVNl+CJjuOUGeVPXHbojHvTkDU1iC8AvV28eik3gqHisSJss40Caprog==", "integrity": "sha512-4qhRZbRvGqHmMWsCG/kRVF4X8VIq9Nujgm+gXZLBSpiR6uUtMHy7ViBTQZl1PGf6O9Ppxhpr9Yz+k6Um9WoP3Q==",
"dev": true, "dev": true,
"requires": { "requires": {
"@electron/get": "^1.0.1", "@electron/get": "^1.0.1",
@ -1671,9 +1671,9 @@
}, },
"dependencies": { "dependencies": {
"@types/node": { "@types/node": {
"version": "14.17.2", "version": "14.17.4",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.2.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.4.tgz",
"integrity": "sha512-sld7b/xmFum66AAKuz/rp/CUO8+98fMpyQ3SBfzzBNGMd/1iHBTAg9oyAvcYlAj46bpc74r91jSw2iFdnx29nw==", "integrity": "sha512-8kQ3+wKGRNN0ghtEn7EGps/B8CzuBz1nXZEIGGLP2GnwbqYn4dbTs7k+VKLTq1HvZLRCIDtN3Snx1Ege8B7L5A==",
"dev": true "dev": true
}, },
"debug": { "debug": {

2
package.json
View File

@ -27,7 +27,7 @@
"@electron-forge/cli": "^6.0.0-beta.57", "@electron-forge/cli": "^6.0.0-beta.57",
"@electron-forge/maker-squirrel": "^6.0.0-beta.57", "@electron-forge/maker-squirrel": "^6.0.0-beta.57",
"@electron-forge/maker-zip": "^6.0.0-beta.57", "@electron-forge/maker-zip": "^6.0.0-beta.57",
"electron": "^13.1.1" "electron": "^13.1.4"
}, },
"dependencies": { "dependencies": {
"axios": "^0.21.1", "axios": "^0.21.1",

12
src/client/assets/js/index.js
View File

@ -21,9 +21,9 @@ document.body.onload = () => {
minMem.max = totalMem minMem.max = totalMem
maxMem.max = totalMem maxMem.max = totalMem
minMem.value = localStorage.getItem("minMem") != null ? localStorage.getItem("minMem") : 1024 minMem.value = localStorage.getItem("minMem") != null ? localStorage.getItem("minMem") : 1024
outputMinMem.innerHTML = minMem.value outputMinMem.textContent = minMem.value
maxMem.value = localStorage.getItem("maxMem") != null ? localStorage.getItem("maxMem") : 2048 maxMem.value = localStorage.getItem("maxMem") != null ? localStorage.getItem("maxMem") : 2048
outputMaxMem.innerHTML = maxMem.value outputMaxMem.textContent = maxMem.value
demandModsInformations() demandModsInformations()
} }
@ -134,10 +134,10 @@ disconnectBtn.addEventListener('click', e => {
ipcRenderer.send('disconnect') ipcRenderer.send('disconnect')
}) })
minMem.addEventListener("input", (e) => { minMem.addEventListener("input", e => {
outputMinMem.innerHTML = e.target.value outputMinMem.textContent = e.target.value
}) })
maxMem.addEventListener("input", (e) => { maxMem.addEventListener("input", e => {
outputMaxMem.innerHTML = e.target.value outputMaxMem.textContent = e.target.value
}) })