mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-22 05:02:34 +00:00
Resolve conflict
This commit is contained in:
1 parent
8683a345c3
commit
60325eeab9
1 file changed
+2
-2
@@ -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",
|
||||
|
||||
Reference in new issue
Block a user