Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2025-04-17 14:38:52 -04:00
2 changed files with 8 additions and 0 deletions

View File

@@ -65,6 +65,13 @@ public class LogicDisplay extends Block{
stats.add(Stat.displaySize, "@x@", displaySize, displaySize);
}
@Override
public void init(){
super.init();
clipSize = Math.max(clipSize, scaleFactor * Draw.scl * displaySize);
}
public class LogicDisplayBuild extends Building{
public @Nullable FrameBuffer buffer;
public float color = Color.whiteFloatBits;