From 7c7c57c64e314cf03c3ec0382f5840807beea3de Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 6 Mar 2021 11:10:32 -0500
Subject: [PATCH] Various parsing bugfixes

---
 core/src/mindustry/mod/ContentParser.java | 3 ++-
 gradle.properties                         | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java
index b81190aa7c..257b20188a 100644
--- a/core/src/mindustry/mod/ContentParser.java
+++ b/core/src/mindustry/mod/ContentParser.java
@@ -317,7 +317,8 @@ public class ContentParser{
                 readBundle(ContentType.weather, name, value);
             }else{
                 readBundle(ContentType.weather, name, value);
-                item = make(resolve(getType(value), ParticleWeather.class), name);
+                item = make(resolve(getType(value), ParticleWeather.class), mod + "-" + name);
+                value.remove("type");
             }
             currentContent = item;
             read(() -> readFields(item, value));
diff --git a/gradle.properties b/gradle.properties
index 75a3570010..90a92974a5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=1b24d685ea94dd40244be869e70671080e950825
+archash=d1e1f3fe8803c6688182301cbf61b1bcfe39160a