Merge branch 'master' into 1.15

# Conflicts:
#	src/main/java/carpet/commands/ScriptCommand.java

src/main/java/carpet/script/bundled/FileModule.java

@@ -14,7 +14,7 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.util.Locale;
 
-public class FileModule implements ModuleInterface
+public class FileModule extends Module
 {
     private String name;
     private String code;