Merge remote-tracking branch 'origin/main'

# Conflicts:
#	.gradle/8.10.2/executionHistory/executionHistory.bin
#	.gradle/8.10.2/fileHashes/fileHashes.bin
#	.gradle/8.10.2/fileHashes/resourceHashesCache.bin
#	.gradle/buildOutputCleanup/outputFiles.bin
#	build/classes/java/main/app/SimulatorApplication.class
#	build/classes/java/main/controller/Controller.class
#	build/classes/java/main/model/FireManager.class
#	build/classes/java/main/model/FirefighterBoard$1.class
#	build/classes/java/main/model/FirefighterBoard.class
#	build/classes/java/main/model/FirefighterManager.class
#	build/classes/java/main/model/ModelElement.class
#	build/classes/java/main/model/SimpleFireSpreadStrategy.class
#	build/classes/java/main/model/SimpleFirefighterMovementStrategy.class
#	build/classes/java/main/module-info.class
#	build/classes/java/main/view/FirefighterGrid.class
#	build/classes/java/main/view/ViewElement.class
#	build/libs/firefighter-all.jar
#	build/scriptsShadow/firefighter.bat
#	build/tmp/compileJava/previous-compilation-data.bin
#	build/tmp/shadowJar/MANIFEST.MF