Merge remote-tracking branch 'origin/master'

core/src/mindustry/content/UnitTypes.java

@@ -1318,6 +1318,7 @@ public class UnitTypes{
 
                     healPercent = 5.5f;
                     collidesTeam = true;
+                    reflectable = false;
                     backColor = Pal.heal;
                     trailColor = Pal.heal;
                 }};

core/src/mindustry/entities/bullet/ContinuousFlameBulletType.java

@@ -49,6 +49,7 @@ public class ContinuousFlameBulletType extends ContinuousBulletType{
         lifetime = 16f;
         hitColor = colors[1].cpy().a(1f);
         lightColor = hitColor;
+        lightOpacity = 0.7f;
         laserAbsorb = false;
         ammoMultiplier = 1f;
         pierceArmor = true;
@@ -87,7 +88,7 @@ public class ContinuousFlameBulletType extends ContinuousBulletType{
         }
 
         Tmp.v1.trns(b.rotation(), realLength * 1.1f);
-        Drawf.light(b.x, b.y, b.x + Tmp.v1.x, b.y + Tmp.v1.y, lightStroke, lightColor, 0.7f);
+        Drawf.light(b.x, b.y, b.x + Tmp.v1.x, b.y + Tmp.v1.y, lightStroke, lightColor, lightOpacity);
         Draw.reset();
     }
 

core/src/mindustry/mod/ContentParser.java

@@ -1102,8 +1102,8 @@ public class ContentParser{
                 }
 
                 //all items have a produce requirement unless already specified
-                if(object instanceof Item i && !node.objectives.contains(o -> o instanceof Produce p && p.content == i)){
-                    node.objectives.add(new Produce(i));
+                if((unlock instanceof Item || unlock instanceof Liquid) && !node.objectives.contains(o -> o instanceof Produce p && p.content == unlock)){
+                    node.objectives.add(new Produce(unlock));
                 }
 
                 //remove old node from parent