From 26a66a30abc2c0d522e62818e14869da261bce7d Mon Sep 17 00:00:00 2001 From: minecraft7771 Date: Sat, 28 Jan 2023 13:16:38 +0100 Subject: Remove overriden addFluidOutputs to fix bug with me output hatch --- .../multi/base/GT_MetaTileEntity_MultiblockBase_EM.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java index 74760bb84a..7497c9c300 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java @@ -395,23 +395,6 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt * Setting available data processing */ public void outputAfterRecipe_EM() {} - - /** - * to add fluids into hatches - * - * @param mOutputFluids - */ - @Override - protected void addFluidOutputs(FluidStack[] mOutputFluids) { - int min = Math.min(mOutputFluids.length, mOutputHatches.size()); - for (int i = 0; i < min; ++i) { - if (mOutputHatches.get(i) != null - && mOutputFluids[i] != null - && GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(mOutputHatches.get(i))) { - mOutputHatches.get(i).fill(mOutputFluids[i], true); - } - } - } // endregion // region tooltip and scanner result -- cgit From 8fc2aeb32b559c8f8077a56e21b7fc11c37dfc49 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 28 Jan 2023 15:39:14 +0100 Subject: bs --- build.gradle | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index bab3a3d8dc..d1f370d683 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1673027205 +//version: 1674845916 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -144,6 +144,7 @@ propertyDefaultIfUnset("modrinthProjectId", "") propertyDefaultIfUnset("modrinthRelations", "") propertyDefaultIfUnset("curseForgeProjectId", "") propertyDefaultIfUnset("curseForgeRelations", "") +propertyDefaultIfUnset("minimizeShadowedDependencies", true) String javaSourceDir = "src/main/java/" String scalaSourceDir = "src/main/scala/" @@ -415,7 +416,9 @@ shadowJar { attributes(getManifestAttributes()) } - minimize() // This will only allow shading for actually used classes + if (minimizeShadowedDependencies.toBoolean()) { + minimize() // This will only allow shading for actually used classes + } configurations = [ project.configurations.shadowImplementation, project.configurations.shadowCompile @@ -558,7 +561,9 @@ task shadowDevJar(type: ShadowJar) { attributes(getManifestAttributes()) } - minimize() // This will only allow shading for actually used classes + if (minimizeShadowedDependencies.toBoolean()) { + minimize() // This will only allow shading for actually used classes + } configurations = [ project.configurations.shadowImplementation, project.configurations.shadowCompile @@ -813,7 +818,7 @@ task updateBuildScript { } } -if (!project.getGradle().startParameter.isOffline() && isNewBuildScriptVersionAvailable(projectDir.toString())) { +if (!project.getGradle().startParameter.isOffline() && !Boolean.getBoolean('DISABLE_BUILDSCRIPT_UPDATE_CHECK') && isNewBuildScriptVersionAvailable(projectDir.toString())) { if (autoUpdateBuildScript.toBoolean()) { performBuildScriptUpdate(projectDir.toString()) } else { -- cgit From 3f93d4f773b69a0ce472373c859d2065cc15f828 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 28 Jan 2023 15:43:25 +0100 Subject: bump dep --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index de5c895fef..1c503a5265 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1') - compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.217-pre:dev') + compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.256-pre:dev') compile('com.github.GTNewHorizons:ModularUI:1.0.38:dev') compile('com.github.GTNewHorizons:Yamcl:0.5.84:dev') compile('com.github.GTNewHorizons:NotEnoughItems:2.3.20-GTNH:dev') -- cgit