Yohann D'ANELLO 0ea10546ac Fix merge issues

2021-01-10 22:19:15 +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

Fix merge issues

2021-01-10 22:19:15 +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