Skip to content

Commit conflict #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
neonerz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Commit conflict #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb4ce7d
Update pxt.json, blocks/hai2025/wood1.md, blocks/hai2025/wood2.md, bl…
neonerz Oct 24, 2025
71b59d6
Merge branch 'master' into merge-1
neonerz Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion blocks/hai2025/comfort1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ hai.trainingStart(function () {


```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion blocks/hai2025/comfort2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ hai.trainingStart(function () {


```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion blocks/hai2025/crafting1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ hai.trainingStart(function () {
```

```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion blocks/hai2025/crafting2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ hai.trainingStart(function () {


```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion blocks/hai2025/crafting3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@ hai.trainingStart(function () {


```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion blocks/hai2025/crafting4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ hai.trainingStart(function () {

```
```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion blocks/hai2025/light1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ hai.trainingStart(function () {
})
```
```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion blocks/hai2025/light2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ hai.trainingStart(function () {
```

```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion blocks/hai2025/protection1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ hai.trainingStart(function () {
})
```
```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion blocks/hai2025/protection2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ hai.trainingStart(function () {


```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion blocks/hai2025/shelter1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ hai.trainingStart(function () {
})
```
```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion blocks/hai2025/shelter2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ hai.trainingStart(function () {
```

```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion blocks/hai2025/wood1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ hai.trainingStart(function () {

```
```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion blocks/hai2025/wood2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ hai.trainingStart(function () {

```
```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion blocks/hai2025/wood3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ hai.trainingStart(function () {

```
```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion pxt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
],
"testFiles": [],
"targetVersions": {
"target": "2.1.23",
"target": "2.1.24",
"targetId": "minecraft"
},
"supportedTargets": [
Expand Down
2 changes: 1 addition & 1 deletion python/hai2025/comfort1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ Modify the code to add the `shears` pattern to the training data.


```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion python/hai2025/comfort2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ Modify the code to add the `bed` pattern to the training data.


```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion python/hai2025/crafting1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,5 @@ ai.make_api_request(


```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion python/hai2025/crafting2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ Modify the code to add the `sticks` pattern to the training data.


```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion python/hai2025/crafting3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,5 @@ Modify the code to add the three tools (`axe`, `pickaxe`, and `shovel`) to the t


```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion python/hai2025/crafting4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ Modify the code to upgrade each tool (`axe`, `pickaxe`, `shovel`) to `cobbleston


```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion python/hai2025/light1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ ai.make_api_request(
Copy over the ai.make_api_request() function to the code.

```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion python/hai2025/light2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ Modify the code to add the `torches` pattern to the training data.


```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion python/hai2025/protection1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ Modify the code to classify `iron_ore` as an `ore` to the training data.


```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion python/hai2025/protection2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ Modify the code to add the `furnace` pattern to the training data.


```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion python/hai2025/shelter1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ Modify the code to add `cobblestone` and `wood` as `building_materials`.


```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion python/hai2025/shelter2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ Modify the code to add the `door` crafting pattern to the training data.


```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion python/hai2025/wood1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,5 @@ ai.make_api_request(
Make sure your code matches the provided code.

```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion python/hai2025/wood2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ Modify the code to add `birch_log` to the training data.


```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion python/hai2025/wood3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ Modify the code to add `acacia_log` to the training data.


```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```
2 changes: 1 addition & 1 deletion python/hai2025/wood5.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,5 @@ ai.make_api_request(


```package
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.107
hai2025-ts=github:ReWrite-Media/hai2025-ts#v0.0.110
```