Merge remote-tracking branch 'origin/master'

This commit is contained in:
Amerlander 2020-02-15 10:37:17 +01:00
commit 2ed28d725b
3 changed files with 11 additions and 6 deletions

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "pxt-calliope", "name": "pxt-calliope",
"version": "2.1.48", "version": "2.1.49",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "pxt-calliope", "name": "pxt-calliope",
"version": "2.1.48", "version": "2.1.49",
"description": "micro:bit target for Microsoft MakeCode (PXT)", "description": "micro:bit target for Microsoft MakeCode (PXT)",
"keywords": [ "keywords": [
"JavaScript", "JavaScript",
@ -45,7 +45,7 @@
"typescript": "^3.7.5" "typescript": "^3.7.5"
}, },
"dependencies": { "dependencies": {
"pxt-common-packages": "6.20.1", "pxt-common-packages": "6.21.5",
"pxt-core": "5.34.3" "pxt-core": "5.34.16"
} }
} }

View File

@ -421,7 +421,11 @@
"simScreenshotMaxUriLength": 300000, "simScreenshotMaxUriLength": 300000,
"importExtensionFiles": true, "importExtensionFiles": true,
"githubEditor": true, "githubEditor": true,
"tutorialBlocksDiff": true "tutorialBlocksDiff": true,
"python": true,
"pythonToolbox": true,
"chooseLanguageRestrictionOnNewProject": true,
"openProjectNewTab": true
}, },
"queryVariants": { "queryVariants": {
"hidemenu": { "hidemenu": {
@ -430,5 +434,6 @@
} }
} }
}, },
"disableDocsUpload": true "uploadDocs": false,
"uploadApiStringsBranchRx": "^(master|v[2-9]\\.\\d+\\.\\d+)$"
} }