Merge branch 'master' into 1.15

# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java

src/main/java/carpet/commands/LogCommand.java

@@ -43,7 +43,7 @@ public class LogCommand
                                 c.getSource(),
                                 c.getSource().getName(),
                                 getString(c, "log name")))).
-                then(CommandManager.argument("option", StringArgumentType.word()).
+                then(CommandManager.argument("option", StringArgumentType.greedyString()).
                         suggests( (c, b) -> suggestMatching(
                                 (LoggerRegistry.getLogger(getString(c, "log name"))==null
                                         ?new String[]{}