Started by an SCM change00001146211146211.000022d12c33d26f4c25b4e377700fd4effeddcd3327ccd12c33d26f4c25b4e377700fd4effeddcd3327ccorigin/masterd12c33d26f4c25b4e377700fd4effeddcd3327ccd12c33d26f4c25b4e377700fd4effeddcd3327ccorigin/master1866eddd0e14b6aa00fe0e58338fd061fcafa0ba4206eddd0e14b6aa00fe0e58338fd061fcafa0ba420origin/1.8.96eddd0e14b6aa00fe0e58338fd061fcafa0ba4206eddd0e14b6aa00fe0e58338fd061fcafa0ba420origin/1.8.91035e44f03932d1e98085327b4bd423f08afe31fd465e44f03932d1e98085327b4bd423f08afe31fd46origin/1.8.85e44f03932d1e98085327b4bd423f08afe31fd465e44f03932d1e98085327b4bd423f08afe31fd46origin/1.8.82b31fb79394463b329a02f66d6062ba2746d61a1bb31fb79394463b329a02f66d6062ba2746d61a1borigin/1.8b31fb79394463b329a02f66d6062ba2746d61a1bb31fb79394463b329a02f66d6062ba2746d61a1borigin/1.8204bff847c6922a8da9f83e0fbc590cf6ff4a8198a6bff847c6922a8da9f83e0fbc590cf6ff4a8198a6origin/1.11bff847c6922a8da9f83e0fbc590cf6ff4a8198a6bff847c6922a8da9f83e0fbc590cf6ff4a8198a6origin/1.11bff847c6922a8da9f83e0fbc590cf6ff4a8198a6bff847c6922a8da9f83e0fbc590cf6ff4a8198a6origin/1.11https://github.com/mezz/JustEnoughItems.gitfalse#20411462130783JustEnoughItems-MC1.11 #204204falsefalse2044568SUCCESS1481619069378https://dvs1.progwml6.com/jenkins/job/JustEnoughItems-MC1.11/204/src/main/java/mezz/jei/util/RecipeTransferRegistry.javasrc/main/java/mezz/jei/gui/recipes/RecipesGui.javasrc/main/java/mezz/jei/plugins/vanilla/crafting/ShapedOreRecipeHandler.javasrc/main/java/mezz/jei/util/StackHelper.javasrc/main/java/mezz/jei/ItemFilter.javasrc/main/java/mezz/jei/IngredientRegistry.javasrc/main/java/mezz/jei/network/packets/PacketRequestCheatPermission.javasrc/main/java/mezz/jei/RecipeRegistry.javasrc/main/java/mezz/jei/ItemBlacklist.javasrc/main/java/mezz/jei/util/RecipeMap.javasrc/main/java/mezz/jei/util/Commands.javasrc/main/java/mezz/jei/config/Config.javasrc/main/java/mezz/jei/gui/ingredients/GuiIngredientGroup.javasrc/main/java/mezz/jei/util/ModRegistry.javasrc/main/java/mezz/jei/transfer/RecipeTransferErrorInternal.javasrc/main/java/mezz/jei/util/Ingredients.javasrc/main/java/mezz/jei/gui/DrawableAnimated.javasrc/main/java/mezz/jei/gui/GuiHelper.javasrc/main/java/mezz/jei/ModIngredientRegistration.javasrc/main/java/mezz/jei/api/recipe/BlankRecipeWrapper.javasrc/main/java/mezz/jei/gui/ingredients/GuiIngredientFastList.javasrc/main/java/mezz/jei/SubtypeRegistry.javasrc/main/java/mezz/jei/api/recipe/VanillaRecipeCategoryUid.javasrc/main/java/mezz/jei/util/color/ColorGetter.javasrc/main/java/mezz/jei/gui/recipes/RecipeGuiTabs.javasrc/main/java/mezz/jei/gui/ItemListOverlay.javasrc/main/java/mezz/jei/gui/ingredients/GuiIngredientFast.javasrc/main/java/mezz/jei/transfer/RecipeTransferHandlerHelper.javasrc/main/java/mezz/jei/IngredientBaseListFactory.javasrc/main/java/mezz/jei/gui/recipes/RecipeGuiLogic.javasrc/main/java/mezz/jei/gui/ingredients/GuiIngredient.javasrc/main/java/mezz/jei/gui/DrawableBlank.javagradle.propertiessrc/main/java/mezz/jei/plugins/vanilla/ingredients/FluidStackRenderer.javasrc/main/java/mezz/jei/plugins/vanilla/ingredients/ItemStackListFactory.javasrc/main/java/mezz/jei/plugins/vanilla/ingredients/ItemStackHelper.javasrc/main/java/mezz/jei/api/BlankModPlugin.javasrc/main/java/mezz/jei/plugins/jei/JEIInternalPlugin.javasrc/main/java/mezz/jei/util/color/MMCQ.javasrc/main/java/mezz/jei/input/InputHandler.java9097e16723308d79acf9fef5cdb54604231502a51481618866000https://dvs1.progwml6.com/jenkins/user/mezzmezztehgeek@gmail.comMinor code cleanup and stricter API argument checking 2016-12-13 00:47:46 -08009097e16723308d79acf9fef5cdb54604231502a5Minor code cleanup and stricter API argument checkingeditsrc/main/java/mezz/jei/plugins/vanilla/ingredients/ItemStackHelper.javaeditsrc/main/java/mezz/jei/SubtypeRegistry.javaeditsrc/main/java/mezz/jei/plugins/vanilla/crafting/ShapedOreRecipeHandler.javaeditsrc/main/java/mezz/jei/gui/recipes/RecipeGuiTabs.javaeditsrc/main/java/mezz/jei/api/BlankModPlugin.javaeditsrc/main/java/mezz/jei/input/InputHandler.javaeditsrc/main/java/mezz/jei/plugins/vanilla/ingredients/ItemStackListFactory.javaeditsrc/main/java/mezz/jei/util/ModRegistry.javaeditsrc/main/java/mezz/jei/gui/GuiHelper.javaeditsrc/main/java/mezz/jei/plugins/vanilla/ingredients/FluidStackRenderer.javaeditsrc/main/java/mezz/jei/plugins/jei/JEIInternalPlugin.javaeditsrc/main/java/mezz/jei/transfer/RecipeTransferErrorInternal.javaeditsrc/main/java/mezz/jei/ItemBlacklist.javaeditsrc/main/java/mezz/jei/api/recipe/VanillaRecipeCategoryUid.javaeditsrc/main/java/mezz/jei/gui/ingredients/GuiIngredient.javaeditsrc/main/java/mezz/jei/IngredientRegistry.javaeditsrc/main/java/mezz/jei/gui/ingredients/GuiIngredientGroup.javaeditsrc/main/java/mezz/jei/gui/DrawableAnimated.javaeditsrc/main/java/mezz/jei/gui/ingredients/GuiIngredientFastList.javaeditsrc/main/java/mezz/jei/api/recipe/BlankRecipeWrapper.javaeditsrc/main/java/mezz/jei/util/RecipeMap.javaeditsrc/main/java/mezz/jei/gui/ItemListOverlay.javaeditsrc/main/java/mezz/jei/util/Commands.javaeditsrc/main/java/mezz/jei/network/packets/PacketRequestCheatPermission.javaeditgradle.propertieseditsrc/main/java/mezz/jei/util/Ingredients.javaeditsrc/main/java/mezz/jei/gui/DrawableBlank.javaeditsrc/main/java/mezz/jei/RecipeRegistry.javaeditsrc/main/java/mezz/jei/gui/ingredients/GuiIngredientFast.javaeditsrc/main/java/mezz/jei/util/color/MMCQ.javaeditsrc/main/java/mezz/jei/ItemFilter.javaeditsrc/main/java/mezz/jei/util/RecipeTransferRegistry.javaeditsrc/main/java/mezz/jei/gui/recipes/RecipeGuiLogic.javaeditsrc/main/java/mezz/jei/util/StackHelper.javaeditsrc/main/java/mezz/jei/transfer/RecipeTransferHandlerHelper.javaeditsrc/main/java/mezz/jei/util/color/ColorGetter.javaeditsrc/main/java/mezz/jei/config/Config.javaeditsrc/main/java/mezz/jei/ModIngredientRegistration.javaeditsrc/main/java/mezz/jei/gui/recipes/RecipesGui.javaeditsrc/main/java/mezz/jei/IngredientBaseListFactory.javasrc/main/java/mezz/jei/SubtypeRegistry.javabff847c6922a8da9f83e0fbc590cf6ff4a8198a61481618921000https://dvs1.progwml6.com/jenkins/user/mezzmezztehgeek@gmail.comFix 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 2016-12-13 00:48:41 -0800bff847c6922a8da9f83e0fbc590cf6ff4a8198a6Fix edge case of fluid containers with subtypes being mashed togethereditsrc/main/java/mezz/jei/SubtypeRegistry.javagithttps://dvs1.progwml6.com/jenkins/user/mezzmezz