Merge

2020-02-23 20:14:38 -05:00
parent 7f53328f52 c989504bf6
commit cfbe631e66
18 changed files with 55 additions and 35 deletions
--- a/core/src/mindustry/core/NetServer.java
+++ b/core/src/mindustry/core/NetServer.java
@@ -320,7 +320,7 @@ public class NetServer implements ApplicationListener{
                votes += d;
                voted.addAll(player.uuid(), admins.getInfo(player.uuid()).lastIP);
                        
-                Call.sendMessage(Strings.format("[orange]{0}[lightgray] has voted to kick[orange] {1}[].[accent] ({2}/{3})\n[lightgray]Type[orange] /vote <y/n>[] to agree.",
+                Call.sendMessage(Strings.format("[orange]{0}[lightgray] has voted on kicking[orange] {1}[].[accent] ({2}/{3})\n[lightgray]Type[orange] /vote <y/n>[] to agree.",
                            player.name(), target.name(), votes, votesRequired()));
            }