Merge branch 'master' into v8

# Conflicts: # gradle.properties
mindustry-antigrief · Oct 2, 2024 · 022b994 · 022b994
2 parents fb186e9 + d431ed8
commit 022b994
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/core/assets/maps/seaPort.msav b/core/assets/maps/seaPort.msav
diff --git a/core/src/mindustry/editor/WaveGraph.java b/core/src/mindustry/editor/WaveGraph.java
@@ -314,7 +314,7 @@ public void rebuild(){
                 t.button(b -> {
                     Color tcolor = color(type).cpy();
                     b.image().size(32f).update(i -> i.setColor(b.isChecked() ? Tmp.c1.set(tcolor).mul(0.5f) : tcolor)).get().act(1);
-                    b.image(type.uiIcon).size(32f).padRight(20).update(i -> i.setColor(b.isChecked() ? Color.gray : Color.white)).get().act(1);
+                    b.image(type.uiIcon).size(32f).scaling(Scaling.fit).padRight(20).update(i -> i.setColor(b.isChecked() ? Color.gray : Color.white)).get().act(1);
                     b.margin(0f);
                 }, Styles.fullTogglet, () -> {
                     if(!hidden.add(type)){