mirror of
https://github.com/scratchfoundation/scratch-render.git
synced 2025-06-10 04:20:40 -04:00
chore: resolve merge conflicts
This commit is contained in:
commit
81fa88c80d
3 changed files with 66142 additions and 4090 deletions
21
CHANGELOG.md
21
CHANGELOG.md
|
@ -3,6 +3,27 @@
|
|||
All notable changes to this project will be documented in this file. See
|
||||
[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||
|
||||
## [1.0.228](https://github.com/scratchfoundation/scratch-render/compare/v1.0.227...v1.0.228) (2024-07-25)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **deps:** update dependency scratch-storage to v2.3.193 ([bab162e](https://github.com/scratchfoundation/scratch-render/commit/bab162ef62943864d822df23320c22b766c58b4e))
|
||||
|
||||
## [1.0.227](https://github.com/scratchfoundation/scratch-render/compare/v1.0.226...v1.0.227) (2024-07-24)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **deps:** update dependency scratch-storage to v2.3.192 ([90a62c0](https://github.com/scratchfoundation/scratch-render/commit/90a62c0e007db30e3dd329426dde1901eae692d5))
|
||||
|
||||
## [1.0.226](https://github.com/scratchfoundation/scratch-render/compare/v1.0.225...v1.0.226) (2024-07-24)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **deps:** update dependency scratch-render-fonts to v1.0.77 ([88b7ba9](https://github.com/scratchfoundation/scratch-render/commit/88b7ba9b02e9edc3760caa870005475e299ed036))
|
||||
|
||||
## [1.0.225](https://github.com/scratchfoundation/scratch-render/compare/v1.0.224...v1.0.225) (2024-07-23)
|
||||
|
||||
|
||||
|
|
70201
package-lock.json
generated
70201
package-lock.json
generated
File diff suppressed because it is too large
Load diff
10
package.json
10
package.json
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "scratch-render",
|
||||
"version": "1.0.225",
|
||||
"version": "1.0.228",
|
||||
"description": "WebGL Renderer for Scratch 3.0",
|
||||
"author": "Massachusetts Institute of Technology",
|
||||
"license": "BSD-3-Clause",
|
||||
|
@ -8,7 +8,7 @@
|
|||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/scratchfoundation/scratch-render.git",
|
||||
"sha": "3aed1c7c28512bf1d9f54a1d13d2b12eecb79b53"
|
||||
"sha": "6ffbeed055e1736097a6d0a450002b30dfdd90da"
|
||||
},
|
||||
"exports": {
|
||||
"webpack": "./src/index.js",
|
||||
|
@ -67,10 +67,10 @@
|
|||
"husky": "8.0.3",
|
||||
"jsdoc": "3.6.11",
|
||||
"json": "9.0.6",
|
||||
"playwright-chromium": "1.45.2",
|
||||
"scratch-render-fonts": "1.0.76",
|
||||
"playwright-chromium": "1.45.3",
|
||||
"scratch-render-fonts": "1.0.77",
|
||||
"scratch-semantic-release-config": "1.0.14",
|
||||
"scratch-storage": "2.3.190",
|
||||
"scratch-storage": "2.3.193",
|
||||
"scratch-vm": "^4.5.280",
|
||||
"scratch-webpack-configuration": "^1.3.0",
|
||||
"semantic-release": "19.0.5",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue