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

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

squirrelbattle/display/texturepack.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 import curses
 from typing import Any
 
@@ -51,7 +54,7 @@ TexturePack.ASCII_PACK = TexturePack(
     HEART='❤',
     BOMB='o',
     RABBIT='Y',
-    BEAVER='_',
+    TIGER='n',
     TEDDY_BEAR='8',
     MERCHANT='M',
     SUNFLOWER='I',
@@ -67,12 +70,12 @@ TexturePack.SQUIRREL_PACK = TexturePack(
     EMPTY='  ',
     WALL='🧱',
     FLOOR='██',
-    PLAYER='🐿️️',
+    PLAYER='🐿️ ️',
     HEDGEHOG='🦔',
     HEART='💜',
     BOMB='💣',
     RABBIT='🐇',
-    BEAVER='🦫',
+    TIGER='🐅',
     TEDDY_BEAR='🧸',
     MERCHANT='🦜',
     SUNFLOWER='🌻',