Merge branch 'master' into future

# Conflicts:
#	src/main/java/carpet/script/api/Auxiliary.java

src/main/java/carpet/mixins/MinecraftServer_scarpetMixin.java

@@ -107,4 +107,10 @@ public abstract class MinecraftServer_scarpetMixin extends ReentrantBlockableEve
         functionManager.replaceLibrary(this.resources.managers().getFunctionLibrary());
         structureTemplateManager.onResourceManagerReload(this.resources.resourceManager());
     }
+
+    @Override
+    public MinecraftServer.ReloadableResources getResourceManager()
+    {
+        return resources;
+    }
 }