Merge branch 'patch/5.6.4'

modules/commands/find.lua

@@ -6,6 +6,6 @@ Commands.new_command('find-on-map','Find a player on your map.')
 :add_alias('find','zoom-to')
 :register(function(player,action_player,raw)
     local position = action_player.position
-    player.zoom_to_world(position,2)
+    player.zoom_to_world(position,1.75)
     return Commands.success -- prevents command complete message from showing
 end)

modules/gui/player-list.lua

@@ -19,7 +19,7 @@ Gui.on_click(zoom_to_map_name,function(event)
     if event.button == defines.mouse_button_type.left then
         -- lmb will zoom to map
         local position = action_player.position
-        event.player.zoom_to_world(position,2)
+        event.player.zoom_to_world(position,1.75)
     else
         -- rmb will open settings
         local player_name = event.player.name

utils/token.lua

@@ -47,9 +47,23 @@ end
 local uid_counter = 0
 
 function Token.uid()
+    if _LIFECYCLE == 8 then
+        return Token.runtime_uid()
+    end
+
     uid_counter = uid_counter + 1
 
     return uid_counter
 end
 
+function Token.runtime_uid()
+    if not global.uid_counter then
+        global.uid_counter = 0
+    end
+
+    global.uid_counter = global.uid_counter + 1
+
+    return global.uid_counter+uid_counter
+end
+
 return Token