Merge branch '1.20.2' into 1.20.4

# Conflicts:
#	settings.gradle.kts

common/src/main/resources/assets/xaeroplus/lang/en_us.json

@@ -1,28 +1,28 @@
 {
   "setting.minimap.fps_limiter": "Minimap FPS Limiter",
-  "setting.minimap.fps_limiter.tooltip": "Renders the minimap at a limited rate, reducing its impact on the game's FPS",
+  "setting.minimap.fps_limiter.tooltip": "Renders the minimap at a limited rate, reducing its impact on the game's FPS.",
   "setting.minimap.fps_limiter_limit": "Minimap FPS Limit",
-  "setting.minimap.fps_limiter_limit.tooltip": "The FPS limit to set. Lower FPS limit = higher game FPS",
+  "setting.minimap.fps_limiter_limit.tooltip": "The FPS limit to set. Lower FPS limit = higher game FPS.",
   "setting.world_map.fast_mapping": "Fast Mapping",
   "setting.world_map.fast_mapping.tooltip": "Increases mapping speed, might hurt FPS. Adjust rate limit and delay to regain FPS.",
   "setting.world_map.fast_mapping_delay": "Fast Mapping Delay",
   "setting.world_map.fast_mapping_delay.tooltip": "Fast Mapping must be enabled. \n This is roughly the delay in milliseconds between minimap update operations, both render and actual file writes.",
   "setting.world_map.fast_mapping_rate_limit": "Fast Mapping Rate Limit",
   "setting.world_map.fast_mapping_rate_limit.tooltip": "Fast Mapping must be enabled. \n Limits how many chunks can be written in a single cycle. Lower values improve FPS at high render distances.",
   "setting.world_map.fast_zip_writes": "Fast Zip Writes",
-  "setting.world_map.fast_zip_writes.tooltip": "Writes Map tile zip files faster but uses more RAM. Disable this if you have low RAM available",
+  "setting.world_map.fast_zip_writes.tooltip": "Writes Map tile zip files faster but uses more RAM. Disable this if you have low RAM available.",
   "setting.world_map.baritone_waypoint": "Baritone Goal Waypoint",
   "setting.world_map.baritone_waypoint.tooltip": "Syncs Baritone goals as temporary waypoints.",
   "setting.world_map.disable_waypoint_sharing": "Disable Waypoint Sharing",
   "setting.world_map.disable_waypoint_sharing.tooltip": "Disables waypoint sharing with other players.",
   "setting.world_map.disable_receiving_waypoints": "Disable Receiving Waypoints",
   "setting.world_map.disable_receiving_waypoints.tooltip": "Disables receiving waypoints from other players.",
   "setting.world_map.waypoint_receive_no_chat_reports_fix": "Waypoint Receive No Chat Reports Fix",
-  "setting.world_map.waypoint_receive_no_chat_reports_fix.tooltip": "Fixes parsing the player sending waypoints in chat on servers with the NoChatReports plugin installed",
+  "setting.world_map.waypoint_receive_no_chat_reports_fix.tooltip": "Fixes parsing the player sending waypoints in chat on servers with the NoChatReports plugin installed.",
   "setting.world_map.persist_dimension_switch": "Persist WM Dimension Switch",
   "setting.world_map.persist_dimension_switch.tooltip": "If enabled, the dimension will not be switched back to current when the WorldMap GUI is closed.",
   "setting.world_map.radar_while_dimension_switched": "Radar While Dim Switched",
-  "setting.world_map.radar_while_dimension_switched.tooltip": "Disables WorldMap radar rendering while dimension switched",
+  "setting.world_map.radar_while_dimension_switched.tooltip": "Disables WorldMap radar rendering while dimension switched.",
   "setting.world_map.transparent_obsidian_roof": "Transparent Obsidian Roof",
   "setting.world_map.transparent_obsidian_roof.tooltip": "Makes obsidian placed at build height transparent. Does not update tiles already mapped - you need to remap them.",
   "setting.world_map.transparent_obsidian_roof_y": "Obsidian Roof Y",
@@ -46,29 +46,29 @@
   "setting.world_map.new_chunks_color": "New Chunks Color",
   "setting.world_map.new_chunks_color.tooltip": "Changes the color of NewChunks.",
   "setting.world_map.old_chunks_highlighting": "OldChunks Highlighting",
-  "setting.world_map.old_chunks_highlighting.tooltip": "Highlights OldChunks on the Minimap and WorldMap. An OldChunk is a chunk that was generated in 1.12.2 or lower based on the blocks present in the chunk. Intended for use on 2b2t",
+  "setting.world_map.old_chunks_highlighting.tooltip": "Highlights OldChunks on the Minimap and WorldMap. An OldChunk is a chunk that was generated in 1.12.2 or lower based on the blocks present in the chunk. Intended for use on 2b2t.",
   "setting.world_map.old_chunks_save_load_to_disk": "Save/Load OldChunks to Disk",
   "setting.world_map.old_chunks_save_load_to_disk.tooltip": "Saves and loads OldChunk data to disk for each world and dimension. Requires OldChunk Highlighting to be enabled.",
   "setting.world_map.old_chunks_opacity": "Old Chunks Opacity",
   "setting.world_map.old_chunks_opacity.tooltip": "Changes the color opacity of OldChunks.",
   "setting.world_map.old_chunks_color": "Old Chunks Color",
   "setting.world_map.old_chunks_color.tooltip": "Changes the color of OldChunks.",
   "setting.world_map.portals": "Portal Highlights",
-  "setting.world_map.portals.tooltip": "Highlights chunks where Nether Portals and End Portals are found",
+  "setting.world_map.portals.tooltip": "Highlights chunks where Nether Portals and End Portals are found.",
   "setting.world_map.portals_save_load_to_disk": "Save/Load Portals to Disk",
-  "setting.world_map.portals_save_load_to_disk.tooltip": "Saves and loads Portals data to disk for each world and dimension. Requires Portal Highlights to be enabled",
+  "setting.world_map.portals_save_load_to_disk.tooltip": "Saves and loads Portals data to disk for each world and dimension. Requires Portal Highlights to be enabled.",
   "setting.world_map.portals_opacity": "Portals Opacity",
   "setting.world_map.portals_opacity.tooltip": "Changes the color opacity of Portal Highlights.",
   "setting.world_map.portals_color": "Portals Color",
   "setting.world_map.portals_color.tooltip": "Changes the color of Portal highlights.",
   "setting.world_map.world_tools": "WorldTools Highlights",
-  "setting.world_map.world_tools.tooltip": "Highlights chunks downloaded by WorldTools while a capture is active",
+  "setting.world_map.world_tools.tooltip": "Highlights chunks downloaded by WorldTools while a capture is active.",
   "setting.world_map.world_tools_opacity": "WorldTools Highlights Opacity",
-  "setting.world_map.world_tools_opacity.tooltip": "Changes the color opacity of WorldTools highlights",
+  "setting.world_map.world_tools_opacity.tooltip": "Changes the color opacity of WorldTools highlights.",
   "setting.world_map.world_tools_color": "WorldTools Highlights Color",
-  "setting.world_map.world_tools_color.tooltip": "Changes the color of WorldTools highlights",
+  "setting.world_map.world_tools_color.tooltip": "Changes the color of WorldTools highlights.",
   "setting.world_map.portal_skip_detection": "PortalSkip Detection",
-  "setting.world_map.portal_skip_detection.tooltip": "Highlights chunks where portals could have been loaded into. \n This is useful for basehunting to detect where players could switch dimensions along a trail to avoid hunters. \n One thing to note: 2b2t's view distance is not large enough to detect portal skip areas. You need to load surrounding chunks - specifically a 15x15 chunk area",
+  "setting.world_map.portal_skip_detection.tooltip": "Highlights chunks where portals could have been loaded into. \n This is useful for basehunting to detect where players could switch dimensions along a trail to avoid hunters. \n One thing to note: 2b2t's view distance is not large enough to detect portal skip areas. You need to load surrounding chunks - specifically a 15x15 chunk area.",
   "setting.world_map.portal_skip_opacity": "PortalSkip Opacity",
   "setting.world_map.portal_skip_opacity.tooltip": "Changes the color opacity of Portal Skip Detection.",
   "setting.world_map.portal_skip_color": "PortalSkip Color",
@@ -92,11 +92,11 @@
   "setting.world_map.show_waypoint_distances": "Show Waypoint Distances",
   "setting.world_map.show_waypoint_distances.tooltip": "Display the distance to every waypoint in the full waypoint menu.",
   "setting.world_map.show_render_distance": "Show Render Distance",
-  "setting.world_map.show_render_distance.tooltip": "Show server side render distance (actually just another setting)",
+  "setting.world_map.show_render_distance.tooltip": "Show server side render distance (actually just another setting).",
   "setting.world_map.show_render_distance_world_map": "Show Render Distance on WorldMap",
-  "setting.world_map.show_render_distance_world_map.tooltip": "Show server side render distance on the WorldMap",
+  "setting.world_map.show_render_distance_world_map.tooltip": "Show server side render distance on the WorldMap.",
   "setting.world_map.assumed_server_render_distance": "Server Render Distance",
-  "setting.world_map.assumed_server_render_distance.tooltip": "View-distance of the server",
+  "setting.world_map.assumed_server_render_distance.tooltip": "View-distance of the server.",
   "setting.world_map.null_overworld_dimension_folder": "null OW Dim Dir",
   "setting.world_map.null_overworld_dimension_folder.tooltip": "Sets whether the overworld WorldMap directory is in DIM0 or null (default) \n MC must be restarted for changes to take effect.",
   "setting.world_map.data_folder_resolution_mode": "Data Dir Mode",
@@ -115,7 +115,7 @@
   "setting.keybinds.switch_to_end": "Switch to End",
   "setting.keybinds.switch_to_end.tooltip": "Switches to the end map.",
   "setting.world_map.nether_cave_fix": "Nether Cave Fix",
-  "setting.world_map.nether_cave_fix.tooltip": "Forces full cave maps to be written and rendered when cave mode is off in the nether. \n Without this, you have to manually move region files pre WorldMap 1.30.0 to the correct cave folder",
+  "setting.world_map.nether_cave_fix.tooltip": "Forces full cave maps to be written and rendered when cave mode is off in the nether. \n Without this, you have to manually move region files pre WorldMap 1.30.0 to the correct cave folder.",
   "setting.minimap.always_render_player_name": "Always Render Player Name",
   "setting.minimap.always_render_player_name.tooltip": "Always render player name on the radar.",
   "setting.minimap.always_render_player_icon": "Always Render Player Icon",
@@ -125,7 +125,7 @@
   "setting.waypoints.waypoint_beacons": "Waypoint Beacons",
   "setting.waypoints.waypoint_beacons.tooltip": "Render waypoint beacons in game.",
   "setting.waypoints.waypoint_beacon_scale_min": "Waypoint Beacon Scale Min",
-  "setting.waypoints.waypoint_beacon_scale_min.tooltip": "Sets the minimum scale of the waypoint beacon when it is far away. \n This value is the number of chunks away from the player the beacon is rendered at. \n 0 = auto-match the player's render distance",
+  "setting.waypoints.waypoint_beacon_scale_min.tooltip": "Sets the minimum scale of the waypoint beacon when it is far away. \n This value is the number of chunks away from the player the beacon is rendered at. \n 0 = auto-match the player's render distance.",
   "setting.waypoints.waypoint_beacon_distance_min": "Waypoint Beacon Distance Min",
   "setting.waypoints.waypoint_beacon_distance_min.tooltip": "Sets the minimum xz distance from the player the waypoint must be to render a beacon.",
   "setting.world_map.disable_internet": "Disable Xaero Internet Access",

common/src/main/resources/assets/xaeroplus/lang/es_ar.json

@@ -46,29 +46,29 @@
   "setting.world_map.new_chunks_color": "Color ChunksNuevos",
   "setting.world_map.new_chunks_color.tooltip": "Cambia el color de ChunksNuevos.",
   "setting.world_map.old_chunks_highlighting": "Resaltado ChunksAntiguos",
-  "setting.world_map.old_chunks_highlighting.tooltip": "Resalta chunks antiguos en el Minimapa y el MapaMundi. Un chunk antiguo es un chunk generado a partir de la versión 1.12.2 o antes, basado en los bloques presentes. Hecho para uso en 2b2t.org",
+  "setting.world_map.old_chunks_highlighting.tooltip": "Resalta chunks antiguos en el Minimapa y el MapaMundi. Un chunk antiguo es un chunk generado a partir de la versión 1.12.2 o antes, basado en los bloques presentes. Hecho para uso en 2b2t.org.",
   "setting.world_map.old_chunks_save_load_to_disk": "Guardar/Cargar ChunksAntiguos al Disco",
   "setting.world_map.old_chunks_save_load_to_disk.tooltip": "Guarda y carga datos de ChunksAntiguos en el disco para cada mundo y dimensión. Requiere que Resaltado de ChunksAntiguos esté habilitado.",
   "setting.world_map.old_chunks_opacity": "Opacidad ChunksAntiguos",
   "setting.world_map.old_chunks_opacity.tooltip": "Cambia la opacidad del color de ChunksAntiguos.",
   "setting.world_map.old_chunks_color": "Color ChunksAntiguos",
   "setting.world_map.old_chunks_color.tooltip": "Cambia el color de ChunksAntiguos.",
   "setting.world_map.portals": "Resaltado Portales",
-  "setting.world_map.portals.tooltip": "Resalta los chunks en donde se encuentren portales al Nether y al End",
+  "setting.world_map.portals.tooltip": "Resalta los chunks en donde se encuentren portales al Nether y al End.",
   "setting.world_map.portals_save_load_to_disk": "Guardar/Cargar Portales al Disco",
-  "setting.world_map.portals_save_load_to_disk.tooltip": "Guarda y carga datos de portales en el disco para cada mundo y dimensión. Requiere que Resaltado de Portales esté habilitado",
+  "setting.world_map.portals_save_load_to_disk.tooltip": "Guarda y carga datos de portales en el disco para cada mundo y dimensión. Requiere que Resaltado de Portales esté habilitado.",
   "setting.world_map.portals_opacity": "Opacidad Resaltado Portales",
   "setting.world_map.portals_opacity.tooltip": "Cambia la opacidad del color del Resaltado de Portales.",
   "setting.world_map.portals_color": "Color Resaltado Portales",
   "setting.world_map.portals_color.tooltip": "Cambia el color del resaltado de Portales.",
   "setting.world_map.world_tools": "Resaltado WorldTools",
-  "setting.world_map.world_tools.tooltip": "Resalta los chunks descargados por Worldtools mientras una captura esté activa",
+  "setting.world_map.world_tools.tooltip": "Resalta los chunks descargados por Worldtools mientras una captura esté activa.",
   "setting.world_map.world_tools_opacity": "Opacidad Resaltado WorldTools",
-  "setting.world_map.world_tools_opacity.tooltip": "Cambia la opacidad del color del resaltado de WorldTools",
+  "setting.world_map.world_tools_opacity.tooltip": "Cambia la opacidad del color del resaltado de WorldTools.",
   "setting.world_map.world_tools_color": "Color Resaltado WorldTools",
-  "setting.world_map.world_tools_color.tooltip": "Cambia el color del resaltado de WorldTools",
+  "setting.world_map.world_tools_color.tooltip": "Cambia el color del resaltado de WorldTools.",
   "setting.world_map.portal_skip_detection": "Detección de PortalSkip",
-  "setting.world_map.portal_skip_detection.tooltip": "Resalta los chunks donde los portales podrían haber sido cargados. \n Esto es útil para la caza de bases, para poder detectar dónde los jugadores quiza cambiaron de dimensión a lo largo de una ruta para evitar que lo encuentren. \n Una cosa a tener en cuenta: la distancia visual de 2b2t no es suficientemente grande como para poder detectar áreas de salto de portal. Necesitas cargar chunks alrededor - idealmente un área de 15x15 chunks",
+  "setting.world_map.portal_skip_detection.tooltip": "Resalta los chunks donde los portales podrían haber sido cargados. \n Esto es útil para la caza de bases, para poder detectar dónde los jugadores quiza cambiaron de dimensión a lo largo de una ruta para evitar que lo encuentren. \n Una cosa a tener en cuenta: la distancia visual de 2b2t no es suficientemente grande como para poder detectar áreas de salto de portal. Necesitas cargar chunks alrededor - idealmente un área de 15x15 chunks.",
   "setting.world_map.portal_skip_opacity": "Opacidad Detección PortalSkip",
   "setting.world_map.portal_skip_opacity.tooltip": "Cambia la opacidad del color de Detección de Salteo de Portal.",
   "setting.world_map.portal_skip_color": "Color Detección PortalSkip",
@@ -92,11 +92,11 @@
   "setting.world_map.show_waypoint_distances": "Mostrar Distancias Waypoint",
   "setting.world_map.show_waypoint_distances.tooltip": "Muestra la distancia a cada waypoint en el menú de waypoints.",
   "setting.world_map.show_render_distance": "Mostrar Distancia Renderizado",
-  "setting.world_map.show_render_distance.tooltip": "Muestra la distancia de renderizado del servidor (en realidad, solo otro ajuste)",
+  "setting.world_map.show_render_distance.tooltip": "Muestra la distancia de renderizado del servidor (en realidad, solo otro ajuste).",
   "setting.world_map.show_render_distance_world_map": "Mostrar Distancia Renderizado MapaMundi",
-  "setting.world_map.show_render_distance_world_map.tooltip": "Muestra la distancia de renderizado del servidor en el MapaMundi",
+  "setting.world_map.show_render_distance_world_map.tooltip": "Muestra la distancia de renderizado del servidor en el MapaMundi.",
   "setting.world_map.assumed_server_render_distance": "Distancia Renderizado Servidor",
-  "setting.world_map.assumed_server_render_distance.tooltip": "Distancia visual del servidor",
+  "setting.world_map.assumed_server_render_distance.tooltip": "Distancia visual del servidor.",
   "setting.world_map.null_overworld_dimension_folder": "Carpeta Dimension OW",
   "setting.world_map.null_overworld_dimension_folder.tooltip": "Establece si la carpeta del MapaMundi del Overworld está en DIM0 o nulo (predeterminado) \n Minecraft debe reiniciarse para que los cambios se guarden.",
   "setting.world_map.data_folder_resolution_mode": "Modo Datos Carpeta",
@@ -115,7 +115,7 @@
   "setting.keybinds.switch_to_end": "Cambiar al End",
   "setting.keybinds.switch_to_end.tooltip": "Cambia al mapa del End.",
   "setting.world_map.nether_cave_fix": "Corrección Cueva Nether",
-  "setting.world_map.nether_cave_fix.tooltip": "Forzar que los mapas completos de cuevas se escriban y rendericen cuando el modo cueva está desactivado en el Nether. \n Sin esto, tendrás que mover manualmente archivos de región pre WorldMap 1.30.0 a la carpeta de cuevas correcta",
+  "setting.world_map.nether_cave_fix.tooltip": "Forzar que los mapas completos de cuevas se escriban y rendericen cuando el modo cueva está desactivado en el Nether. \n Sin esto, tendrás que mover manualmente archivos de región pre WorldMap 1.30.0 a la carpeta de cuevas correcta.",
   "setting.minimap.always_render_player_name": "Siempre Representar Nombre Jugador",
   "setting.minimap.always_render_player_name.tooltip": "Siempre representa el nombre del jugador en el radar.",
   "setting.minimap.always_render_player_icon": "Siempre Representar Icono Jugador",
@@ -125,7 +125,7 @@
   "setting.waypoints.waypoint_beacons": "Beacon Waypoint",
   "setting.waypoints.waypoint_beacons.tooltip": "Renderiza Beacons (faros) de waypoints en el juego.",
   "setting.waypoints.waypoint_beacon_scale_min": "Escala Mínima Beacon Waypoint",
-  "setting.waypoints.waypoint_beacon_scale_min.tooltip": "Establece la escala mínima del Beacon (faro) del waypoint cuando está lejos. \n Este valor es el número de chunks del jugador donde se representa el faro. \n 0 = coincide automáticamente con la distancia de renderizado del jugador",
+  "setting.waypoints.waypoint_beacon_scale_min.tooltip": "Establece la escala mínima del Beacon (faro) del waypoint cuando está lejos. \n Este valor es el número de chunks del jugador donde se representa el faro. \n 0 = coincide automáticamente con la distancia de renderizado del jugador.",
   "setting.waypoints.waypoint_beacon_distance_min": "Distancia Mínima Beacon Waypoint",
   "setting.waypoints.waypoint_beacon_distance_min.tooltip": "Establece la distancia xz mínima desde el jugador donde el waypoint debe estar para mostrar un Beacon (faro).",
   "setting.world_map.disable_internet": "Deshabilitar el acceso a Internet de Xaero",