Merge branch 'master' into 1.15

# Conflicts:
#	src/main/java/carpet/fakes/StructureFeatureInterface.java
#	src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java

src/main/java/carpet/helpers/FeatureGenerator.java

@@ -123,7 +123,7 @@ public class FeatureGenerator
     }
     public static void noop() {System.out.println("boo");}
 
-    private static Map<String, Thing> featureMap = new HashMap<String, Thing>() {{
+    private static final Map<String, Thing> featureMap = new HashMap<String, Thing>() {{
 
 
         put("oak", simpleTree(DefaultBiomeFeatures.OAK_TREE_CONFIG));