mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2025-04-12 17:41:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update electron to v19 [ci-build]

Browse Source 
Fixes #1372
Fix scroll bar on tool bars in web app
This commit is contained in:
JannisX11 2022-07-02 19:35:32 +02:00
parent 157c061fb6
commit 59b1f0da5b
7 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
css/general.css
View File

@ -334,8 +334,8 @@
color: var(--color-text);
}
.tool i {
display: inline-block;
margin-top: 4px;
display: block;
margin: 4px auto;
}
.tool:active .icon {
padding-top: 1px;

2
index.html
View File

@ -26,7 +26,7 @@
<script>
if (typeof module === 'object') {window.module = module; module = undefined;}//jQuery Fix
const isApp = typeof require !== 'undefined';
const appVersion = '4.3.0-beta.0';
const appVersion = '4.3.0-beta.1';
if (localStorage.getItem('theme')) {

2
js/desktop.js
View File

@ -139,7 +139,7 @@ function addRecentProject(data) {
name: data.name,
path: data.path,
icon: data.icon,
favorite: former_entry.favorite ? former_entry.favorite : false,
favorite: former_entry ? former_entry.favorite : false,
day: new Date().dayOfYear()
}
recent_projects.splice(0, 0, project)

2
js/webpack/bundle.js
View File

File diff suppressed because one or more lines are too long

45
package-lock.json generated
View File

@ -1282,14 +1282,6 @@
"progress": "^2.0.3",
"semver": "^6.2.0",
"sumchecker": "^3.0.1"
},
"dependencies": {
"semver": {
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
}
}
},
"@electron/remote": {
@ -2877,20 +2869,20 @@
}
},
"electron": {
"version": "17.4.7",
"resolved": "https://registry.npmjs.org/electron/-/electron-17.4.7.tgz",
"integrity": "sha512-CMdUpd6oEwqbF7wcXwy9VNNXfTTbaeRg+zrGZciPzyzsEmJ9vzWcR1WpOxIQ4sIMjUyo1pFbvaD0VOgI2t4x3A==",
"version": "19.0.7",
"resolved": "https://registry.npmjs.org/electron/-/electron-19.0.7.tgz",
"integrity": "sha512-Wyg+oGkY8cWYmm8tVka6CZmhJxnyUx+Us2ALyWiY4w73+dO9XUNB/c7vQNIm1Uk/DLMn9vFzgvcS9YtOOMqpbg==",
"dev": true,
"requires": {
"@electron/get": "^1.13.0",
"@types/node": "^14.6.2",
"@electron/get": "^1.14.1",
"@types/node": "^16.11.26",
"extract-zip": "^1.0.3"
},
"dependencies": {
"@types/node": {
"version": "14.18.21",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.21.tgz",
"integrity": "sha512-x5W9s+8P4XteaxT/jKF0PSb7XEvo5VmqEWgsMlyeY4ZlLK8I6aH6g5TPPyDlLAep+GYf4kefb7HFyc7PAO3m+Q==",
"version": "16.11.42",
"resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.42.tgz",
"integrity": "sha512-iwLrPOopPy6V3E+1yHTpJea3bdsNso0b0utLOJJwaa/PLzqBt3GZl3stMcakc/gr89SfcNk2ki3z7Gvue9hYGQ==",
"dev": true
}
}
@ -3603,6 +3595,18 @@
"roarr": "^2.15.3",
"semver": "^7.3.2",
"serialize-error": "^7.0.1"
},
"dependencies": {
"semver": {
"version": "7.3.7",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
"dev": true,
"optional": true,
"requires": {
"lru-cache": "^6.0.0"
}
}
}
},
"global-dirs": {
@ -4944,11 +4948,10 @@
}
},
"semver": {
"version": "7.3.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
"integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
"dev": true,
"optional": true
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
},
"semver-compare": {
"version": "1.0.0",

4
package.json
View File

@ -1,7 +1,7 @@
{
"name": "Blockbench",
"description": "Low-poly modeling and animation software",
"version": "4.3.0-beta.0",
"version": "4.3.0-beta.1",
"license": "GPL-3.0-or-later",
"author": {
"name": "JannisX11",
@ -104,7 +104,7 @@
},
"devDependencies": {
"blockbench-types": "^4.0.0",
"electron": "^17.4.7",
"electron": "^19.0.7",
"electron-builder": "^23.0.3",
"electron-notarize": "^1.0.0",
"webpack": "^5.21.2",

2
service_worker.js
View File

File diff suppressed because one or more lines are too long