Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source 
 Conflicts:
	core/src/mindustry/core/ContentLoader.java
	core/src/mindustry/world/Block.java
This commit is contained in:
Anuken
2022-01-27 14:58:44 -05:00
parent 7cdd9edb5f 0b9483cffc
commit e4595b6831
16 changed files with 152 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/Block.java
View File

@@ -417,7 +417,7 @@ public class Block extends UnlockableContent{
return hasItems;
}
/** Returns whether this block can be place on the specified */
/** @return whether this block can be placed on the specified tile. */
public boolean canPlaceOn(Tile tile, Team team, int rotation){
return canPlaceOn(tile, team);
}

2
core/src/mindustry/world/blocks/power/PowerNode.java
View File

@@ -79,8 +79,6 @@ public class PowerNode extends PowerBlock{
});
config(Point2[].class, (tile, value) -> {
tile.power.links.clear();
IntSeq old = new IntSeq(tile.power.links);
//clear old

1
core/src/mindustry/world/blocks/production/LiquidConverter.java
View File

@@ -24,7 +24,6 @@ public class LiquidConverter extends GenericCrafter{
ConsumeLiquid cl = consumes.get(ConsumeType.liquid);
cl.update(false);
outputLiquid.amount = cl.amount;
super.init();
}