Merge branch 'master' into pre/1.13

Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch

@@ -1,4 +1,4 @@
-From 38e2e079115d4abb46751d6f46fa47a4b11a3e10 Mon Sep 17 00:00:00 2001
+From d97433ee8959c0eb3fc72716910954cd5abb85bd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 15 Jan 2018 21:46:46 -0500
 Subject: [PATCH] Basic PlayerProfile API
@@ -7,10 +7,10 @@ Provides basic elements of a PlayerProfile to be used by future API/events
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
 new file mode 100644
-index 000000000..1a69e5f75
+index 000000000..529c53760
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PlayerProfile.java
-@@ -0,0 +1,141 @@
+@@ -0,0 +1,142 @@
 +package com.destroystokyo.paper.profile;
 +
 +import javax.annotation.Nonnull;
@@ -140,6 +140,7 @@ index 000000000..1a69e5f75
 +     * This is a blocking operation and should be done asynchronously.
 +     *
 +     * Optionally will also fill textures.
++     * @param textures controls if we should fill the profile with texture properties
 +     * @return If the profile is now complete (has UUID and Name) (if you get rate limited, this operation may fail)
 +     */
 +    boolean complete(boolean textures);