Merge remote-tracking branch 'origin/main'

# Conflicts:
#	SMIMS-Game/MyWorld.class
#	SMIMS-Game/MyWorld.java
#	SMIMS-Game/project.greenfoot

SMIMS-Game/project.greenfoot

@@ -1,40 +1,25 @@
 #Greenfoot project file
-class.BreakingPlattform.image=Unbenannt2.png
 class.Ground.image=weave.jpg
-class.MovingPlattform.image=Unbenannt.png
-class.Plattform.image=Plattform.png
 class.Player.image=ppl2.png
-dependency1.from=MyWorld
-dependency1.to=Player
+dependency1.from=PlayerTestWorld
+dependency1.to=Ground
 dependency1.type=UsesDependency
-dependency2.from=MyWorld
-dependency2.to=Plattform
+dependency2.from=PlayerTestWorld
+dependency2.to=Player
 dependency2.type=UsesDependency
 dependency3.from=MyWorld
-dependency3.to=MovingPlattform
+dependency3.to=Player
 dependency3.type=UsesDependency
-dependency4.from=MyWorld
-dependency4.to=BreakingPlattform
+dependency4.from=Player
+dependency4.to=Ground
 dependency4.type=UsesDependency
-dependency5.from=Player
-dependency5.to=Ground
-dependency5.type=UsesDependency
-dependency6.from=Plattform
-dependency6.to=MyWorld
-dependency6.type=UsesDependency
-dependency7.from=Plattform
-dependency7.to=Player
-dependency7.type=UsesDependency
-dependency8.from=MovingPlattform
-dependency8.to=MyWorld
-dependency8.type=UsesDependency
-editor.fx.0.height=811
-editor.fx.0.width=816
-editor.fx.0.x=1009
-editor.fx.0.y=241
-height=736
-package.numDependencies=8
-package.numTargets=6
+editor.fx.0.height=737
+editor.fx.0.width=814
+editor.fx.0.x=360
+editor.fx.0.y=26
+height=830
+package.numDependencies=4
+package.numTargets=4
 project.charset=UTF-8
 publish.hasSource=false
 publish.locked=true
@@ -57,42 +42,28 @@ target1.width=120
 target1.x=0
 target1.y=0
 target2.height=70
-target2.name=MovingPlattform
+target2.name=Ground
 target2.showInterface=false
 target2.type=ClassTarget
 target2.width=120
 target2.x=0
 target2.y=0
 target3.height=70
-target3.name=Ground
+target3.name=PlayerTestWorld
 target3.showInterface=false
 target3.type=ClassTarget
 target3.width=120
 target3.x=0
 target3.y=0
 target4.height=70
-target4.name=BreakingPlattform
+target4.name=MyWorld
 target4.showInterface=false
 target4.type=ClassTarget
 target4.width=120
 target4.x=0
 target4.y=0
-target5.height=70
-target5.name=Plattform
-target5.showInterface=false
-target5.type=ClassTarget
-target5.width=120
-target5.x=0
-target5.y=0
-target6.height=70
-target6.name=MyWorld
-target6.showInterface=false
-target6.type=ClassTarget
-target6.width=120
-target6.x=0
-target6.y=0
 version=3.1.0
-width=856
-world.lastInstantiated=MyWorld
-xPosition=652
-yPosition=76
+width=1550
+world.lastInstantiated=PlayerTestWorld
+xPosition=0
+yPosition=0