Dependency updates

This commit is contained in:
canitzp 2020-09-04 07:34:25 +02:00
parent 3a7118be0f
commit 5eec8071d0
4 changed files with 23 additions and 32 deletions

12
.gitignore vendored
View file

@ -11,7 +11,6 @@
/lib /lib
/classes /classes
/bin/ /bin/
/run/
*.classpath *.classpath
*.project *.project
@ -19,12 +18,5 @@
*.launch *.launch
.settings/org.eclipse.jdt.core.prefs .settings/org.eclipse.jdt.core.prefs
*.prefs *.prefs
/run/ /run/*
.DS_Store *.DS_Store
src/.DS_Store
src/main/.DS_Store
src/main/java/.DS_Store
src/main/java/de/.DS_Store
src/main/java/de/ellpeck/.DS_Store
src/main/java/de/ellpeck/actuallyadditions/.DS_Store
src/main/java/de/ellpeck/actuallyadditions/mod/.DS_Store

View file

@ -22,18 +22,18 @@ archivesBaseName = "ActuallyAdditions-1.14.4"
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
minecraft { minecraft {
mappings channel: "snapshot", version: "20191107-1.14.3" mappings channel: "stable", version: "58-1.14.4"
runs { runs {
client = { client = {
properties 'forge.logging.markers': '' properties 'forge.logging.markers': ''
properties 'forge.logging.console.level': 'debug' properties 'forge.logging.console.level': 'debug'
workingDirectory project.file('run').canonicalPath workingDirectory project.file('run/client')
source sourceSets.main source sourceSets.main
} }
server = { server = {
properties 'forge.logging.markers': '' properties 'forge.logging.markers': ''
properties 'forge.logging.console.level': 'debug' properties 'forge.logging.console.level': 'debug'
workingDirectory project.file('run/server').canonicalPath workingDirectory project.file('run/server')
source sourceSets.main source sourceSets.main
} }
data = { data = {
@ -52,27 +52,26 @@ repositories {
maven { maven {
url "https://dvs1.progwml6.com/files/maven" url "https://dvs1.progwml6.com/files/maven"
} }
maven { //maven {
url "https://tehnut.info/maven" // url "https://tehnut.info/maven"
} //}
} }
dependencies { dependencies {
minecraft 'net.minecraftforge:forge:1.14.4-28.1.86' minecraft 'net.minecraftforge:forge:1.14.4-28.2.0'
compile fg.deobf('mezz.jei:jei-1.14.4:6.0.0.24') compile fg.deobf('mezz.jei:jei-1.14.4:6.0.1.30')
compile fg.deobf('mcp.mobius.waila:Hwyla:1.10.6-B67_1.14.4') //compile fg.deobf('mcp.mobius.waila:Hwyla:1.10.6-B67_1.14.4')
compile fileTree(dir: 'libs', include: '*.jar') //compile fileTree(dir: 'libs', include: '*.jar')
} }
jar { jar {
manifest { manifest {
attributes(["Specification-Title": "actuallyadditions", attributes(["Specification-Title" : "actuallyadditions",
"Specification-Vendor": "Ellpeck", "Specification-Vendor" : "Ellpeck",
"Specification-Version": "24.0", "Specification-Version" : "24.0",
"Implementation-Title": project.name, "Implementation-Title" : project.name,
"Implementation-Version": "${version}", "Implementation-Version" : "${version}",
"Implementation-Vendor" :"Ellpeck", "Implementation-Vendor" : "Ellpeck",
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")],) "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")],)
} }
} }

View file

@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip

View file

@ -15,7 +15,7 @@ authors="Ellpeck, Shadows_of_Fire"
[[dependencies.actuallyadditions]] [[dependencies.actuallyadditions]]
modId="forge" modId="forge"
mandatory=true mandatory=true
versionRange="[28.1.86,)" versionRange="[28.2,)"
ordering="NONE" ordering="NONE"
side="BOTH" side="BOTH"