Merge branch 'master' into 1.15

src/main/java/carpet/script/CarpetScriptServer.java

@@ -43,7 +43,7 @@ public class CarpetScriptServer
 
     private static final List<Module> bundledModuleData = new ArrayList<Module>(){{
         add(new BundledModule("camera", false));
-        add(new BundledModule("structures", false));
+        add(new BundledModule("overlay", false));
         add(new BundledModule("event_test", false));
         add(new BundledModule("stats_test", false));
         add(new BundledModule("math", true));

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

@@ -85,7 +85,8 @@ public class MapValue extends AbstractListValue implements ContainerValueInterfa
     @Override
     public Value add(Value o)
     {
-        throw new InternalExpressionException("Cannot add to a map value");
+        append(o);
+        return this;
     }
 
     @Override