mirror of
https://github.com/Minestom/Minestom.git
synced 2024-09-27 06:03:01 +02:00
Merge branch 'master' into new-block-api
# Conflicts: # .gitignore
This commit is contained in:
commit
14304f19de
2
.github/workflows/javadoc.yml
vendored
2
.github/workflows/javadoc.yml
vendored
@ -23,6 +23,6 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
REPO: self
|
REPO: self
|
||||||
BRANCH: javadoc
|
BRANCH: javadoc
|
||||||
FOLDER: docs
|
FOLDER: build/docs/javadoc
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
CLEAR_GLOBS_FILE: ".github/javadoc-publish-clear"
|
CLEAR_GLOBS_FILE: ".github/javadoc-publish-clear"
|
||||||
|
3
.gitignore
vendored
3
.gitignore
vendored
@ -55,6 +55,3 @@ gradle-app.setting
|
|||||||
# When running the demo we generate the extensions folder
|
# When running the demo we generate the extensions folder
|
||||||
/extensions/
|
/extensions/
|
||||||
/.mixin.out/
|
/.mixin.out/
|
||||||
|
|
||||||
# When compiling we get a docs folder
|
|
||||||
**/docs
|
|
||||||
|
@ -39,7 +39,6 @@ allprojects {
|
|||||||
}
|
}
|
||||||
javadoc {
|
javadoc {
|
||||||
options {
|
options {
|
||||||
destinationDir(file("docs"))
|
|
||||||
addBooleanOption('html5', true)
|
addBooleanOption('html5', true)
|
||||||
links "https://jd.adventure.kyori.net/api/$adventureVersion/"
|
links "https://jd.adventure.kyori.net/api/$adventureVersion/"
|
||||||
links "https://docs.oracle.com/en/java/javase/11/docs/api/"
|
links "https://docs.oracle.com/en/java/javase/11/docs/api/"
|
||||||
|
Loading…
Reference in New Issue
Block a user