Merge remote-tracking branch 'origin/master'

2020-11-03 17:19:04 -05:00
parent 775327ebcb 5597765232
commit df81ac2129
1 changed files with 1 additions and 1 deletions
--- a/core/src/mindustry/editor/MapEditorDialog.java
+++ b/core/src/mindustry/editor/MapEditorDialog.java
@@ -702,7 +702,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
            button.resizeImage(8 * 4f);
            button.update(() -> button.setChecked(editor.drawBlock == block));
            group.add(button);
-            content.add(button).size(50f);
+            content.add(button).size(50f).tooltip(block.localizedName);

            if(++i % 4 == 0){
                content.row();