Merge branch 'master' into 1.17

# Conflicts:
#	src/main/java/carpet/script/utils/SnoopyCommandSource.java
#	src/main/java/carpet/utils/WoolTool.java

src/main/resources/assets/carpet/scripts/shapes.scl

@@ -93,7 +93,7 @@ draw_prism(args)->(
                 positions += _ + offset_vector * offset
             )
         );
-    )
+    );
     positions
 );