mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-25 05:51:47 -08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Anuken 2021-01-27 11:49:08 -05:00
commit d0572a2a0d
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
core/src/mindustry/content/Blocks.java
View file

@ -1662,6 +1662,7 @@ public class Blocks implements ContentList{
shootEffect = Fx.shootLiquid;
range = 190f;
health = 250 * size * size;
flags = EnumSet.of(BlockFlag.turret, BlockFlag.extinguisher);
}};
fuse = new ItemTurret("fuse"){{

2
core/src/mindustry/world/blocks/power/SolarGenerator.java
View file

@ -10,7 +10,7 @@ public class SolarGenerator extends PowerGenerator{
public SolarGenerator(String name){
super(name);
//remove the BlockFlag.producer flag to make this a lower priority target than other generators.
//remove the BlockFlag.generator flag to make this a lower priority target than other generators.
flags = EnumSet.of();
}