Skip to content

Commit

Permalink
Merge branch 'dev' into ms/#1133-adding-voltage-limits-to-simona
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/scala/edu/ie3/simona/config/SimonaConfig.scala
  • Loading branch information
staudtMarius committed Feb 14, 2025
2 parents 1e36bcc + 73ae8b7 commit 7f32e28
Show file tree
Hide file tree
Showing 2 changed files with 122 additions and 2,769 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- `OperationInterval` should extend `RightOpenInterval` [#1142](https://github.com/ie3-institute/simona/issues/1142)
- Enhance EmAggregate of SelfOpt to cope with other targetLimits [#1131](https://github.com/ie3-institute/simona/issues/1131)
- Switched to `pureconfig` [#608](https://github.com/ie3-institute/simona/issues/608)
- Removing generated methods and cleaning up in config [#1170](https://github.com/ie3-institute/simona/issues/1170)

### Fixed
- Fix rendering of references in documentation [#505](https://github.com/ie3-institute/simona/issues/505)
Expand Down
Loading

0 comments on commit 7f32e28

Please sign in to comment.