Skip to content

Commit

Permalink
Merge branch 'main' into feature/gamemodeParser
Browse files Browse the repository at this point in the history
  • Loading branch information
MulverineX authored May 6, 2024
2 parents 0372f31 + cd8d097 commit 81b54a0
Show file tree
Hide file tree
Showing 13 changed files with 706 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ jobs:

- run: npm test

- run: npm run lint
#- run: npm run lint

- run: npm run release
48 changes: 24 additions & 24 deletions .packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"locales"
],
"released": {
"commit": "7fd01cac51c59616c6c422bb7e967ac195e9568d",
"version": "0.4.1"
"commit": "b6ecdcad78be7a44ef564afdfc9c51daedf38de8",
"version": "0.4.2"
}
},
"discord-bot": {
Expand All @@ -16,8 +16,8 @@
"mcdoc"
],
"released": {
"commit": "b66297d1f6c6a7bfa34ad2983f55a5e1cba8a278",
"version": "0.3.2"
"commit": "b6ecdcad78be7a44ef564afdfc9c51daedf38de8",
"version": "0.3.3"
}
},
"java-edition": {
Expand All @@ -30,8 +30,8 @@
"nbt"
],
"released": {
"commit": "11df11f59ec64846609ff0ba1825933b19985bc9",
"version": "0.3.2"
"commit": "b6ecdcad78be7a44ef564afdfc9c51daedf38de8",
"version": "0.3.3"
}
},
"json": {
Expand All @@ -40,8 +40,8 @@
"locales"
],
"released": {
"commit": "8396455c849fc94c6ab6ead334e9845dc0e55d16",
"version": "0.3.2"
"commit": "b6ecdcad78be7a44ef564afdfc9c51daedf38de8",
"version": "0.3.3"
}
},
"language-server": {
Expand All @@ -52,14 +52,14 @@
"mcdoc"
],
"released": {
"commit": "93a82ed9f3ca824de31b7aa55b76a15bbab07e34",
"version": "0.4.1"
"commit": "b6ecdcad78be7a44ef564afdfc9c51daedf38de8",
"version": "0.4.2"
}
},
"locales": {
"released": {
"commit": "11df11f59ec64846609ff0ba1825933b19985bc9",
"version": "0.3.1"
"commit": "b6ecdcad78be7a44ef564afdfc9c51daedf38de8",
"version": "0.3.2"
}
},
"mcdoc": {
Expand All @@ -68,8 +68,8 @@
"locales"
],
"released": {
"commit": "fc27b2c7ce699c931364c1aadf7408ca41346c71",
"version": "0.3.2"
"commit": "b6ecdcad78be7a44ef564afdfc9c51daedf38de8",
"version": "0.3.3"
}
},
"mcdoc-cli": {
Expand All @@ -78,8 +78,8 @@
"mcdoc"
],
"released": {
"commit": "35843bf80d496b441b2def4e1f0985e44d8cfaaf",
"version": "0.1.0"
"commit": "d670cd2a6d684e3de52400cabc5abb92e679ca33",
"version": "0.1.2"
}
},
"mcfunction": {
Expand All @@ -88,8 +88,8 @@
"locales"
],
"released": {
"commit": "b66297d1f6c6a7bfa34ad2983f55a5e1cba8a278",
"version": "0.2.3"
"commit": "b6ecdcad78be7a44ef564afdfc9c51daedf38de8",
"version": "0.2.4"
}
},
"nbt": {
Expand All @@ -99,8 +99,8 @@
"mcdoc"
],
"released": {
"commit": "fc27b2c7ce699c931364c1aadf7408ca41346c71",
"version": "0.3.2"
"commit": "b6ecdcad78be7a44ef564afdfc9c51daedf38de8",
"version": "0.3.3"
}
},
"playground": {
Expand All @@ -111,17 +111,17 @@
"mcdoc"
],
"released": {
"commit": "105676c85951fbd2632d3eab0c5510ea102301ee",
"version": "0.2.2"
"commit": "b6ecdcad78be7a44ef564afdfc9c51daedf38de8",
"version": "0.2.3"
}
},
"vscode-extension": {
"devDependencies": [
"language-server"
],
"released": {
"commit": "11df11f59ec64846609ff0ba1825933b19985bc9",
"version": "0.3.2"
"commit": "b6ecdcad78be7a44ef564afdfc9c51daedf38de8",
"version": "0.3.3"
}
}
}
2 changes: 1 addition & 1 deletion .vscode/settings.template.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"json.format.keepLines": true,
"[typescript]": {
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true,
"source.fixAll.eslint": "always",
},
"editor.defaultFormatter": "dprint.dprint",
"editor.formatOnSave": true,
Expand Down
26 changes: 24 additions & 2 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,29 @@
"script": "watch",
"group": "build",
"isBackground": true,
"problemMatcher": "$tsc-watch",
"problemMatcher": {
"severity": "error",
"fileLocation": "absolute",
"source": "esbuild",
"background": {
"activeOnStart": true,
"beginsPattern": "Start building\\.\\.\\.",
"endsPattern": "Built successfully\\."
},
"pattern": [
{
"regexp": "ERROR in ([^\\(]*)\\((\\d+),(\\d+)\\):",
"file": 1,
"line": 2,
"column": 3
},
{
"regexp": "([A-Za-z0-9-]+):(.*)",
"message": 2,
"code": 1
}
]
},
"label": "npm: watch",
"detail": "Compiles all packages to JavaScript."
},
Expand Down Expand Up @@ -52,4 +74,4 @@
"detail": "Run tests of all packages."
}
]
}
}
Loading

0 comments on commit 81b54a0

Please sign in to comment.