Merge branch 'master' into 1.15

src/main/java/carpet/script/Expression.java

@@ -53,7 +53,7 @@ import static java.lang.Math.min;
 
 
 /**
- * <h1>Fundamental components of <code>scarpet</code> programming language (version 1.5).</h1>
+ * <h1>Fundamental components of <code>scarpet</code> programming language (version 1.6).</h1>
  *
  * <p>Scarpet (a.k.a. Carpet Script, or Script for Carpet) is a programming language designed to provide
  * the ability to write custom programs to run within Minecraft and