Merge branch 'master' into dev

GTNewHorizons · Sep 2, 2024 · 3c6053b · 3c6053b
2 parents e41a7d4 + 79dcece
commit 3c6053b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -3,12 +3,12 @@
 dependencies {
 	api('com.github.GTNewHorizons:BuildCraft:7.1.39:dev')
 	implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.47:dev')
-	implementation('com.github.GTNewHorizons:NotEnoughItems:2.6.33-GTNH:dev')
+	implementation('com.github.GTNewHorizons:NotEnoughItems:2.6.34-GTNH:dev')
     implementation('com.github.GTNewHorizons:ModularUI2:2.1.3-1.7.10:dev')
     implementation('com.github.GTNewHorizons:CodeChickenLib:1.3.0:dev')
 
 	compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.22-GTNH:api') { transitive = false }
-	compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-442-GTNH:api') { transitive = false }
+	compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-445-GTNH:api') { transitive = false }
 	compileOnly('com.github.GTNewHorizons:StorageDrawers:1.13.9-GTNH:api') { transitive = false }
 	compileOnly('com.github.GTNewHorizons:Jabba:1.4.6:dev') { transitive = false }
 	compileOnly('com.github.GTNewHorizons:ironchest:6.0.85:dev') { transitive = false }

diff --git a/src/main/java/logisticspipes/proxy/ic2/IC2Proxy.java b/src/main/java/logisticspipes/proxy/ic2/IC2Proxy.java
@@ -7,6 +7,7 @@
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import cpw.mods.fml.common.Loader;
 import ic2.api.energy.event.EnergyTileLoadEvent;
 import ic2.api.energy.event.EnergyTileUnloadEvent;
 import ic2.api.energy.tile.IEnergySink;
@@ -129,6 +130,9 @@ public boolean isPartiallyCharged(ItemStack stack) {
      */
     @Override
     public void addCraftingRecipes(ICraftingParts parts) {
+        if (Loader.isModLoaded("dreamcraft")) {
+            return;
+        }
         if (!Configs.ENABLE_BETA_RECIPES) {
             Recipes.advRecipes.addRecipe(
                     new ItemStack(LogisticsPipes.ModuleItem, 1, ItemModule.ELECTRICBUFFER),