mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-12 16:37:29 +00:00
Resolve conflict...
This commit is contained in:
1 parent
60325eeab9
commit
4d67be487a
1 file changed
+1
-3
@@ -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 {
|
||||
|
||||
Reference in new issue
Block a user