Merging master into village, conflicts were solved

2020-12-06 11:43:48 +01:00
parent 38842cee68
commit 866af98fe4
20 changed files with 574 additions and 168 deletions
--- a/squirrelbattle/display/texturepack.py
+++ b/squirrelbattle/display/texturepack.py
@ -58,6 +58,7 @@ TexturePack.ASCII_PACK = TexturePack(
    TEDDY_BEAR='8',
    MERCHANT='M',
    SUNFLOWER='I',
+    BODY_SNATCH_POTION='S',
 )

 TexturePack.SQUIRREL_PACK = TexturePack(
@ -79,4 +80,5 @@ TexturePack.SQUIRREL_PACK = TexturePack(
    TEDDY_BEAR='🧸',
    MERCHANT='🦜',
    SUNFLOWER='🌻',
+    BODY_SNATCH_POTION='🔀',
 )