diff --git a/dependencies.gradle b/dependencies.gradle index ca530354..69a9a4f6 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -3,8 +3,8 @@ dependencies { api('com.github.GTNewHorizons:EnderCore:0.4.6:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.7:dev') - compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.38-GTNH:dev') - api("com.github.GTNewHorizons:GTNHLib:0.6.20:dev") + compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.40-GTNH:dev') + api("com.github.GTNewHorizons:GTNHLib:0.6.21:dev") compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.42:dev') api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748 shadowImplementation('cglib:cglib-nodep:3.3.0') @@ -13,7 +13,7 @@ dependencies { compileOnly('com.github.GTNewHorizons:waila:1.8.4:api') {transitive = false} compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-586-GTNH:api') {transitive = false} compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.254:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.256:dev') {transitive = false} compileOnly("com.github.GTNewHorizons:ModularUI2:2.2.7-1.7.10:dev") {transitive = false} compileOnly('com.github.GTNewHorizons:Railcraft:9.16.21:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.0-GTNH:api') {transitive = false} diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 2e0b0e24..a7e8ca94 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -595,6 +595,8 @@ public final class Config { public static boolean strictTPItemChecking = true; + public static float fusedQuartzExplosionResistance = 2000.0f; + public static void load(FMLPreInitializationEvent event) { PacketHandler.INSTANCE .registerMessage(PacketConfigSync.class, PacketConfigSync.class, PacketHandler.nextID(), Side.CLIENT); @@ -2969,6 +2971,13 @@ public final class Config { strictTPItemChecking, "If true, turn on strict checking of item energy checking. This might cause traveling tools from third party mods to fire fake security warnings on server side and not function correctly.") .getBoolean(strictTPItemChecking); + fusedQuartzExplosionResistance = config.getFloat( + "fusedQuartzExplosionResistance", + sectionMisc.name, + fusedQuartzExplosionResistance, + 0.0f, + Float.MAX_VALUE, + "How blast resistant the three Fused Quartz blocks should be."); } public static void checkYetaAccess() { diff --git a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java index 0322ced7..70205484 100644 --- a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java +++ b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java @@ -129,7 +129,7 @@ public class BlockFusedQuartz extends BlockEio { int meta = world.getBlockMetadata(x, y, z); Type type = Type.byMeta(meta); if (type.blastResistance) { - return 20; + return Config.fusedQuartzExplosionResistance; } else { return super.getExplosionResistance(par1Entity); }