Merge remote-tracking branch 'origin/main' into dev-rene

# Conflicts:
#	.dockerignore
#	.gitmodules
#	Dockerfile
#	docker-compose.yml
#	nodes/generalFunctions
#	nodes/machineGroupControl
#	nodes/measurement
#	nodes/monster
#	nodes/pumpingStation
#	nodes/reactor
#	nodes/rotatingMachine
#	nodes/settler
#	package-lock.json
#	package.json
This commit is contained in:
znetsixe
2026-03-31 18:29:03 +02:00
27 changed files with 6337 additions and 3024 deletions