Resolve merge conflict

This commit is contained in:
uniior 2024-06-22 13:56:09 -04:00
parent b3c5c4b48a
commit 92a2e5da8b

View File

@ -47,6 +47,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Cultist dungeons now always have exactly one portal which leads to the boss room. - Cultist dungeons now always have exactly one portal which leads to the boss room.
- Prompt dialogs are now localized. - Prompt dialogs are now localized.
- Image-export for wiki now produces correct images of items as they look like in-game. - Image-export for wiki now produces correct images of items as they look like in-game.
- Limit the minimum vertical scaling value in the world generation UI to 0.1 to prevent an overflow
- Wood log and worker/linen clothing pricing. - Wood log and worker/linen clothing pricing.
## [0.16.0] - 2024-03-30 ## [0.16.0] - 2024-03-30