Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-21 23:13:28 +01:00
Code Issues Projects Releases Wiki Activity

Update to 1.15.2

Browse source
This commit is contained in:
canitzp 2020-09-07 15:10:08 +02:00
parent 34d151c878
commit 4020a1a95d
5 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
build.gradle
View file

@ -18,12 +18,12 @@ apply plugin: 'maven-publish'
version = "2.0.0"
group = "de.ellpeck.actuallyadditions"
archivesBaseName = "ActuallyAdditions-1.14.4"
archivesBaseName = "ActuallyAdditions-1.15.2"
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
minecraft {
mappings channel: "snapshot", version: "20191107-1.14.3"
mappings channel: "stable", version: "60-1.15"
runs {
client = {
properties 'forge.logging.markers': ''
@ -51,21 +51,25 @@ minecraft {
repositories {
maven {
url "https://dvs1.progwml6.com/files/maven"
// location of the maven that hosts JEI files
name = "Progwml6 maven"
url = "https://dvs1.progwml6.com/files/maven/"
}
maven {
url "https://tehnut.info/maven"
// location of a maven mirror for JEI files, as a fallback
name = "ModMaven"
url = "https://modmaven.k-4u.nl"
}
}
dependencies {
minecraft 'net.minecraftforge:forge:1.14.4-28.1.86'
compile fg.deobf('mezz.jei:jei-1.14.4:6.0.0.24')
compile fg.deobf('mcp.mobius.waila:Hwyla:1.10.6-B67_1.14.4')
compile fileTree(dir: 'libs', include: '*.jar')
minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
// compile against the JEI API but do not include it at runtime
compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api")
// at runtime, use the full JEI jar
runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}")
}
jar {
manifest {
attributes(["Specification-Title": "actuallyadditions",

8
gradle.properties Normal file
View file

@ -0,0 +1,8 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false
mc_version=1.15.2
forge_version=31.2.0
jei_version=6.0.3.15

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

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

6
src/main/resources/META-INF/mods.toml
View file

@ -1,5 +1,5 @@
modLoader="javafml"
loaderVersion="[28,)"
loaderVersion="[31,)"
issueTrackerURL="http://github.com/Ellpeck/ActuallyAdditions/issues"
displayURL="http://github.com/Ellpeck/ActuallyAdditions"
logoFile="logo.png"
@ -15,13 +15,13 @@ authors="Ellpeck"
[[dependencies.actuallyadditions]]
modId="forge"
mandatory=true
versionRange="[28.1.86,)"
versionRange="[31.2,)"
ordering="NONE"
side="BOTH"
[[dependencies.actuallyadditions]]
modId="minecraft"
mandatory=true
versionRange="[1.14.4]"
versionRange="[1.15.2]"
ordering="NONE"
side="BOTH"

2
src/main/resources/pack.mcmeta
View file

@ -1,6 +1,6 @@
{
"pack": {
"description": "Actually Additions",
"pack_format": 4
"pack_format": 5
}
}