Skip to content

Commit

Permalink
1.20.1 Release
Browse files Browse the repository at this point in the history
  • Loading branch information
ramidzkh committed Oct 1, 2023
1 parent 433fd10 commit e3957d4
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 16 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
id("net.minecraftforge.gradle") version "6.0.8"
id("net.neoforged.gradle") version "[6.0.18,6.2)"
id("com.matthewprenger.cursegradle") version "1.4.0"
id("com.diffplug.spotless") version "6.19.0"
id("com.modrinth.minotaur") version "2.8.1"
id("com.diffplug.spotless") version "6.22.0"
id("com.modrinth.minotaur") version "2.8.4"
}

group = "me.ramidzkh"
Expand Down Expand Up @@ -42,7 +42,7 @@ repositories {
}

dependencies {
minecraft("net.minecraftforge:forge:${minecraft_version}-${forge_version}")
minecraft("net.neoforged:forge:${minecraft_version}-${neoforge_version}")

// We depend on many AE2 internals, such as using their basic cell drive, thus not using classifier = "api"
implementation(fg.deobf("appeng:appliedenergistics2-forge:${ae2_version}"))
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
minecraft_version=1.20.1
forge_version=47.1.0
ae2_version=15.0.4-beta
mekanism_version=10.3.9.homebaked
jei_version=15.2.0.22
jade_id=4614153
neoforge_version=47.1.79
ae2_version=15.0.11
mekanism_version=10.4.0.14
jei_version=15.2.0.27
jade_id=4768593

org.gradle.daemon=false

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
5 changes: 1 addition & 4 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,10 @@ location of your Java installation."
fi
else
JAVACMD=java
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
Expand Down
1 change: 1 addition & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ pluginManagement {
repositories {
gradlePluginPortal()
maven { url = 'https://maven.minecraftforge.net/' }
maven { url = 'https://maven.neoforged.net/releases' }
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ side = "BOTH"
[[dependencies.appmek]]
modId = "mekanism"
mandatory = true
versionRange = "[10.3.9,11.0.0)"
versionRange = "[10.4.0,11.0.0)"
ordering = "AFTER"
side = "BOTH"

0 comments on commit e3957d4

Please sign in to comment.