Merge remote-tracking branch 'origin/master' into village

# Conflicts:
#	squirrelbattle/display/texturepack.py
#	squirrelbattle/interfaces.py

squirrelbattle/entities/__init__.py

@@ -0,0 +1,2 @@
+# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse
+# SPDX-License-Identifier: GPL-3.0-or-later

squirrelbattle/entities/items.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from typing import Optional
 
 from .player import Player

squirrelbattle/entities/monsters.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from random import choice
 
 from .player import Player
@@ -52,13 +55,13 @@ class Monster(FightingEntity):
                     break
 
 
-class Beaver(Monster):
+class Tiger(Monster):
     """
-    A beaver monster
+    A tiger monster
     """
     def __init__(self, strength: int = 2, maxhealth: int = 20,
                  *args, **kwargs) -> None:
-        super().__init__(name="beaver", strength=strength,
+        super().__init__(name="tiger", strength=strength,
                          maxhealth=maxhealth, *args, **kwargs)
 
 

squirrelbattle/entities/player.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from random import randint
 from typing import Dict, Tuple