Johannes Schmelz 0c2b266f5e Merge branch 'main' into 'gui' ... # Conflicts: # Projekte/battleship/client/src/main/java/pp/battleship/client/Menu.java # Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy # Projekte/monopoly/model/src/main/java/pp/monopoly/game/server/Player.java		2024-11-25 05:33:21 +00:00
..
client	Merge branch 'main' into 'gui'	2024-11-25 05:33:21 +00:00
model	Merge branch 'main' into 'gui'	2024-11-25 05:33:21 +00:00
server	newest version of tests	2024-11-25 04:34:06 +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