[Jenkins]Jenkins

Changes

Summary

  1. Minor code cleanup and stricter API argument checking (details)
  2. Fix edge case of fluid containers with subtypes being mashed together (details)
Commit 9097e16723308d79acf9fef5cdb54604231502a5 by mezz
Minor code cleanup and stricter API argument checking
The file was modifiedsrc/main/java/mezz/jei/plugins/vanilla/ingredients/FluidStackRenderer.java (diff)
The file was modifiedsrc/main/java/mezz/jei/ModIngredientRegistration.java (diff)
The file was modifiedsrc/main/java/mezz/jei/util/color/ColorGetter.java (diff)
The file was modifiedsrc/main/java/mezz/jei/IngredientRegistry.java (diff)
The file was modifiedsrc/main/java/mezz/jei/config/Config.java (diff)
The file was modifiedsrc/main/java/mezz/jei/plugins/jei/JEIInternalPlugin.java (diff)
The file was modifiedsrc/main/java/mezz/jei/gui/DrawableAnimated.java (diff)
The file was modifiedsrc/main/java/mezz/jei/util/color/MMCQ.java (diff)
The file was modifiedsrc/main/java/mezz/jei/ItemBlacklist.java (diff)
The file was modifiedsrc/main/java/mezz/jei/plugins/vanilla/ingredients/ItemStackListFactory.java (diff)
The file was modifiedsrc/main/java/mezz/jei/gui/recipes/RecipeGuiTabs.java (diff)
The file was modifiedsrc/main/java/mezz/jei/gui/recipes/RecipeGuiLogic.java (diff)
The file was modifiedsrc/main/java/mezz/jei/gui/ingredients/GuiIngredientFast.java (diff)
The file was modifiedsrc/main/java/mezz/jei/input/InputHandler.java (diff)
The file was modifiedsrc/main/java/mezz/jei/plugins/vanilla/crafting/ShapedOreRecipeHandler.java (diff)
The file was modifiedsrc/main/java/mezz/jei/gui/ingredients/GuiIngredient.java (diff)
The file was modifiedsrc/main/java/mezz/jei/gui/DrawableBlank.java (diff)
The file was modifiedsrc/main/java/mezz/jei/util/RecipeMap.java (diff)
The file was modifiedsrc/main/java/mezz/jei/IngredientBaseListFactory.java (diff)
The file was modifiedsrc/main/java/mezz/jei/transfer/RecipeTransferHandlerHelper.java (diff)
The file was modifiedsrc/main/java/mezz/jei/util/ModRegistry.java (diff)
The file was modifiedsrc/main/java/mezz/jei/api/recipe/BlankRecipeWrapper.java (diff)
The file was modifiedsrc/main/java/mezz/jei/gui/recipes/RecipesGui.java (diff)
The file was modifiedsrc/main/java/mezz/jei/plugins/vanilla/ingredients/ItemStackHelper.java (diff)
The file was modifiedsrc/main/java/mezz/jei/api/BlankModPlugin.java (diff)
The file was modifiedsrc/main/java/mezz/jei/network/packets/PacketRequestCheatPermission.java (diff)
The file was modifiedsrc/main/java/mezz/jei/api/recipe/VanillaRecipeCategoryUid.java (diff)
The file was modifiedsrc/main/java/mezz/jei/util/RecipeTransferRegistry.java (diff)
The file was modifiedsrc/main/java/mezz/jei/util/Commands.java (diff)
The file was modifiedgradle.properties (diff)
The file was modifiedsrc/main/java/mezz/jei/SubtypeRegistry.java (diff)
The file was modifiedsrc/main/java/mezz/jei/gui/ingredients/GuiIngredientGroup.java (diff)
The file was modifiedsrc/main/java/mezz/jei/ItemFilter.java (diff)
The file was modifiedsrc/main/java/mezz/jei/gui/ItemListOverlay.java (diff)
The file was modifiedsrc/main/java/mezz/jei/util/StackHelper.java (diff)
The file was modifiedsrc/main/java/mezz/jei/gui/GuiHelper.java (diff)
The file was modifiedsrc/main/java/mezz/jei/RecipeRegistry.java (diff)
The file was modifiedsrc/main/java/mezz/jei/gui/ingredients/GuiIngredientFastList.java (diff)
The file was modifiedsrc/main/java/mezz/jei/util/Ingredients.java (diff)
The file was modifiedsrc/main/java/mezz/jei/transfer/RecipeTransferErrorInternal.java (diff)
Commit bff847c6922a8da9f83e0fbc590cf6ff4a8198a6 by mezz
Fix edge case of fluid containers with subtypes being mashed together
(#663)
* fixes issue reported to EnderIO 
https://github.com/SleepyTrousers/EnderIO/issues/3906
(cherry picked from commit ac236dca54e23402b2ed336f8dda1ddd3b655eb2)
# Conflicts:
#	src/main/java/mezz/jei/SubtypeRegistry.java
The file was modifiedsrc/main/java/mezz/jei/SubtypeRegistry.java (diff)