diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java index a20917c054..4d3ba1700c 100644 --- a/core/src/mindustry/content/TechTree.java +++ b/core/src/mindustry/content/TechTree.java @@ -714,8 +714,14 @@ public class TechTree implements ContentList{ finishedRequirements[i] = new ItemStack(requirements[i].item, Core.settings == null ? 0 : Core.settings.getInt("req-" + content.name + "-" + requirements[i].item.name)); } + var used = new ObjectSet(); + //add dependencies as objectives. - content.getDependencies(d -> objectives.add(new Research(d))); + content.getDependencies(d -> { + if(used.add(d)){ + objectives.add(new Research(d)); + } + }); map.put(content, this); all.add(this); diff --git a/core/src/mindustry/content/Weathers.java b/core/src/mindustry/content/Weathers.java index 2006e6fb05..8e3ea38a92 100644 --- a/core/src/mindustry/content/Weathers.java +++ b/core/src/mindustry/content/Weathers.java @@ -75,7 +75,7 @@ public class Weathers implements ContentList{ attrs.set(Attribute.spores, 1f); attrs.set(Attribute.light, -0.15f); status = StatusEffects.sporeSlowed; - opacityMultiplier = 0.75f; + opacityMultiplier = 0.5f; force = 0.1f; sound = Sounds.wind; soundVol = 0.7f; diff --git a/fastlane/metadata/android/en-US/changelogs/29744.txt b/fastlane/metadata/android/en-US/changelogs/29744.txt new file mode 100644 index 0000000000..670ec7a7c0 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29744.txt @@ -0,0 +1,5 @@ +[This is a truncated changelog, see Github for full notes] +Yeah, it's another hotfix. I missed these during earlier testing. + +- Fixed research deadlock caused by blocks requiring optional inputs as research +- Possible fix for "Unsupported combination of formats" startup error