Merge commit '4c36ca58e2710c8fd03eec1f50a885fb97fd9b68'

# Conflicts:
#	resources/vanilla

src/crafting/CraftingManager.php

@@ -167,6 +167,9 @@ class CraftingManager{
 		return $result;
 	}
 
+	/**
+	 * @param Item[] $outputs
+	 */
 	private static function hashOutputs(array $outputs) : string{
 		$outputs = self::pack($outputs);
 		usort($outputs, [self::class, "sort"]);

src/crafting/ShapelessRecipe.php

@@ -52,6 +52,9 @@ class ShapelessRecipe implements CraftingRecipe{
 		$this->results = Utils::cloneObjectArray($results);
 	}
 
+	/**
+	 * @return Item[]
+	 */
 	public function getResults() : array{
 		return Utils::cloneObjectArray($this->results);
 	}