Yohann D'ANELLO e3ae7bcacf Resolve merge conflicts on german translation file

2020-12-07 22:00:27 +01:00

..

assets

Rename dungeonbattle to squirrelbattle

2020-11-19 02:18:16 +01:00

display

Inventory displays were not updated when the texture pack changed

2020-12-07 21:51:51 +01:00

entities

Merchant inventory is well-saved

2020-12-07 21:48:56 +01:00

locale

Resolve merge conflicts on german translation file

2020-12-07 22:00:27 +01:00

tests

Merging master into village, conflicts were solved

2020-12-06 11:43:48 +01:00

__init__.py

Declare the license, we use GNU GPL

2020-11-27 16:33:17 +01:00

bootstrap.py

Declare the license, we use GNU GPL

2020-11-27 16:33:17 +01:00

enums.py

Merging master into village, conflicts were solved

2020-12-06 11:43:48 +01:00

game.py

Don't call screen.getkey() at a wrong place

2020-12-07 21:29:57 +01:00

interfaces.py

Merchant inventory is well-saved

2020-12-07 21:48:56 +01:00

menus.py

Linting

2020-12-07 21:22:06 +01:00

resources.py

Declare the license, we use GNU GPL

2020-11-27 16:33:17 +01:00

settings.py

Merging master into village, conflicts were solved

2020-12-06 11:43:48 +01:00

term_manager.py

Declare the license, we use GNU GPL

2020-11-27 16:33:17 +01:00

translations.py

Merging master into village, conflicts were solved

2020-12-06 11:43:48 +01:00