ynerant 451dd9cba7 Merge branch 'master' into 'equipment' ... # Conflicts: # squirrelbattle/display/statsdisplay.py # squirrelbattle/entities/items.py # squirrelbattle/entities/player.py # squirrelbattle/interfaces.py # squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po # squirrelbattle/locale/es/LC_MESSAGES/squirrelbattle.po # squirrelbattle/locale/fr/LC_MESSAGES/squirrelbattle.po # squirrelbattle/tests/game_test.py		2021-01-08 02:11:40 +01:00
..
assets	Merge branch 'master' into 'lighting'	2021-01-07 16:36:54 +01:00
display	Merge branch 'master' into 'equipment'	2021-01-08 02:11:40 +01:00
entities	Merge branch 'master' into 'equipment'	2021-01-08 02:11:40 +01:00
locale	Merge branch 'master' into 'equipment'	2021-01-08 02:11:40 +01:00
tests	Merge branch 'master' into 'equipment'	2021-01-08 02:11:40 +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	Merge branch 'master' into 'ladders'	2021-01-06 17:29:26 +01:00
game.py	Merge branch 'master' into 'equipment'	2021-01-08 02:11:40 +01:00
interfaces.py	Merge branch 'master' into 'equipment'	2021-01-08 02:11:40 +01:00
menus.py	Merge branch 'master' into 'familiars'	2021-01-05 10:27:39 +01:00
resources.py	Declare the license, we use GNU GPL	2020-11-27 16:33:17 +01:00
settings.py	Merge branch 'master' into 'ladders'	2021-01-06 17:29:26 +01:00
term_manager.py	Fixed grammar, unified the docstring's format and added documentation to some classes that did not have any. Closes #32.	2020-12-13 21:29:25 +01:00
translations.py	Fixed grammar, unified the docstring's format and added documentation to some classes that did not have any. Closes #32.	2020-12-13 21:29:25 +01:00