Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
# Conflicts: # src/main/java/techreborn/client/container/ContainerAlloySmelter.java # src/main/java/techreborn/client/container/ContainerAssemblingMachine.java # src/main/java/techreborn/client/container/ContainerCentrifuge.java # src/main/java/techreborn/items/tools/ItemNanosaber.java
This commit is contained in:
commit
5782d2d032
10 changed files with 81 additions and 120 deletions
33
build.gradle
33
build.gradle
|
@ -67,7 +67,7 @@ configurations {
|
|||
}
|
||||
|
||||
|
||||
version = "1.4.11"
|
||||
version = "1.4.13"
|
||||
|
||||
def ENV = System.getenv()
|
||||
if (ENV.BUILD_NUMBER) {
|
||||
|
@ -282,4 +282,33 @@ configurations.all {
|
|||
}
|
||||
}
|
||||
|
||||
apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/ideconfig.gradle'
|
||||
apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/ideconfig.gradle'
|
||||
|
||||
import org.apache.commons.io.FileUtils;
|
||||
import groovy.util.XmlSlurper;
|
||||
import java.io.File;
|
||||
|
||||
task curseTools << {
|
||||
def cacheFiles = new File(".gradle/curseTools")
|
||||
if (!cacheFiles.exists()) cacheFiles.mkdirs()
|
||||
|
||||
def mavenMetadata = new File(cacheFiles, "maven-metadata.xml")
|
||||
|
||||
logger.lifecycle(":downloading curseTools metadata")
|
||||
FileUtils.copyURLToFile(new URL("http://maven.modmuss50.me/CurseTools/CurseTools/maven-metadata.xml"), mavenMetadata)
|
||||
|
||||
def metadata = new XmlSlurper().parseText(FileUtils.readFileToString(mavenMetadata))
|
||||
def curseToolsVersion = metadata.versioning.release
|
||||
|
||||
def curseTools = new File(cacheFiles, "${curseToolsVersion}.jar")
|
||||
|
||||
logger.lifecycle(":downloading CurseTools")
|
||||
FileUtils.copyURLToFile(new URL("http://maven.modmuss50.me/CurseTools/CurseTools/${curseToolsVersion}/CurseTools-${curseToolsVersion}.jar"), curseTools)
|
||||
|
||||
logger.lifecycle(":launching CurseTools")
|
||||
ant.java(jar: curseTools.getAbsolutePath(), fork: true, spawn: false) {
|
||||
arg(value: jar.archivePath.getAbsolutePath())
|
||||
arg(value: deobfJar.archivePath.getAbsolutePath())
|
||||
arg(value: apiJar.archivePath.getAbsolutePath())
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue