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
..
client	Merge branch 'main' into 'gui'	2024-12-12 16:50:21 +00:00
model	java doc	2024-12-12 17:38:46 +01:00
server	Reworked gui and client states	2024-12-08 01:19:34 +00:00
run-mac.sh	init for monopoly	2024-11-12 14:53:04 +01:00
run.sh	init for monopoly	2024-11-12 14:53:04 +01:00