Merge pull request #799 from matty0ung/json

Various BeerJSON fixes, plus new default content

CHANGES.markdown

@@ -16,6 +16,9 @@ Support for BeerJSON, which includes adding a lot of new fields
 ### New Features
 * Import from, and export to, BeerJSON [388](https://github.com/Brewtarget/brewtarget/issues/388)
 * Support for optional fields (ie where value can be blank)
+* Lovibond as color unit option [428](https://github.com/Brewtarget/brewtarget/issues/428)
+* Use Brewerwall ingredient data [290](https://github.com/Brewtarget/brewtarget/issues/290)
+* Update Styles to 2015 or even 2021 BJCP Guidelines [125](https://github.com/Brewtarget/brewtarget/issues/125)
 
 ### Bug Fixes
 * Default SQLite database file: hop, fermentable, mashstep, misc and yeast tables have unused columns [557](https://github.com/Brewtarget/brewtarget/issues/557)
@@ -24,6 +27,9 @@ Support for BeerJSON, which includes adding a lot of new fields
 * Hops Use combo has entry that says "Aroma" but ends up listed as "Post-Boil" in the display [775](https://github.com/Brewtarget/brewtarget/issues/775)
 * We currently display a Recipe's date as "Brew Date", when it should probably be "Creation Date" [619](https://github.com/Brewtarget/brewtarget/issues/619)
 
+### Release Timestamp
+Tue, 11 Jun 2024 04:00:00 +0100
+
 ## v3.0.11
 Minor bug fixes for the 3.0.10 release (ie bugs in 3.0.10 are fixed in this 3.0.11 release).
 

CMakeLists.txt

@@ -817,7 +817,9 @@ set(filesToInstall_docs ${repoDir}/README.md)
 
 # List of data files to be installed.
 set(filesToInstall_data ${repoDir}/data/default_db.sqlite
-                        ${repoDir}/data/DefaultData.xml)
+                        ${repoDir}/data/DefaultContent001-OriginalDefaultData.xml
+                        ${repoDir}/data/DefaultContent002-BJCP_2021_Styles.json
+                        ${repoDir}/data/DefaultContent003-Ingredients-Hops-Yeasts.json)
 
 # Desktop files to install.
 set(filesToInstall_desktop ${repoDir}/linux/${PROJECT_NAME}.desktop)