Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken 2019-11-01 17:30:46 -04:00
commit 4743434e9c

View file

@ -617,7 +617,7 @@ setting.saveinterval.name = Save Interval
setting.seconds = {0} Seconds
setting.fullscreen.name = Fullscreen
setting.borderlesswindow.name = Borderless Window[lightgray] (may require restart)
setting.fps.name = Show FPS
setting.fps.name = Show FPS & Ping
setting.vsync.name = VSync
setting.pixelate.name = Pixelate[lightgray] (disables animations)
setting.minimap.name = Show Minimap