Merge remote-tracking branch 'origin/main'

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

SMIMS-Game/project.greenfoot

@@ -1,27 +1,19 @@
 #Greenfoot project file
-class.GameOverWorld.image=bluerock.jpg
 class.Ground.image=weave.jpg
 class.Player.image=ppl2.png
-class.Projectile.image=Projectile1.png
 dependency1.from=MyWorld
 dependency1.to=Player
 dependency1.type=UsesDependency
-dependency2.from=MyWorld
-dependency2.to=Projectile
+dependency2.from=Player
+dependency2.to=Ground
 dependency2.type=UsesDependency
-dependency3.from=Player
-dependency3.to=Ground
-dependency3.type=UsesDependency
-dependency4.from=Player
-dependency4.to=Projectile
-dependency4.type=UsesDependency
-editor.fx.0.height=737
-editor.fx.0.width=814
-editor.fx.0.x=360
-editor.fx.0.y=26
+editor.fx.0.height=0
+editor.fx.0.width=0
+editor.fx.0.x=0
+editor.fx.0.y=0
 height=736
-package.numDependencies=4
-package.numTargets=5
+package.numDependencies=2
+package.numTargets=3
 project.charset=UTF-8
 publish.hasSource=false
 publish.locked=true
@@ -51,26 +43,12 @@ target2.width=120
 target2.x=0
 target2.y=0
 target3.height=70
-target3.name=GameOverWorld
+target3.name=MyWorld
 target3.showInterface=false
 target3.type=ClassTarget
 target3.width=120
 target3.x=0
 target3.y=0
-target4.height=70
-target4.name=MyWorld
-target4.showInterface=false
-target4.type=ClassTarget
-target4.width=120
-target4.x=0
-target4.y=0
-target5.height=70
-target5.name=Projectile
-target5.showInterface=false
-target5.type=ClassTarget
-target5.width=120
-target5.x=0
-target5.y=0
 version=3.1.0
 width=856
 world.lastInstantiated=MyWorld