From 2d57749f44baeed6304ab2a797b56eb3c217b4de Mon Sep 17 00:00:00 2001 From: WarmthDawn Date: Tue, 28 Sep 2021 12:23:17 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E6=B0=94=E5=8A=A8?= =?UTF-8?q?=E5=B7=A5=E8=89=BA=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 2 +- gradle.properties | 4 ++-- src/main/java/com/warmthdawn/mod/gugu_utils/GuGuUtils.java | 3 ++- .../mod/gugu_utils/jei/renders/RendererCompressedAir.java | 2 +- version.properties | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d238cc8..7a27724 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: run: ./gradlew build - uses: "marvinpinto/action-automatic-releases@latest" with: - automatic_release_tag: "latest" + automatic_release_tag: "${{ github.ref }}" repo_token: "${{ secrets.GITHUB_TOKEN }}" prerelease: false files: | diff --git a/gradle.properties b/gradle.properties index 79b7d60..b5f08cf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # Sets default memory used for gradle commands. Can be overridden by user or command line properties. # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx3G -mod_version=0.7.6 +mod_version=0.7.7 mc_version=1.12.2 mc_short=1.12 forge_version=14.23.5.2847 @@ -33,6 +33,6 @@ bloodmagic_version=2.4.3-105 bloodmagic_version_curse=224791:2822288 guideapi_version=228832:2645992 thaumcraft_version=223628:2629023 -pneumaticcraft_repressurized_version=1.12.2-0.9.4-335 +pneumaticcraft_repressurized_version=1.12.2-0.11.9-384 computercraft_version=67504:2478952 theoneprobe_version=1.12-1.4.28-17 \ No newline at end of file diff --git a/src/main/java/com/warmthdawn/mod/gugu_utils/GuGuUtils.java b/src/main/java/com/warmthdawn/mod/gugu_utils/GuGuUtils.java index 8e0b25a..90ed5af 100644 --- a/src/main/java/com/warmthdawn/mod/gugu_utils/GuGuUtils.java +++ b/src/main/java/com/warmthdawn/mod/gugu_utils/GuGuUtils.java @@ -17,7 +17,8 @@ @Mod(modid = GuGuUtils.MODID, name = GuGuUtils.NAME, version = GuGuUtils.VERSION, dependencies = GuGuUtils.DEPENDENCY) public class GuGuUtils { public static final String MODID = "gugu-utils"; - public static final String DEPENDENCY = "required-after:forge@[14.23.5.2847,);required-after:codechickenlib@[3.2.2,);required-after:mcjtylib_ng@[3.5.4,);after:modularmachinery;"; + public static final String DEPENDENCY = "required-after:forge@[14.23.5.2847,);required-after:codechickenlib@[3.2.2,);required-after:mcjtylib_ng@[3.5.4,);" + + "after:modularmachinery;after:pneumaticcraft;after:naturesaura;"; public static final String NAME = "GuGu Utils"; public static final String VERSION = "@VERSION@"; public static final CreativeTabs creativeTab = new CreativeTabs(GuGuUtils.MODID) { diff --git a/src/main/java/com/warmthdawn/mod/gugu_utils/jei/renders/RendererCompressedAir.java b/src/main/java/com/warmthdawn/mod/gugu_utils/jei/renders/RendererCompressedAir.java index 5a49140..5daf5bf 100644 --- a/src/main/java/com/warmthdawn/mod/gugu_utils/jei/renders/RendererCompressedAir.java +++ b/src/main/java/com/warmthdawn/mod/gugu_utils/jei/renders/RendererCompressedAir.java @@ -3,7 +3,7 @@ import com.google.common.collect.Lists; import com.warmthdawn.mod.gugu_utils.handler.ClientEventHandler; import com.warmthdawn.mod.gugu_utils.jei.ingedients.IngredientCompressedAir; -import me.desht.pneumaticcraft.client.gui.GuiUtils; +import me.desht.pneumaticcraft.client.util.GuiUtils; import me.desht.pneumaticcraft.lib.PneumaticValues; import mezz.jei.api.ingredients.IIngredientRenderer; import net.minecraft.client.Minecraft; diff --git a/version.properties b/version.properties index 54ca403..44393af 100644 --- a/version.properties +++ b/version.properties @@ -1,3 +1,3 @@ -#Mon Sep 27 17:38:38 CST 2021 +#Tue Sep 28 11:26:01 CST 2021 SAVED_VERSION=0.7.6 -BUILD_NUMBER=1 +BUILD_NUMBER=5