Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.gitignore
#	gradlew
This commit is contained in:
Teriuihi 2024-01-14 13:28:43 +01:00
commit c7120cc26c

2
.gitignore vendored
View File

@ -1,5 +1,5 @@
.gradle/
.idea/ .idea/
.gradle
run run
build build
run.sh run.sh