Merge branch 'main' into 'gui'

# Conflicts: # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/EventCardPopup.java
2025-01-18 19:33:40 +01:00 · 2024-12-12 16:50:21 +00:00 · 2024-12-12 16:50:21 +00:00 · 10e30d9bd9
commit 10e30d9bd9
parent 5de76f3226 249110f83c
2 changed files with 1 additions and 0 deletions
--- a/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/LobbyMenu.java
+++ b/Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/LobbyMenu.java
@ -318,6 +318,7 @@ public class LobbyMenu extends Dialog {
            figure = selector.getSelectedItem();
                break;
        }
+        System.out.println("FIGUR:::::"+figure);
    }

    /**
--- a/Projekte/monopoly/client/src/main/resources/Pictures/dice/5.png
+++ b/Projekte/monopoly/client/src/main/resources/Pictures/dice/5.png