5 Commits

Author	SHA1	Message	Date
Yohann D'ANELLO	02d3394439	Merge remote-tracking branch 'origin/master' into display ... # Conflicts: # dungeonbattle/entities/player.py # dungeonbattle/game.py # dungeonbattle/interfaces.py # dungeonbattle/mapdisplay.py # dungeonbattle/settings.py # dungeonbattle/tests/settings_test.py # dungeonbattle/texturepack.py	2020-11-06 20:04:24 +01:00
Yohann D'ANELLO	8d9b5166b7	Linting	2020-11-06 18:11:59 +01:00
Nicolas Margulies	d43a1de2c3	Moved texturepacks into display	2020-11-06 15:58:07 +01:00
eichhornchen	bfce9487c5	repaired the texture pack	2020-11-06 14:41:05 +01:00
eichhornchen	dadd1fd146	added texture pack	2020-11-06 14:32:05 +01:00