fix merge conflicts

catgirlseraid · Jul 14, 2024 · cfeac00 · cfeac00
1 parent 340a07a
commit cfeac00
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ItemPickupLog.kt b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/ItemPickupLog.kt
@@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.InventoryUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
 import at.hannibal2.skyhanni.utils.ItemUtils.getItemRarityOrNull
@@ -22,6 +23,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.util.Objects
 import kotlin.time.Duration.Companion.seconds
 
+@SkyHanniModule
 object ItemPickupLog {
     private val config get() = SkyHanniMod.feature.inventory.itemPickupLogConfig