Merge remote-tracking branch 'origin/master'

dependencies.properties

@@ -1,5 +1,5 @@
 forge=47.1.3
-zeta=1.0-beta-4.39
+zeta=1.0-11.48
 jei=4712868
 terrablender=1.20.1-3.0.0.169
 flan=4819286

src/main/java/org/violetmoon/quark/base/handler/WoodSetHandler.java

@@ -125,6 +125,8 @@ public static WoodSet addWoodSet(ZRegister event, ZetaModule module, String name
 		WoodSet set = new WoodSet(name, module, type);
 
 		set.log = log(name + "_log", module, color, barkColor).setCreativeTab(CreativeModeTabs.BUILDING_BLOCKS, Blocks.BAMBOO_BLOCK, true);
+		set.hollowLog = new HollowLogBlock(set.log, module, flammable).setCondition(() -> Quark.ZETA.modules.isEnabledOrOverlapping(HollowLogsModule.class));
+
 		set.wood = new ZetaPillarBlock(name + "_wood", module, OldMaterials.wood().mapColor(barkColor).strength(2.0F).sound(SoundType.WOOD)).setCreativeTab(CreativeModeTabs.BUILDING_BLOCKS);
 		set.strippedLog = log("stripped_" + name + "_log", module, color, color).setCreativeTab(CreativeModeTabs.BUILDING_BLOCKS);
 		set.strippedWood = new ZetaPillarBlock("stripped_" + name + "_wood", module, OldMaterials.wood().mapColor(color).strength(2.0F).sound(SoundType.WOOD)).setCreativeTab(CreativeModeTabs.BUILDING_BLOCKS);
@@ -160,8 +162,6 @@ public static WoodSet addWoodSet(ZRegister event, ZetaModule module, String name
 		set.post = new WoodPostBlock(module, set.fence, "", sound).setCondition(() -> Quark.ZETA.modules.isEnabledOrOverlapping(WoodenPostsModule.class));
 		set.strippedPost = new WoodPostBlock(module, set.fence, "stripped_", sound).setCondition(() -> Quark.ZETA.modules.isEnabledOrOverlapping(WoodenPostsModule.class));
 
-		set.hollowLog = new HollowLogBlock(set.log, module, flammable).setCondition(() -> Quark.ZETA.modules.isEnabledOrOverlapping(HollowLogsModule.class));
-
 		VariantChestsModule.makeChestBlocksExternal(module, name, Blocks.CHEST, sound, BooleanSuppliers.TRUE);
 
 		set.signItem = new ZetaSignItem(module, set.sign, set.wallSign);