From 60325eeab9dc134773b68f92594c8709866816bf Mon Sep 17 00:00:00 2001 From: DianeXD Date: Sun, 3 Jul 2022 12:32:57 +0800 Subject: [PATCH] Resolve conflict --- src/main/java/binnie/core/BinnieCore.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 8907daed..8072bf64 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -1,7 +1,5 @@ package binnie.core; -import static binnie.core.BinnieCore.*; - import binnie.Binnie; import binnie.core.block.MultipassBlockRenderer; import binnie.core.block.TileEntityMetadata; @@ -48,6 +46,8 @@ 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",