Yohann D'ANELLO 4c7a2e9f3b Merge branch 'master' into map_generation ... # Conflicts: # squirrelbattle/entities/player.py # squirrelbattle/game.py # squirrelbattle/interfaces.py # squirrelbattle/tests/game_test.py		2021-01-10 22:16:11 +01:00
..
__init__.py	Happy new year!	2021-01-10 10:46:17 +01:00
entities_test.py	Testing + linting (yes there remains two linting errors, i don't know what to do.	2021-01-10 18:04:33 +01:00
game_test.py	Merge branch 'master' into map_generation	2021-01-10 22:16:11 +01:00
interfaces_test.py	Fix import order	2021-01-10 11:25:53 +01:00
mapgeneration_test.py	Linting	2021-01-10 22:08:42 +01:00
screen.py	Happy new year!	2021-01-10 10:46:17 +01:00
settings_test.py	Happy new year!	2021-01-10 10:46:17 +01:00
translations_test.py	even more translations.	2021-01-10 21:38:21 +01:00