Merge branch 'master' into managers

# Conflicts:
#	build.gradle
#	src/main/java/me/clip/placeholderapi/commands/impl/cloud/CommandECloudExpansionList.java
#	src/main/java/me/clip/placeholderapi/expansion/cloud/ExpansionCloudManager.java
This commit is contained in:
Sxtanna 2020-07-24 14:34:54 -04:00
commit cbbb2f27e4

View File

@ -1,7 +1,6 @@
plugins {
id 'java'
id 'com.github.johnrengelman.shadow' version '6.0.0'
id 'com.github.sherter.google-java-format' version '0.9'
}
group 'me.clip'
@ -11,9 +10,8 @@ description 'PlaceholderAPI'
sourceCompatibility = JavaVersion.VERSION_1_8
repositories {
jcenter()
mavenCentral()
mavenLocal()
maven {
url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'
}
@ -23,9 +21,6 @@ repositories {
maven {
url = 'https://rayzr.dev/repo/'
}
maven {
url = 'http://repo.maven.apache.org/maven2'
}
}
dependencies {