Skip to content

Commit

Permalink
Merge branch 'main' into andrew/v1
Browse files Browse the repository at this point in the history
# Conflicts:
#	packages/core/CHANGELOG.md
#	packages/core/package.json
#	packages/custom/package.json
#	packages/jimp/package.json
#	packages/plugin-blit/package.json
#	packages/plugin-blur/package.json
#	packages/plugin-circle/package.json
#	packages/plugin-color/package.json
#	packages/plugin-contain/package.json
#	packages/plugin-cover/package.json
#	packages/plugin-crop/package.json
#	packages/plugin-displace/package.json
#	packages/plugin-dither/package.json
#	packages/plugin-fisheye/package.json
#	packages/plugin-flip/package.json
#	packages/plugin-gaussian/package.json
#	packages/plugin-invert/package.json
#	packages/plugin-mask/package.json
#	packages/plugin-normalize/package.json
#	packages/plugin-print/package.json
#	packages/plugin-resize/package.json
#	packages/plugin-rotate/package.json
#	packages/plugin-scale/package.json
#	packages/plugin-shadow/package.json
#	packages/plugin-threshold/package.json
#	packages/plugins/package.json
#	packages/test-utils/package.json
#	packages/type-bmp/package.json
#	packages/type-gif/package.json
#	packages/type-jpeg/package.json
#	packages/type-png/package.json
#	packages/type-tiff/package.json
#	packages/types/package.json
#	packages/utils/package.json
  • Loading branch information
hipstersmoothie committed Apr 8, 2024
2 parents 6bd9da5 + a4a8d63 commit 867331e
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 1 deletion.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -1319,6 +1319,15 @@
"contributions": [
"doc"
]
},
{
"login": "DLiblik",
"name": "Dathan",
"avatar_url": "https://avatars.githubusercontent.com/u/4047997?v=4",
"profile": "https://ca.linkedin.com/in/dathanliblik",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
Expand Down
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
# v0.22.12 (Fri Feb 23 2024)

:tada: This release contains work from a new contributor! :tada:

Thank you, Dathan ([@DLiblik](https://github.com/DLiblik)), for all your work!

#### 🚀 Enhancement

- Automatic release [#1277](https://github.com/jimp-dev/jimp/pull/1277) ([@hipstersmoothie](https://github.com/hipstersmoothie) [@github-actions[bot]](https://github.com/github-actions[bot]))

#### 🐛 Bug Fix

- `@jimp/core`
- Improve color operations performance [#1263](https://github.com/jimp-dev/jimp/pull/1263) ([@DLiblik](https://github.com/DLiblik) [@hipstersmoothie](https://github.com/hipstersmoothie))

#### Authors: 3

- [@github-actions[bot]](https://github.com/github-actions[bot])
- Andrew Lisowski ([@hipstersmoothie](https://github.com/hipstersmoothie))
- Dathan ([@DLiblik](https://github.com/DLiblik))

---

# v0.22.11 (Fri Feb 23 2024)

:tada: This release contains work from new contributors! :tada:
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center"><a href="https://github.com/Marsup"><img src="https://avatars.githubusercontent.com/u/796194?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nicolas Morel</b></sub></a><br /><a href="https://github.com/jimp-dev/jimp/commits?author=Marsup" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/stevezac-osu"><img src="https://avatars.githubusercontent.com/u/71655313?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zach Stevenson</b></sub></a><br /><a href="https://github.com/jimp-dev/jimp/commits?author=stevezac-osu" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/AnotherPillow"><img src="https://avatars.githubusercontent.com/u/85362273?v=4?s=100" width="100px;" alt=""/><br /><sub><b>AnotherPillow</b></sub></a><br /><a href="https://github.com/jimp-dev/jimp/commits?author=AnotherPillow" title="Documentation">📖</a></td>
<td align="center"><a href="https://ca.linkedin.com/in/dathanliblik"><img src="https://avatars.githubusercontent.com/u/4047997?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dathan</b></sub></a><br /><a href="https://github.com/jimp-dev/jimp/commits?author=DLiblik" title="Code">💻</a></td>
</tr>
</table>

Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"lerna": "^7.1.4",
"npmClient": "yarn",
"registry": "https://registry.npmjs.org/",
"version": "0.22.11",
"version": "0.22.12",
"packages": ["packages/*"]
}

0 comments on commit 867331e

Please sign in to comment.