mirror of
https://github.com/VolmitSoftware/Iris.git
synced 2025-07-18 18:23:06 +00:00
another I hate this
This commit is contained in:
parent
959ce3bc92
commit
486e92dfc9
@ -21,10 +21,7 @@ package com.volmit.iris.util.decree;
|
||||
import com.volmit.iris.core.tools.IrisToolbelt;
|
||||
import com.volmit.iris.engine.framework.Engine;
|
||||
import com.volmit.iris.engine.platform.PlatformChunkGenerator;
|
||||
<<<<<<< HEAD
|
||||
import com.volmit.iris.util.format.C;
|
||||
=======
|
||||
>>>>>>> master
|
||||
import com.volmit.iris.util.plugin.VolmitSender;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.entity.Player;
|
||||
|
Loading…
x
Reference in New Issue
Block a user