From 92837b9f8ae6eb51c6d650a34e8cec2d348c9512 Mon Sep 17 00:00:00 2001 From: Ruben Taelman Date: Sun, 18 Aug 2024 13:04:42 +0200 Subject: [PATCH] Bump mod version --- buildSrc/src/main/groovy/multiloader-common.gradle | 6 +----- gradle.properties | 4 ++-- .../resources => resources}/changelog/1.12.2-1.0.0.txt | 0 .../resources => resources}/changelog/1.12.2-1.0.1.txt | 0 .../resources => resources}/changelog/1.12.2-1.0.2.txt | 0 .../resources => resources}/changelog/1.12.2-1.0.3.txt | 0 .../resources => resources}/changelog/1.14.4-1.0.3.txt | 0 .../resources => resources}/changelog/1.14.4-1.0.4.txt | 0 .../resources => resources}/changelog/1.14.4-1.0.5.txt | 0 .../resources => resources}/changelog/1.14.4-1.0.6.txt | 0 .../resources => resources}/changelog/1.15.2-1.0.6.txt | 0 .../resources => resources}/changelog/1.16.4-1.0.6.txt | 0 .../resources => resources}/changelog/1.16.5-1.0.7.txt | 0 .../resources => resources}/changelog/1.16.5-1.1.0.txt | 0 .../resources => resources}/changelog/1.16.5-1.1.1.txt | 0 .../resources => resources}/changelog/1.16.5-1.1.2.txt | 0 .../resources => resources}/changelog/1.18.1-1.1.1.txt | 0 .../resources => resources}/changelog/1.18.1-1.1.2.txt | 0 .../resources => resources}/changelog/1.18.2-1.1.2.txt | 0 .../resources => resources}/changelog/1.19-1.1.2.txt | 0 .../resources => resources}/changelog/1.19-1.1.3.txt | 0 .../resources => resources}/changelog/1.19-1.1.4.txt | 0 .../resources => resources}/changelog/1.19.2-1.1.4.txt | 0 .../resources => resources}/changelog/1.19.2-1.1.5.txt | 0 .../resources => resources}/changelog/1.19.3-1.1.4.txt | 0 .../resources => resources}/changelog/1.19.4-1.1.4.txt | 0 .../resources => resources}/changelog/1.20.1-1.1.4.txt | 0 .../resources => resources}/changelog/1.20.1-1.1.5.txt | 0 .../resources => resources}/changelog/1.20.4-1.1.5.txt | 0 .../resources => resources}/changelog/1.21-1.1.5.txt | 0 resources/changelog/1.21.1-1.1.6.txt | 5 +++++ 31 files changed, 8 insertions(+), 7 deletions(-) rename {loader-neoforge/resources => resources}/changelog/1.12.2-1.0.0.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.12.2-1.0.1.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.12.2-1.0.2.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.12.2-1.0.3.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.14.4-1.0.3.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.14.4-1.0.4.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.14.4-1.0.5.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.14.4-1.0.6.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.15.2-1.0.6.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.16.4-1.0.6.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.16.5-1.0.7.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.16.5-1.1.0.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.16.5-1.1.1.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.16.5-1.1.2.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.18.1-1.1.1.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.18.1-1.1.2.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.18.2-1.1.2.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.19-1.1.2.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.19-1.1.3.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.19-1.1.4.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.19.2-1.1.4.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.19.2-1.1.5.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.19.3-1.1.4.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.19.4-1.1.4.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.20.1-1.1.4.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.20.1-1.1.5.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.20.4-1.1.5.txt (100%) rename {loader-neoforge/resources => resources}/changelog/1.21-1.1.5.txt (100%) create mode 100644 resources/changelog/1.21.1-1.1.6.txt diff --git a/buildSrc/src/main/groovy/multiloader-common.gradle b/buildSrc/src/main/groovy/multiloader-common.gradle index 00ebe5c..f502c91 100644 --- a/buildSrc/src/main/groovy/multiloader-common.gradle +++ b/buildSrc/src/main/groovy/multiloader-common.gradle @@ -47,14 +47,10 @@ def getModrinthKey() { } def getChangelog() { if (System.getenv().RELEASE) { - def path = "../resources/changelog/${project.minecraft_version}-${project.version}.txt"; - if (new File(path).exists()) { - return file(path).readText(); - } + return file("../resources/changelog/${project.minecraft_version}-${project.mod_version}.txt").getText(); } else { return "Changes since last release: ${project.github_url}/compare/${project.minecraft_version}-${project.mod_version}...${System.getenv().GITHUB_SHA}" } - return ""; } ext { secrets = getSecrets(); diff --git a/gradle.properties b/gradle.properties index 9bb2baa..441a349 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Project -mod_version=1.1.5 +mod_version=1.1.6 group=org.cyclops.flopper java_version=21 @@ -42,4 +42,4 @@ org.gradle.daemon=false org.gradle.caching=true # Common dependencies -cyclopscore_version=1.19.11-559 +cyclopscore_version=1.20.0-568 diff --git a/loader-neoforge/resources/changelog/1.12.2-1.0.0.txt b/resources/changelog/1.12.2-1.0.0.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.12.2-1.0.0.txt rename to resources/changelog/1.12.2-1.0.0.txt diff --git a/loader-neoforge/resources/changelog/1.12.2-1.0.1.txt b/resources/changelog/1.12.2-1.0.1.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.12.2-1.0.1.txt rename to resources/changelog/1.12.2-1.0.1.txt diff --git a/loader-neoforge/resources/changelog/1.12.2-1.0.2.txt b/resources/changelog/1.12.2-1.0.2.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.12.2-1.0.2.txt rename to resources/changelog/1.12.2-1.0.2.txt diff --git a/loader-neoforge/resources/changelog/1.12.2-1.0.3.txt b/resources/changelog/1.12.2-1.0.3.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.12.2-1.0.3.txt rename to resources/changelog/1.12.2-1.0.3.txt diff --git a/loader-neoforge/resources/changelog/1.14.4-1.0.3.txt b/resources/changelog/1.14.4-1.0.3.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.14.4-1.0.3.txt rename to resources/changelog/1.14.4-1.0.3.txt diff --git a/loader-neoforge/resources/changelog/1.14.4-1.0.4.txt b/resources/changelog/1.14.4-1.0.4.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.14.4-1.0.4.txt rename to resources/changelog/1.14.4-1.0.4.txt diff --git a/loader-neoforge/resources/changelog/1.14.4-1.0.5.txt b/resources/changelog/1.14.4-1.0.5.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.14.4-1.0.5.txt rename to resources/changelog/1.14.4-1.0.5.txt diff --git a/loader-neoforge/resources/changelog/1.14.4-1.0.6.txt b/resources/changelog/1.14.4-1.0.6.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.14.4-1.0.6.txt rename to resources/changelog/1.14.4-1.0.6.txt diff --git a/loader-neoforge/resources/changelog/1.15.2-1.0.6.txt b/resources/changelog/1.15.2-1.0.6.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.15.2-1.0.6.txt rename to resources/changelog/1.15.2-1.0.6.txt diff --git a/loader-neoforge/resources/changelog/1.16.4-1.0.6.txt b/resources/changelog/1.16.4-1.0.6.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.16.4-1.0.6.txt rename to resources/changelog/1.16.4-1.0.6.txt diff --git a/loader-neoforge/resources/changelog/1.16.5-1.0.7.txt b/resources/changelog/1.16.5-1.0.7.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.16.5-1.0.7.txt rename to resources/changelog/1.16.5-1.0.7.txt diff --git a/loader-neoforge/resources/changelog/1.16.5-1.1.0.txt b/resources/changelog/1.16.5-1.1.0.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.16.5-1.1.0.txt rename to resources/changelog/1.16.5-1.1.0.txt diff --git a/loader-neoforge/resources/changelog/1.16.5-1.1.1.txt b/resources/changelog/1.16.5-1.1.1.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.16.5-1.1.1.txt rename to resources/changelog/1.16.5-1.1.1.txt diff --git a/loader-neoforge/resources/changelog/1.16.5-1.1.2.txt b/resources/changelog/1.16.5-1.1.2.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.16.5-1.1.2.txt rename to resources/changelog/1.16.5-1.1.2.txt diff --git a/loader-neoforge/resources/changelog/1.18.1-1.1.1.txt b/resources/changelog/1.18.1-1.1.1.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.18.1-1.1.1.txt rename to resources/changelog/1.18.1-1.1.1.txt diff --git a/loader-neoforge/resources/changelog/1.18.1-1.1.2.txt b/resources/changelog/1.18.1-1.1.2.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.18.1-1.1.2.txt rename to resources/changelog/1.18.1-1.1.2.txt diff --git a/loader-neoforge/resources/changelog/1.18.2-1.1.2.txt b/resources/changelog/1.18.2-1.1.2.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.18.2-1.1.2.txt rename to resources/changelog/1.18.2-1.1.2.txt diff --git a/loader-neoforge/resources/changelog/1.19-1.1.2.txt b/resources/changelog/1.19-1.1.2.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.19-1.1.2.txt rename to resources/changelog/1.19-1.1.2.txt diff --git a/loader-neoforge/resources/changelog/1.19-1.1.3.txt b/resources/changelog/1.19-1.1.3.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.19-1.1.3.txt rename to resources/changelog/1.19-1.1.3.txt diff --git a/loader-neoforge/resources/changelog/1.19-1.1.4.txt b/resources/changelog/1.19-1.1.4.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.19-1.1.4.txt rename to resources/changelog/1.19-1.1.4.txt diff --git a/loader-neoforge/resources/changelog/1.19.2-1.1.4.txt b/resources/changelog/1.19.2-1.1.4.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.19.2-1.1.4.txt rename to resources/changelog/1.19.2-1.1.4.txt diff --git a/loader-neoforge/resources/changelog/1.19.2-1.1.5.txt b/resources/changelog/1.19.2-1.1.5.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.19.2-1.1.5.txt rename to resources/changelog/1.19.2-1.1.5.txt diff --git a/loader-neoforge/resources/changelog/1.19.3-1.1.4.txt b/resources/changelog/1.19.3-1.1.4.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.19.3-1.1.4.txt rename to resources/changelog/1.19.3-1.1.4.txt diff --git a/loader-neoforge/resources/changelog/1.19.4-1.1.4.txt b/resources/changelog/1.19.4-1.1.4.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.19.4-1.1.4.txt rename to resources/changelog/1.19.4-1.1.4.txt diff --git a/loader-neoforge/resources/changelog/1.20.1-1.1.4.txt b/resources/changelog/1.20.1-1.1.4.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.20.1-1.1.4.txt rename to resources/changelog/1.20.1-1.1.4.txt diff --git a/loader-neoforge/resources/changelog/1.20.1-1.1.5.txt b/resources/changelog/1.20.1-1.1.5.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.20.1-1.1.5.txt rename to resources/changelog/1.20.1-1.1.5.txt diff --git a/loader-neoforge/resources/changelog/1.20.4-1.1.5.txt b/resources/changelog/1.20.4-1.1.5.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.20.4-1.1.5.txt rename to resources/changelog/1.20.4-1.1.5.txt diff --git a/loader-neoforge/resources/changelog/1.21-1.1.5.txt b/resources/changelog/1.21-1.1.5.txt similarity index 100% rename from loader-neoforge/resources/changelog/1.21-1.1.5.txt rename to resources/changelog/1.21-1.1.5.txt diff --git a/resources/changelog/1.21.1-1.1.6.txt b/resources/changelog/1.21.1-1.1.6.txt new file mode 100644 index 0000000..fc349f4 --- /dev/null +++ b/resources/changelog/1.21.1-1.1.6.txt @@ -0,0 +1,5 @@ +As always, don't forget to backup your world before updating! +Requires CyclopsCore version 1.20.0 or higher. + +Changes: +* Refactor code to be compatible with NeoForge, Forge, and Fabric.