Merge pull request #4492 from LLK/develop

Re-pull develop into release to get new gui.

package-lock.json

@@ -4128,9 +4128,9 @@
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001142",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001142.tgz",
-      "integrity": "sha512-pDPpn9ankEpBFZXyCv2I4lh1v/ju+bqb78QfKf+w9XgDAFWBwSYPswXqprRdrgQWK0wQnpIbfwRjNHO1HWqvoQ==",
+      "version": "1.0.30001144",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001144.tgz",
+      "integrity": "sha512-4GQTEWNMnVZVOFG3BK0xvGeaDAtiPAbG2N8yuMXuXzx/c2Vd4XoMPO8+E918zeXn5IF0FRVtGShBfkfQea2wHQ==",
       "dev": true
     },
     "canvas-toBlob": {
@@ -17607,9 +17607,9 @@
       }
     },
     "scratch-blocks": {
-      "version": "0.1.0-prerelease.20200923031615",
-      "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20200923031615.tgz",
-      "integrity": "sha512-CXKQ9+lfumfIGTyWHpx/SI19NfSVHQX3FKq4dj/BIlHpUdxh/utyj6c1K+5a0g7eIF/gWZ+EyhL2GiXrlnWc9Q==",
+      "version": "0.1.0-prerelease.20201007031713",
+      "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20201007031713.tgz",
+      "integrity": "sha512-94MaPUOcOEGE9lcUxgRtJG/g8I4E6GCtfCcxBlBL/yUHWDYs2AInbBRbHOL/GLZHEjyYLIjqW5NapWAlwBMKkA==",
       "dev": true,
       "requires": {
         "exports-loader": "0.6.3",
@@ -17617,9 +17617,9 @@
       }
     },
     "scratch-gui": {
-      "version": "0.1.0-prerelease.20201001151313",
-      "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201001151313.tgz",
-      "integrity": "sha512-Di17Da5r3/qo3vzLuNgXl1KzXM/igEUoV6uwCk8qTPsMyyogNrebAolsQb1JxQXGcthVViK/v86J3DYbZcx+LA==",
+      "version": "0.1.0-prerelease.20201007191300",
+      "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201007191300.tgz",
+      "integrity": "sha512-u+TBIH+JW2YnIJVYBbf260yQIGrbbYLnwI0YXCZjRJ8lrQKzFztp5yiisM2P1mSsnb1wdwsbIaNDVYVt+sZ9mw==",
       "dev": true,
       "requires": {
         "arraybuffer-loader": "^1.0.6",
@@ -17670,8 +17670,8 @@
         "redux": "3.7.2",
         "redux-throttle": "0.1.1",
         "scratch-audio": "0.1.0-prerelease.20200528195344",
-        "scratch-blocks": "0.1.0-prerelease.20200923031615",
-        "scratch-l10n": "3.10.20200923030814",
+        "scratch-blocks": "0.1.0-prerelease.20201007031713",
+        "scratch-l10n": "3.10.20201007030856",
         "scratch-paint": "0.2.0-prerelease.20200831213104",
         "scratch-render": "0.1.0-prerelease.20200827214414",
         "scratch-storage": "1.3.3",
@@ -17872,9 +17872,9 @@
           }
         },
         "electron-to-chromium": {
-          "version": "1.3.576",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.576.tgz",
-          "integrity": "sha512-uSEI0XZ//5ic+0NdOqlxp0liCD44ck20OAGyLMSymIWTEAtHKVJi6JM18acOnRgUgX7Q65QqnI+sNncNvIy8ew==",
+          "version": "1.3.578",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.578.tgz",
+          "integrity": "sha512-z4gU6dA1CbBJsAErW5swTGAaU2TBzc2mPAonJb00zqW1rOraDo2zfBMDRvaz9cVic+0JEZiYbHWPw/fTaZlG2Q==",
           "dev": true
         },
         "file-loader": {
@@ -18165,18 +18165,6 @@
           "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
           "dev": true
         },
-        "scratch-l10n": {
-          "version": "3.10.20200923030814",
-          "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20200923030814.tgz",
-          "integrity": "sha512-dx+FRI4/DiKcC2DwVspqbhYlK6xAOLTSljF59lTOSLGlJiUPH9C1Z5RW1IkECgZcc8kH85f8jEPe+nknI5hNwQ==",
-          "dev": true,
-          "requires": {
-            "@babel/cli": "^7.1.2",
-            "@babel/core": "^7.1.2",
-            "babel-plugin-react-intl": "^3.0.1",
-            "transifex": "1.6.6"
-          }
-        },
         "scratch-storage": {
           "version": "1.3.3",
           "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.3.tgz",
@@ -18250,9 +18238,9 @@
       }
     },
     "scratch-l10n": {
-      "version": "3.10.20200930030848",
-      "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20200930030848.tgz",
-      "integrity": "sha512-le0rADSsH4Tw30XjcQF3IcQ1VKcpB/KFRUUT2Uo8/y5az0G3cf4ksL7mo8qu2AO47EGOLC/Mrztt6neaYVN86Q==",
+      "version": "3.10.20201007030856",
+      "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201007030856.tgz",
+      "integrity": "sha512-VEOh3az+rU7GNi5rpG2n4kp75DMi+B/YBrEt4N6/tYl02XY2AF6PK1vsaRgq7zR0SZ+mIBDiAG2iYjtEAh3fsQ==",
       "dev": true,
       "requires": {
         "@babel/cli": "^7.1.2",
@@ -19342,9 +19330,9 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "7.4.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz",
-          "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==",
+          "version": "7.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
           "dev": true
         },
         "duplexer2": {

package.json

@@ -128,7 +128,7 @@
     "redux-mock-store": "^1.2.3",
     "redux-thunk": "2.0.1",
     "sass-loader": "6.0.6",
-    "scratch-gui": "0.1.0-prerelease.20201001151313",
+    "scratch-gui": "0.1.0-prerelease.20201007191300",
     "scratch-l10n": "latest",
     "selenium-webdriver": "3.6.0",
     "slick-carousel": "1.6.0",