diff options
| author | GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> | 2023-02-20 03:27:05 +0000 |
|---|---|---|
| committer | GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> | 2023-02-20 03:27:05 +0000 |
| commit | 8a0b2eef1c351c66c1c0b9dda2c3a451a9eb8e7d (patch) | |
| tree | 2537d58d357e774740812f9e033468486c64c96d /src/main/java/com | |
| parent | 7634209f09e763bb9b2e7ca10a7c0ff0852828d6 (diff) | |
| parent | f1f15c9297538e07f79944fe434aad33c4da193f (diff) | |
| download | GT5-Unofficial-8a0b2eef1c351c66c1c0b9dda2c3a451a9eb8e7d.tar.gz GT5-Unofficial-8a0b2eef1c351c66c1c0b9dda2c3a451a9eb8e7d.tar.bz2 GT5-Unofficial-8a0b2eef1c351c66c1c0b9dda2c3a451a9eb8e7d.zip | |
Merge remote-tracking branch 'origin/master' into ImproveRecipes
# Conflicts:
# src/main/java/com/github/technus/tectech/thing/block/EyeOfHarmonyBlock.java
# src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java
Diffstat (limited to 'src/main/java/com')
2 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/block/EyeOfHarmonyBlock.java b/src/main/java/com/github/technus/tectech/thing/block/EyeOfHarmonyBlock.java index 1085c2b3f3..ae5d3f5083 100644 --- a/src/main/java/com/github/technus/tectech/thing/block/EyeOfHarmonyBlock.java +++ b/src/main/java/com/github/technus/tectech/thing/block/EyeOfHarmonyBlock.java @@ -7,6 +7,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import com.github.technus.tectech.TecTech; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_EyeOfHarmony; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java index 9f78c82467..f0aa686d6a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java @@ -60,7 +60,7 @@ import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Output_ME; public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable, IGlobalWirelessEnergy, ISurvivalConstructable { - private static final boolean EOH_DEBUG_MODE = false; + public static final boolean EOH_DEBUG_MODE = false; private static final long MOLTEN_SPACETIME_PER_FAILURE_TIER = 14_400L; private static final double SPACETIME_FAILURE_BASE = 2; private static final String TOOLTIP_BAR = GOLD |