Merge branch 'master' into 'moreitems'

# Conflicts:
#   squirrelbattle/entities/items.py
#   squirrelbattle/interfaces.py
#   squirrelbattle/tests/game_test.py

squirrelbattle/settings.py

@@ -74,7 +74,8 @@ class Settings:
         """
         d = json.loads(json_str)
         for key in d:
-            setattr(self, key, d[key])
+            if hasattr(self, key):
+                setattr(self, key, d[key])
 
     def dumps_to_string(self) -> str:
         """