From 008d16087484e535b5f830e7dc10a1de948cfcaf Mon Sep 17 00:00:00 2001 From: Olivier Dragon Date: Wed, 21 Aug 2024 21:44:42 -0400 Subject: [PATCH] Update orienteering from upstream. --- builder/mods_src/tools/orienteering | 2 +- mods/tools/orienteering/init.lua | 3 ++- mods/tools/orienteering/locale/orienteering.de.tr | 1 - mods/tools/orienteering/locale/orienteering.fr.tr | 5 ++--- mods/tools/orienteering/locale/template.txt | 5 ++--- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/builder/mods_src/tools/orienteering b/builder/mods_src/tools/orienteering index adf19d06..d510745b 160000 --- a/builder/mods_src/tools/orienteering +++ b/builder/mods_src/tools/orienteering @@ -1 +1 @@ -Subproject commit adf19d064af4f569f4db1e34f291c487ea970252 +Subproject commit d510745b209c9a5cd37a52f35edadeb51aef027c diff --git a/mods/tools/orienteering/init.lua b/mods/tools/orienteering/init.lua index 24897a77..9edb3d83 100644 --- a/mods/tools/orienteering/init.lua +++ b/mods/tools/orienteering/init.lua @@ -39,7 +39,8 @@ function orienteering.toggle_time_mode(itemstack, user, pointed_thing) else user:get_meta():set_string("orienteering:twelve", "true") end - orienteering.update_hud_displays(user) + local active_tools = orienteering.active_tools(user) + orienteering.update_hud_displays(user, active_tools) end local use = S("Put this tool in your hotbar to see the data it provides.") diff --git a/mods/tools/orienteering/locale/orienteering.de.tr b/mods/tools/orienteering/locale/orienteering.de.tr index 65a24bee..05225aa5 100644 --- a/mods/tools/orienteering/locale/orienteering.de.tr +++ b/mods/tools/orienteering/locale/orienteering.de.tr @@ -12,7 +12,6 @@ Speedometer=Tacho Map=Karte Radar Mapper=Radarkartierer GPS device=GPS-Gerät -Binoculars=Fernglas Yaw: @1°, pitch: @2°=Gier: @1°, Nick: @2° Yaw: @1°=Gier: @1° diff --git a/mods/tools/orienteering/locale/orienteering.fr.tr b/mods/tools/orienteering/locale/orienteering.fr.tr index dddbc966..c0d68040 100644 --- a/mods/tools/orienteering/locale/orienteering.fr.tr +++ b/mods/tools/orienteering/locale/orienteering.fr.tr @@ -14,7 +14,6 @@ Speedometer=Compteur de vitesse Map=Carte Radar Mapper=Radar cartographique GPS device=Module GPS -Binoculars=Jumelles # Coordinates Coordinates: X@=@1, Y@=@2, Z@=@3=Coordonnées: X@=@1, Y@=@2, Z@=@3 @@ -31,8 +30,8 @@ Pitch: @1°=Tangage: @1° Time: noon=Heure: midi Time: midnight=Heure: minuit # 12h format -Time: @1:@2 a.m=Heure: @1:@2 a.m -Time: @1:@2 p.m=Heure: @1:@2 p.m +Time: @1:@2 a.m.=Heure: @1:@2 a.m. +Time: @1:@2 p.m.=Heure: @1:@2 p.m. # 24h Format: hours:minutes Time: @1:@2=Heure: @1:@2 diff --git a/mods/tools/orienteering/locale/template.txt b/mods/tools/orienteering/locale/template.txt index 47a4dc3a..b9ba153d 100644 --- a/mods/tools/orienteering/locale/template.txt +++ b/mods/tools/orienteering/locale/template.txt @@ -14,7 +14,6 @@ Speedometer= Map= Radar Mapper= GPS device= -Binoculars= # Coordinates Coordinates: X@=@1, Y@=@2, Z@=@3= @@ -31,8 +30,8 @@ Pitch: @1°= Time: noon= Time: midnight= # 12h format -Time: @1:@2 a.m= -Time: @1:@2 p.m= +Time: @1:@2 a.m.= +Time: @1:@2 p.m.= # 24h Format: hours:minutes Time: @1:@2=