Merge branch 'main' into 'gui'

# Conflicts: # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/EventCardPopup.java
Merge remote-tracking branch 'origin/gui'
2025-11-04 04:56:02 +01:00 · 2024-12-12 16:50:21 +00:00 · 2024-12-09 14:13:44 +01:00 · 2024-12-08 01:18:35 +00:00 · 2024-12-08 01:18:35 +00:00
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
Author	SHA1	Message	Date
Johannes Schmelz	10e30d9bd9	Merge branch 'main' into 'gui' # Conflicts: # Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/EventCardPopup.java	2024-12-12 16:50:21 +00:00
Johannes Schmelz	249110f83c	Merge remote-tracking branch 'origin/gui'	2024-12-09 14:13:44 +01:00
Johannes Schmelz	a686671c15	Merge branch 'reworkedGui' into 'main' refactor Worlds and client States See merge request progproj/gruppen-ht24/Gruppe-02!18	2024-12-08 01:18:35 +00:00
Johannes Schmelz	e102d22f14	refactor Worlds and client States	2024-12-08 01:18:35 +00:00