From 4d67be487a9e933e25a4d89e9de41627184069ab Mon Sep 17 00:00:00 2001 From: DianeXD Date: Sun, 3 Jul 2022 12:40:52 +0800 Subject: [PATCH] Resolve conflict... --- src/main/java/binnie/core/BinnieCore.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 8072bf64..464a4c1b 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -46,12 +46,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import net.minecraftforge.client.event.TextureStitchEvent; -import static binnie.core.BinnieCore.*; - @Mod( modid = "BinnieCore", name = "Binnie Core", - version = VERSION, + version = BinnieCore.VERSION, useMetadata = true, dependencies = "after:Forestry@[4.2,)") public class BinnieCore extends AbstractMod {