Merge branch 'develop' into gridRE-dev

CHANGELOG.md

@@ -51,7 +51,7 @@ Classify the change according to the following categories:
 ### Fixed
 - Make **ElectricTariff** **export_rate_beyond_net_metering_limit** and **wholesale_rate** with sub-hour time step work
 
-## develop
+## v0.50.0
 ### Added
 - New parameter `force_dispatch` in the **ASHPSpaceHeater** and **ASHPWaterHeater** technologies (default = `true`).  When kept at `true`, the ASHP's thermal output will be the minimum of the site load(s) served and the system size (adjusted for timestep-specific capacity factor) in each period. If set to `false`, ASHP will do economic dispatch considering COP and CF along with electricity prices.
 ### Fixed
@@ -64,7 +64,7 @@ Classify the change according to the following categories:
 
 ## v0.49.1
 ### Changed
-- Swap an error for a warning with inconsistent load-year between electric and heating; soon to 
+- Swap an error for a warning with inconsistent load-year between electric and heating
 
 ## v0.49.0
 ### Added

Project.toml

@@ -1,7 +1,7 @@
 name = "REopt"
 uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6"
 authors = ["Nick Laws", "Hallie Dunham <[email protected]>", "Bill Becker <[email protected]>", "Bhavesh Rathod <[email protected]>", "Alex Zolan <[email protected]>", "Amanda Farthing <[email protected]>", "Xiangkun Li <[email protected]>", "An Pham <[email protected]>", "Byron Pullutasig <[email protected]>"]
-version = "0.49.1"
+version = "0.50.0"
 
 [deps]
 ArchGDAL = "c9ce4bd3-c3d5-55b8-8973-c0e20141b8c3"