Merging master into village, conflicts were solved

squirrelbattle/menus.py

@@ -5,6 +5,7 @@ from enum import Enum
 from typing import Any, Optional
 
 from .display.texturepack import TexturePack
+from .entities.player import Player
 from .enums import GameMode, KeyValues, DisplayActions
 from .settings import Settings
 from .translations import gettext as _, Translator
@@ -115,3 +116,14 @@ class SettingsMenu(Menu):
             game.settings.write_settings()
             self.waiting_for_key = False
             self.update_values(game.settings)
+
+
+class InventoryMenu(Menu):
+    player: Player
+
+    def update_player(self, player: Player) -> None:
+        self.player = player
+
+    @property
+    def values(self) -> list:
+        return self.player.inventory