Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2022-02-02 11:54:44 -05:00
18 changed files with 158 additions and 58 deletions

View File

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

View File

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

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();
}