Skip to content

Commit 85838f9

Browse files
authored
Merge branch 'master' into dev/riknoll/convert-block
2 parents 015fca5 + 3007d9e commit 85838f9

6 files changed

Lines changed: 16 additions & 6 deletions

File tree

docs/courses/ucp-science.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The lesson series includes:
3333
* [Rocket Acceleration](/courses/ucp-science/rocket-acceleration)
3434
* [Egg Drop Experiment](/courses/ucp-science/egg-drop)
3535
* [Spoon Race](/courses/ucp-science/spoon-race)
36-
37-
The [Science Experiments](https://sites.google.com/view/utahcodingproject/csta/microbit-science-experiments) lesson series is generously provided by the [Utah Coding Project](https://sites.google.com/view/utahcodingproject/home) and is developed by [Carl Lyman](mailto:utahcoding@outlook.com).
36+
37+
The [Science Experiments](https://sites.google.com/view/utahcodingproject/microbits/microbit-science-experiments) lesson series is generously provided by the [Utah Coding Project](https://sites.google.com/view/utahcodingproject/home) and is developed by [Carl Lyman](mailto:utahcoding@outlook.com).
3838

3939
[![CC BY-NC-SA](https://licensebuttons.net/l/by-nc-sa/4.0/88x31.png)](https://creativecommons.org/licenses/by-nc-sa/4.0/)

docs/extensions/extension-gallery.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,14 @@ Many extensions are available to work with interface kits, add-on hardware, or o
577577

578578
```codecard
579579
[{
580+
"name": "PyoBot",
581+
"url":"/pkg/pyocodingcompany-crypto/pyobot-makecode",
582+
"cardType": "package"
583+
}, {
584+
"name": "Tobbie-II (Translated)",
585+
"url":"/pkg/Jim-no-surname-provided/pxt-tobbieII",
586+
"cardType": "package"
587+
}, {
580588
"name": "Siyeenove Pybit",
581589
"url":"/pkg/siyeenove/pxt_pybit",
582590
"cardType": "package"

docs/microbit-org/createai.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Projects to get learners started quickly with AI and machine learning on the mic
3232
}, {
3333
"name": "More about CreateAI",
3434
"description": "Explore AI on and offscreen with tools, resources and more.",
35-
"url": "https://microbit.org/ai/",
35+
"url": "https://microbit.org/createai/",
3636
"imageUrl":"/static/microbit-org/createai/more-about.png",
3737
"label": " ",
3838
"labelClass": "black microbit-ribbon large",

docs/projects/SUMMARY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
* [AI storytelling friend](https://microbit.org/projects/make-it-code-it/ai-storytelling-friend/)
150150
* [Simple AI exercise timer](https://microbit.org/projects/make-it-code-it/simple-ai-exercise-timer/)
151151
* [AI activity timer](https://microbit.org/projects/make-it-code-it/ai-activity-timer/)
152-
* [More about CreateAI](https://microbit.org/ai/)
152+
* [More about CreateAI](https://microbit.org/createai/)
153153
* [Courses](/courses)
154154
* [Intro to CS Online](/courses/csintro)
155155
* [Intro to CS Classroom](/courses/csintro-educator)

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pxt-microbit",
3-
"version": "8.1.10",
3+
"version": "8.1.12",
44
"description": "micro:bit target for Microsoft MakeCode (PXT)",
55
"keywords": [
66
"JavaScript",
@@ -46,7 +46,7 @@
4646
},
4747
"dependencies": {
4848
"pxt-common-packages": "13.2.3",
49-
"pxt-core": "12.3.5"
49+
"pxt-core": "12.3.7"
5050
},
5151
"overrides": {}
5252
}

targetconfig.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,8 @@
439439
"forward-education/pxt-coding-for-good": { "tags": [ "Science" ] },
440440
"dfrobot/pxt-dfrobot_huskylensv2": { "tags": [ "Science" ] },
441441
"steveturbek/pxt-rotary-encoder-ky-040-plus": { "tags": [ "Science" ] },
442+
"jim-no-surname-provided/pxt-tobbieii": { "tags": [ "Robotics" ] },
443+
"pyocodingcompany-crypto/pyobot-makecode": { "tags": [ "Robotics" ] },
442444
"microsoft/pxt-simx-sample": {
443445
"simx": {
444446
"sha": "7301f5900879b85127482d79bab48f03c25690a8",

0 commit comments

Comments
 (0)