Merge remote-tracking branch 'origin/safe' into safe

# Conflicts:
#	gradle.properties
This commit is contained in:
xbaimiao
2024-08-28 11:27:20 +08:00
+27 -6
View File
@@ -1,5 +1,3 @@
import io.izzel.taboolib.gradle.*
plugins { plugins {
`java-library` `java-library`
`maven-publish` `maven-publish`
@@ -23,18 +21,41 @@ taboolib {
bukkitNodes["update-info"] = "支持1.12.2物品附加值" bukkitNodes["update-info"] = "支持1.12.2物品附加值"
} }
env { env {
install(NMS_UTIL, UI) // install(NMS_UTIL, UI)
install(EXPANSION_COMMAND_HELPER, BUKKIT_ALL) // install(EXPANSION_COMMAND_HELPER, BUKKIT_ALL)
install(DATABASE, CHAT, CONFIGURATION, LANG, NMS, KETHER) // install(DATABASE, CHAT, CONFIGURATION, LANG, NMS, KETHER)
install(
"bukkit-ui",
"minecraft-command-helper",
"bukkit-hook",
"bukkit-util",
"bukkit-xseries",
"bukkit-xseries-item",
"bukkit-xseries-skull",
"platform-bukkit",
"platform-bukkit-impl",
"database-sql",
"minecraft-chat",
"basic-configuration",
"minecraft-i18n",
"minecraft-kether"
)
forceDownloadInDev = false
repoTabooLib = "http://mcstarrysky.com:8081/repository/releases/"
} }
version { version {
taboolib = "6.1.1-beta17" taboolib = "6.2.0-beta18-dev"
} }
// relocate("kotlin", "libs.kotlin171") // relocate("kotlin", "libs.kotlin171")
relocate("com.xbaimiao.ktor", "com.github.xbaimiao.shoppro.stat") relocate("com.xbaimiao.ktor", "com.github.xbaimiao.shoppro.stat")
} }
repositories { repositories {
maven("http://mcstarrysky.com:8081/repository/releases/") {
isAllowInsecureProtocol = true
}
mavenCentral() mavenCentral()
maven("https://maven.xbaimiao.com/repository/maven-public/") maven("https://maven.xbaimiao.com/repository/maven-public/")
maven("https://r.irepo.space/maven/") maven("https://r.irepo.space/maven/")