Skip to content

Commit

Permalink
Merge branch '1.16' into release-1.16
Browse files Browse the repository at this point in the history
  • Loading branch information
Buuz135 committed Dec 29, 2023
2 parents 14e0172 + db41a11 commit 157d680
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
15 changes: 6 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ buildscript {
}
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.4.0"
}
}

plugins {
id 'maven-publish'
id 'org.cadixdev.licenser' version '0.6.1'
//id 'org.cadixdev.licenser' version '0.6.1'
id "com.matthewprenger.cursegradle" version "1.4.0"
id "se.bjurr.gitchangelog.git-changelog-gradle-plugin" version "1.71.4"
}
Expand Down Expand Up @@ -120,9 +120,6 @@ repositories {
maven {
url "https://maven.tterrag.com/"
}
maven {
url 'https://cdn.hrzn.studio/maven/'
}
maven {
name 'jared maven'
url "https://maven.blamejared.com/"
Expand All @@ -147,8 +144,8 @@ repositories {

dependencies {
minecraft 'net.minecraftforge:forge:1.16.5-36.2.8'
compileOnly fg.deobf ('com.hrznstudio:titanium:1.16.5-3.2.8.2')
runtimeOnly fg.deobf ('com.hrznstudio:titanium:1.16.5-3.2.8.2')
compileOnly fg.deobf('com.hrznstudio:titanium:1.16.5-3.2.8.8-24')
runtimeOnly fg.deobf('com.hrznstudio:titanium:1.16.5-3.2.8.8-24')
//if (findProject(':workspace') == null) {
compileOnly fg.deobf("mezz.jei:jei-1.16.5:7.7.1.121:api")
// at runtime, use the full JEI jar
Expand Down Expand Up @@ -218,14 +215,14 @@ publishing {
}
}

license {
/*license {
header = project.file('HEADER')
ext {
year = Calendar.getInstance().get(Calendar.YEAR)
name = 'Buuz135'
mod = 'Industrial foregoing'
}
}
}*/


jar {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 157d680

Please sign in to comment.