Felix 7fa45f39c6 Merge remote-tracking branch 'origin/dev_client' into dev_client ...

# Conflicts:
#	Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/Animation.java
#	Projekte/mdga/client/src/main/java/pp/mdga/client/Animation/AnimationHandler.java

2024-11-14 15:04:41 +01:00

..

client

Merge remote-tracking branch 'origin/dev_client' into dev_client

2024-11-14 15:04:41 +01:00

model

Minor work on animation

2024-11-14 14:58:54 +01:00