Merge remote-tracking branch 'upstream/1.11' into 1.12_firstpass

This commit is contained in:
Tom Elfring committed 2017-07-23 13:56:41 +02:00
commit df68b1e36a
299 files changed
+514 -9448

No files matched your search

@@ -14,9 +14,7 @@ import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;