Merge branch 'master' into new-block-api

# Conflicts:
#	.gitignore

.github/workflows/javadoc.yml

@@ -23,6 +23,6 @@ jobs:
       env:
         REPO: self
         BRANCH: javadoc
-        FOLDER: docs
+        FOLDER: build/docs/javadoc
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         CLEAR_GLOBS_FILE: ".github/javadoc-publish-clear"

.gitignore

@@ -54,7 +54,4 @@ gradle-app.setting
 
 # When running the demo we generate the extensions folder
 /extensions/
-/.mixin.out/
-
-# When compiling we get a docs folder
-**/docs
+/.mixin.out/

build.gradle

@@ -39,7 +39,6 @@ allprojects {
     }
     javadoc {
         options {
-            destinationDir(file("docs"))
             addBooleanOption('html5', true)
             links "https://jd.adventure.kyori.net/api/$adventureVersion/"
             links "https://docs.oracle.com/en/java/javase/11/docs/api/"