From 92a2e5da8b86cd1c085cb1963a11cd2fda1188a0 Mon Sep 17 00:00:00 2001 From: uniior Date: Sat, 22 Jun 2024 13:56:09 -0400 Subject: [PATCH] Resolve merge conflict --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 790264e20e..071eb563f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. - Prompt dialogs are now localized. - 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. ## [0.16.0] - 2024-03-30