Merge branch 'master' into 1.16

This commit is contained in:
gnembon committed 2020-06-14 01:51:45 -03:00
commit dd820a450b
3 files changed
+2 -1

No files matched your search

+1
View File
@@ -2953,6 +2953,7 @@ Recipe type can take one of the following options:
* `'smoking'` - smoker recipe
* `'campfire_cooking'` - campfire recipe
* `'stonecutting'` - stonecutter recipe
* `'smithing'` - smithing table (1.16+)
The return value is a list of available recipes (even if there is only one recipe available). Each recipe contains of
an item triple of the crafting result, list of ingredients, each containing a list of possible variants of the
+1
View File
@@ -51,6 +51,7 @@ Recipe type can take one of the following options:
* `'smoking'` - smoker recipe
* `'campfire_cooking'` - campfire recipe
* `'stonecutting'` - stonecutter recipe
* `'smithing'` - smithing table (1.16+)
The return value is a list of available recipes (even if there is only one recipe available). Each recipe contains of
an item triple of the crafting result, list of ingredients, each containing a list of possible variants of the
@@ -1538,7 +1538,6 @@ public class CarpetExpression
{
ItemStack result = recipe.getOutput();
List<Value> ingredientValue = new ArrayList<>();
CarpetSettings.LOG.error("input size: "+recipe.getPreviewInputs().size());
recipe.getPreviewInputs().forEach(
ingredient ->
{