Merge branch 'master' into 1.17

# Conflicts:
#	src/main/java/carpet/script/api/Auxiliary.java
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
#	src/main/java/carpet/script/value/EntityValue.java
#	src/main/java/carpet/script/value/ListValue.java

src/main/java/carpet/script/value/ListValue.java

@@ -4,7 +4,6 @@ import carpet.script.LazyValue;
 import carpet.script.exception.InternalExpressionException;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
-import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.AbstractNbtNumber;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtDouble;
@@ -75,12 +74,6 @@ public class ListValue extends AbstractListValue implements ContainerValueInterf
         items = list;
     }
 
-    @Deprecated
-    public static Value fromItemStack(ItemStack itemstack)
-    {
-        return ValueConversions.of(itemstack);
-    }
-
     public static Value fromTriple(double a, double b, double c)
     {
         return ListValue.of(new NumericValue(a), new NumericValue(b), new NumericValue(c));