From d60ae87e79816e9c2a77d632ca6ea627fab18642 Mon Sep 17 00:00:00 2001 From: bl4d3tv <10796919+bl4d3tv@users.noreply.github.com> Date: Thu, 13 Apr 2023 11:26:28 -0300 Subject: [PATCH 1/3] fix: change BCLib version to an existing one --- gradle.properties | 2 +- src/main/resources/fabric.mod.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3fe849e5..a94a1b26 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ archives_base_name=better-end # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api patchouli_version=1.19-73-FABRIC -bclib_version=2.1.7 +bclib_version=2.1.6 rei_version=9.1.500 jei_version=11.1.0.235 emi_version=0.6.3+1.19.2 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index fef3b828..6b0da160 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -55,7 +55,7 @@ "bclib": "2.1.x" }, "breaks": { - "bclib": "<2.1.7" + "bclib": "<2.1.6" }, "suggests": { "byg": ">=2.0.0", From b6e47c6e5814567dfd8f76e8727eebceb24bbd01 Mon Sep 17 00:00:00 2001 From: bl4d3tv <10796919+bl4d3tv@users.noreply.github.com> Date: Thu, 13 Apr 2023 11:27:48 -0300 Subject: [PATCH 2/3] fix: reference VEGETAL_DECORATION before PURPLE_POLYPORE, should fix Feature Order Cycle --- .../betterx/betterend/world/biome/land/ChorusForestBiome.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/betterx/betterend/world/biome/land/ChorusForestBiome.java b/src/main/java/org/betterx/betterend/world/biome/land/ChorusForestBiome.java index a087f443..15a16b73 100644 --- a/src/main/java/org/betterx/betterend/world/biome/land/ChorusForestBiome.java +++ b/src/main/java/org/betterx/betterend/world/biome/land/ChorusForestBiome.java @@ -34,8 +34,8 @@ public class ChorusForestBiome extends EndBiome.Config { .feature(EndFeatures.END_LAKE_RARE) .feature(EndFeatures.PYTHADENDRON_TREE) .feature(EndFeatures.PYTHADENDRON_BUSH) - .feature(EndFeatures.PURPLE_POLYPORE) .feature(Decoration.VEGETAL_DECORATION, EndPlacements.CHORUS_PLANT) + .feature(EndFeatures.PURPLE_POLYPORE) .feature(EndFeatures.CHORUS_GRASS) .feature(EndFeatures.CHORUS_MUSHROOM) .feature(EndFeatures.TAIL_MOSS) From 90a8e21274739e409738db265a813a86d7a93325 Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 16 May 2023 17:26:40 +0200 Subject: [PATCH 3/3] Delete gradle.properties Not needed --- gradle.properties | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 gradle.properties diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index a94a1b26..00000000 --- a/gradle.properties +++ /dev/null @@ -1,27 +0,0 @@ -# Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx2G -# Fabric Properties -# check these on https://fabricmc.net/versions.html -minecraft_version=1.19.2 -loader_version=0.14.9 -fabric_version=0.73.2+1.19.2 -#Loom -loom_version=0.12-SNAPSHOT -#Modrinth -modrinth_versions=["1.19", "1.19.1", "1.19.2"] -#`release`, `beta` or `alpha` -release_channel=release -modrinth_id=betterend -# Mod Properties -mod_version=2.1.5 -maven_group=org.betterx.betterend -archives_base_name=better-end -# Dependencies -# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api -patchouli_version=1.19-73-FABRIC -bclib_version=2.1.6 -rei_version=9.1.500 -jei_version=11.1.0.235 -emi_version=0.6.3+1.19.2 -trinkets_version=3.4.0 -cca_version=5.0.0-beta.1