(cherry picked from commit bc0732c433e6e45ca7b8d5e439e36073a44498ab)
# Conflicts:
# CommonApi/src/main/java/mezz/jei/api/gui/IRecipeLayoutDrawable.java
# CommonApi/src/main/java/mezz/jei/api/ingredients/IIngredientRenderer.java
# CommonApi/src/main/java/mezz/jei/api/ingredients/subtypes/ISubtypeManager.java
# CommonApi/src/main/java/mezz/jei/api/recipe/advanced/IRecipeManagerPlugin.java
# CommonApi/src/main/java/mezz/jei/api/recipe/transfer/IRecipeTransferError.java
# CommonApi/src/main/java/mezz/jei/api/recipe/transfer/IRecipeTransferHandler.java
# CommonApi/src/main/java/mezz/jei/api/runtime/IClickableIngredient.java
# CommonApi/src/main/java/mezz/jei/api/runtime/IScreenHelper.java
# Forge/src/test/java/mezz/jei/test/lib/TestIngredientHelper.java
# Gui/src/main/java/mezz/jei/gui/recipes/RecipeTransferButton.java
# Library/src/main/java/mezz/jei/library/gui/GuiHelper.java
# Library/src/main/java/mezz/jei/library/gui/helpers/ScreenHelper.java
# Library/src/main/java/mezz/jei/library/ingredients/IngredientManager.java
# Library/src/main/java/mezz/jei/library/recipes/PluginManager.java
# Library/src/main/java/mezz/jei/library/recipes/RecipeManagerInternal.java
# Library/src/main/java/mezz/jei/library/transfer/BasicRecipeTransferInfo.java