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

# Conflicts: # squirrelbattle/display/texturepack.py # squirrelbattle/interfaces.py
2020-12-01 17:07:40 +01:00
parent fbd9f0045b e5886bbe44
commit 29142cd91c
52 changed files with 1763 additions and 206 deletions
--- a/squirrelbattle/entities/items.py
+++ b/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