Merge branch 'dev/1.1.0' into dev/2.0.0

# Conflicts:
#	build.gradle
This commit is contained in:
Andrew Steinborn
2020-10-28 20:33:57 -04:00
34 changed files with 650 additions and 114 deletions

View File

@@ -89,19 +89,4 @@ publishing {
artifact javadocJar
}
}
repositories {
maven {
credentials {
username System.getenv("NEXUS_USERNAME")
password System.getenv("NEXUS_PASSWORD")
}
name = 'velocity-nexus'
def base = 'https://nexus.velocitypowered.com/repository/velocity-artifacts'
def releasesRepoUrl = "$base-releases/"
def snapshotsRepoUrl = "$base-snapshots/"
url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
}
}
}