Merging changes from private branch

2025-04-04 11:47:35 -04:00
parent cf5c6d0905
commit b7dbe54d76
161 changed files with 2484 additions and 1137 deletions
--- a/core/src/mindustry/mod/ContentParser.java
+++ b/core/src/mindustry/mod/ContentParser.java
@@ -136,6 +136,8 @@ public class ContentParser{
        put(BulletType.class, (type, data) -> {
            if(data.isString()){
                return field(Bullets.class, data);
+            }else if(data.isArray()){
+                return new MultiBulletType(parser.readValue(BulletType[].class, data));
            }
            Class<?> bc = resolve(data.getString("type", ""), BasicBulletType.class);
            data.remove("type");