Merge remote-tracking branch 'origin/master'

core/src/mindustry/editor/WaveGraph.java

@@ -181,6 +181,17 @@ public class WaveGraph extends Table{
 
         colors.clear();
         colors.left();
+        colors.button("@waves.units.hide", Styles.cleart, () -> {
+            if(hidden.size == usedCopy.size){
+                hidden.clear();
+            }else{
+                hidden.addAll(usedCopy);
+            }
+
+            used.clear();
+            used.addAll(usedCopy);
+            for(UnitType o : hidden) used.remove(o);
+        }).update(b -> b.setText(hidden.size == usedCopy.size ? "@waves.units.show" : "@waves.units.hide")).height(32f).width(130f);
         colors.pane(t -> {
             t.left();
             for(UnitType type : used){

core/src/mindustry/ui/dialogs/DatabaseDialog.java

@@ -36,7 +36,7 @@ public class DatabaseDialog extends BaseDialog{
         cont.table(s -> {
             s.image(Icon.zoom).padRight(8);
             search = s.field(null, text -> rebuild()).growX().get();
-            search.setMessageText(Core.bundle.get("players.search"));
+            search.setMessageText("@players.search");
         }).fillX().padBottom(4).row();
 
         cont.pane(all);