Merge remote-tracking branch 'origin/main'

# Conflicts:
#	build.gradle
#	gradle.properties

src/main/java/de/ellpeck/naturesaura/compat/Compat.java

@@ -16,9 +16,10 @@ import java.util.function.Supplier;
 
 public final class Compat {
 
+    @SuppressWarnings("Convert2MethodRef") // bleh classloading compat issues
     private static final Map<String, Supplier<ICompat>> MODULE_TYPES = ImmutableMap.<String, Supplier<ICompat>>builder()
-            .put("patchouli", PatchouliCompat::new)
+            .put("patchouli", () -> new PatchouliCompat())
-            .put("curios", CuriosCompat::new)
+            .put("curios", () -> new CuriosCompat())
             //.put("enchantability", EnchantibilityCompat::new)
             .build();
     private static final Map<String, ICompat> MODULES = new HashMap<>();

src/main/resources/META-INF/neoforge.mods.toml

@@ -72,3 +72,10 @@ side = "BOTH"
 # stop your mod loading on the server for example.
 #[features.${mod_id}]
 #openGLVersion="[3.2,)"
+
+[[dependencies.${mod_id}]]
+modId="patchouli"
+type = "required"
+versionRange="[${patchouli_version},)"
+ordering="NONE"
+side="BOTH"

src/main/resources/data/naturesaura/recipes/gold_fiber.json

@@ -10,7 +10,7 @@
             "tag": "forge:nuggets/gold"
         },
         "G": {
-            "item": "minecraft:grass_block"
+            "item": "minecraft:short_grass"
         },
         "L": {
             "tag": "minecraft:leaves"

supporters.json

@@ -79,6 +79,6 @@
     },
     "Ixiptla": {
         "tier": 2,
-        "color": "5500ff"
+        "color": "93E9BE"
     }
 }