From e2307962ab30d0ca02d7f107249e93f34104de6e Mon Sep 17 00:00:00 2001
From: Daniel Vedder <daniel.vedder@idiv.de>
Date: Fri, 9 Aug 2024 19:22:14 +0200
Subject: [PATCH] Updated CHANGELOG, bumped version to 0.5.5

closes #16
---
 CHANGELOG.md | 30 +++++++++++++++++++++++++++---
 Project.toml |  2 +-
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f83a1c..83e12b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,13 +12,37 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [0.6.0] - in planning
 
-*Plan: integrate AquaCrop (#79), set up first experiments*
+*Plan: decouple CairoMakie (#81), fix & test ALMaSS, set up first experiments*
 
 ---
 
-## [0.5.5] - unreleased
+## [0.5.5] - 09-08-2024
 
-*Plan: basic farm model (#16), decouple CairoMakie (#81)*
+**This point release implements the first basic farm model**
+
+### Added
+
+- basic farm model that assigns a crop rotation to each field, sowing and harvesting when appropriate
+
+- new parameters: `farm.farmmodel`, `farm.setaside`, `farm.fieldoutfreq`
+
+- visualisation of cropped area and crop growth over time
+
+- `farm.setaside` setting to configure what proportion of land farmers let lie fallow
+
+- `isharvestable()` function for `FarmPlot`s
+
+- `@areaof` macro to calculate the area of a given number of landscape pixels
+
+- `data/farm/standard_gross_margins.csv` from KTBL data
+
+### Changed
+
+- expanded & adapted general crop data and crop growth curve tables
+
+### Fixed
+
+- bug fixes in the ALMaSS crop model
 
 
 ## [0.5.4] - 08-08-2024
diff --git a/Project.toml b/Project.toml
index 131a513..b34a8e3 100644
--- a/Project.toml
+++ b/Project.toml
@@ -1,7 +1,7 @@
 name = "Persefone"
 uuid = "039acd1d-2a07-4b33-b082-83a1ff0fd136"
 authors = ["Daniel Vedder <daniel.vedder@idiv.de>"]
-version = "0.5.4"
+version = "0.5.5"
 
 [deps]
 ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
-- 
GitLab