From 6282fc385baf8328a3ad1bf310c1f2c645a45f78 Mon Sep 17 00:00:00 2001 From: UnRealDinnerbone Date: Wed, 24 Apr 2024 11:22:17 -0500 Subject: [PATCH] Update to 1.20.5 --- .github/workflows/release.yml | 2 +- CHANGELOG.md | 4 ++-- build.gradle | 6 +++--- gradle.properties | 14 +++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- .../META-INF/{mods.toml => neoforge.mods.toml} | 0 settings.gradle | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) rename neo/src/main/resources/META-INF/{mods.toml => neoforge.mods.toml} (100%) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 160f9b2..2df97a4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: !contains(github.event.head_commit.message, '[ciskip]') uses: nanite/workflows/.github/workflows/standard-modmuss.yml@v1.1 with: - java-version: 17 + java-version: 21 changelog-file: "./CHANGELOG.md" release-to-github: false secrets: diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c4d5ce..df8eb47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ -### 4.0.1 +### 5.0.0 -- Update to Minecraft 1.20.4 +- Update to Minecraft 1.20.5 diff --git a/build.gradle b/build.gradle index 54ee40a..f40c02d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ plugins { - id("dev.nanite.mlp") version("0.1.1") + id("dev.nanite.mlp") version("0.1.8") id("java-library") id("maven-publish") id("me.modmuss50.mod-publish-plugin") version "0.3.0" } -java.toolchain.languageVersion = JavaLanguageVersion.of(17) +java.toolchain.languageVersion = JavaLanguageVersion.of(21) multiLoader.root() { minecraftVersion.set(project.property("minecraft_version")) @@ -33,7 +33,7 @@ subprojects { sourceSets.main.resources.srcDir project.file('src/generated/resources') - java.toolchain.languageVersion = JavaLanguageVersion.of(17) + java.toolchain.languageVersion = JavaLanguageVersion.of(21) base { diff --git a/gradle.properties b/gradle.properties index c6a5e4e..ced1f6f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Project -mod_version=4.0.1 +mod_version=5.0.0 maven_group=com.unrealdinnerbone curse_id=517002 mod_name=IBICF @@ -8,18 +8,18 @@ mod_id=ibicf # Common -minecraft_version=1.20.4 +minecraft_version=1.20.5 # Forge -forge_version=49.0.13 +#forge_version=49.0.13 -neo_version=20.4.70-beta +neo_version=20.5.0-beta -fabric_version=0.91.2+1.20.4 -fabric_loader_version=0.15.1 +fabric_version=0.97.6+1.20.5 +fabric_loader_version=0.15.10 # Other -trenzalore_version=4.0.1 +trenzalore_version=5.0.1 # Gradle org.gradle.jvmargs=-Xmx3G diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a595206..48c0a02 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/neo/src/main/resources/META-INF/mods.toml b/neo/src/main/resources/META-INF/neoforge.mods.toml similarity index 100% rename from neo/src/main/resources/META-INF/mods.toml rename to neo/src/main/resources/META-INF/neoforge.mods.toml diff --git a/settings.gradle b/settings.gradle index 6ce624f..b534184 100644 --- a/settings.gradle +++ b/settings.gradle @@ -23,4 +23,4 @@ pluginManagement { -include("common", "neo", "fabric", "forge") \ No newline at end of file +include("common", "neo", "fabric") \ No newline at end of file