Merge branch 'master' into 1.16

src/main/java/carpet/script/CarpetExpression.java

@@ -2860,7 +2860,7 @@ public class CarpetExpression
                 @Override
                 public String getString()
                 {
-                    return String.format("rect[(%d,%d,%d),..,(%d,%d,%d)]",minx, miny, minz, maxx, maxy, maxz);
+                    return String.format(Locale.ROOT, "rect[(%d,%d,%d),..,(%d,%d,%d)]",minx, miny, minz, maxx, maxy, maxz);
                 }
             };
         });
@@ -2957,7 +2957,7 @@ public class CarpetExpression
                     @Override
                     public String getString()
                     {
-                        return String.format("diamond[(%d,%d,%d),%d,0]",cx, cy, cz, width);
+                        return String.format(Locale.ROOT, "diamond[(%d,%d,%d),%d,0]",cx, cy, cz, width);
                     }
                 };
             }
@@ -3019,7 +3019,7 @@ public class CarpetExpression
                     @Override
                     public String getString()
                     {
-                        return String.format("diamond[(%d,%d,%d),%d,%d]",cx, cy, cz, width, height);
+                        return String.format(Locale.ROOT, "diamond[(%d,%d,%d),%d,%d]",cx, cy, cz, width, height);
                     }
                 };
             }

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

@@ -2944,7 +2944,7 @@ public class Expression
             }
             try
             {
-                return new StringValue(String.format(format, args.toArray()));
+                return new StringValue(String.format(Locale.ROOT, format, args.toArray()));
             }
             catch (IllegalFormatException ife)
             {

src/main/java/carpet/script/value/LazyListValue.java

@@ -3,9 +3,9 @@ package carpet.script.value;
 import carpet.script.exception.InternalExpressionException;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 
 public abstract class LazyListValue extends AbstractListValue implements Iterator<Value>
 {
@@ -48,7 +48,7 @@ public abstract class LazyListValue extends AbstractListValue implements Iterato
             @Override
             public String getString()
             {
-                return String.format("[%d, %d, ..., %d]",start, start+stepp, limit);
+                return String.format(Locale.ROOT, "[%d, %d, ..., %d]",start, start+stepp, limit);
             }
         };
     }

src/main/java/carpet/script/value/NumericValue.java

@@ -4,6 +4,7 @@ import carpet.script.exception.InternalExpressionException;
 import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
+import java.util.Locale;
 
 import static java.lang.Math.abs;
 
@@ -42,7 +43,7 @@ public class NumericValue extends Value
         }
         else
         {
-            return String.format("%.1f..", getDouble());
+            return String.format(Locale.ROOT, "%.1f..", getDouble());
         }
     }