Merge pull request #163 from PiBrewing/development

Merge Version 4.6.1 from development

Author: avollkopf

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## Server Version 4.6.1 (16.04.25):
+### Codename: Hop Master
+
+### Fixes:
+- Restore Config via raspberryPi did not work. Fix in system controller to check as well for 'application/zip' content type (Issue #162) (4.6.1.a1)
+- Fix MuMM json recipe import (4.6.1.a2)
+
+### Features:
+- Add whirlpool hop functionality - cool down to target (default is 80C), add notification step to add hops prior to further cool down (4.6.1.a2)
+- Add notification step in case of step temperature reduction (e.g. Matlasestep for Wheat beer) (4.6.1.a2)
+
 ## Server Version 4.6.0 (25-03-20):
 ### Codename: Hop Master
 

cbpi/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "4.6.0"
+__version__ = "4.6.1"
 __codename__ = "Hop Master"

cbpi/controller/system_controller.py

@@ -213,7 +213,7 @@ async def restoreConfig(self, data):
             "config.yaml",
         ]
 
-        if content_type == "application/x-zip-compressed":
+        if content_type == "application/x-zip-compressed" or content_type == "application/zip":
             try:
                 content = backup_file.read()
                 if backup_file and self.allowed_file(filename, "zip"):