Merge branch '1.20.1' into 1.20.2

* 1.20.1:
  Pass output to both file and console

.github/scripts/run-client.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-./gradlew $1:runClient > gradle_client_output.txt 2>&1 &
+./gradlew $1:runClient --no-daemon 2>&1 | tee gradle_client_output.txt &
 
 SUCCESS_PATTERN='minecraft:textures/atlas/mob_effects\.png-atlas'
 ERROR_PATTERNS=(

.github/scripts/run-server.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 
-./gradlew $1:runServer --args="nogui" > gradle_server_output.txt 2>&1 &
+mkdir -p $1/run && echo "eula=true" > $1/run/eula.txt
+
+./gradlew $1:runServer --no-daemon --args="nogui" 2>&1 | tee gradle_server_output.txt &
 
 SUCCESS_PATTERN='For help, type "help"'
 ERROR_PATTERNS=(

Makefile

@@ -13,6 +13,9 @@ clean-cache: ## Cleans cache
 	rm -rf $GRADLE_HOME/caches/build-cache-*
 	./gradlew clean
 
+stop: ## Stops all deamons
+	./gradlew --stop
+
 gen-sources: ## Generate sources
 	./gradlew genSources