Merge remote-tracking branch 'origin/master'

2021-02-08 16:44:22 -05:00
parent ce2750ba60 1d3dbddaef
commit 38843c25fb
4 changed files with 10 additions and 1 deletions
--- a/core/src/mindustry/entities/comp/PlayerComp.java
+++ b/core/src/mindustry/entities/comp/PlayerComp.java
@@ -41,6 +41,7 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
    boolean admin;
    @SyncLocal float mouseX, mouseY;
    String name = "noname";
+    String locale = "en";
    Color color = new Color();

    transient float deathTimer;