Merge remote-tracking branch 'origin/main'

ocni-dtu · May 8, 2024 · b202a4a · b202a4a
2 parents 8d2b16d + ecbee6d
commit b202a4a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## [2.0.0](https://github.com/ocni-dtu/lcax/compare/v1.7.0...v2.0.0) (2024-05-08)
+
+
+### ⚠ BREAKING CHANGES
+
+* Merging EPDx into LCAx and changing EPD fields.
+
+### Features
+
+* Added converter for SLiCE datasets ([5110d0a](https://github.com/ocni-dtu/lcax/commit/5110d0a3cc1a958df9a7d3f95afebc2a8de5a668))
+* Refactor and merge EPDx ([0553137](https://github.com/ocni-dtu/lcax/commit/05531373447b0f028af6077cff47ab43f6ec8a30))
+
 ## [1.7.0](https://github.com/ocni-dtu/lcax/compare/v1.6.0...v1.7.0) (2024-04-08)
 
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ resolver = "2"
 
 [workspace.package]
 description = "LCAx is an open, machine and human-readable data format for exchanging LCA results."
-version = "1.7.0"
+version = "2.0.0"
 authors = ["Christian Kongsgaard <christian@kongsgaard.eu>"]
 edition = "2021"
 readme = "README.md"