Merge branch 'master' into 1.15

src/main/java/carpet/script/ScriptHost.java

@@ -53,7 +53,7 @@ public class ScriptHost
 
     public void delGlobalVariable(String varName)
     {
-        globalFunctions.remove(varName);
+        globalVariables.remove(varName);
     }
 
     public ScriptHost retrieveForExecution(String /*Nullable*/ user)