Merge branch 'dev' into dev

locale/en/commands.cfg

@@ -55,6 +55,7 @@ result=__1__ entites were revived and __2__ were healed to max health.
 
 [expcom-bonus]
 set=Your bonus has been set to __1__.
+perm=You dont have enough permission to set more than __1__.
 wip=This command is temporary and will be replaced at some point in the future.
 
 [expcom-ratio]
@@ -110,3 +111,33 @@ reject-item=No item was found with internal name __1__; try using rich text sele
 results-heading=Players found with [item=__1__]:
 results-item=__1__) __2__ has __3__ items. (__4__)
 results-none=No players have [item=__1__]
+
+[expcom-speed]
+result=The game speed is now __1__
+
+[expcom-bot-queue]
+result=The successful attempts are currently __1__ and failed attempts are __2__.
+
+[expcom-pol]
+clr=The server had pollution **REMOVED** by __1__. Please @staff on the discord if this was done by mistake.
+off=The server had pollution **DISABLED** by __1__. Please @staff on the discord if this was done by mistake.
+
+[expcom-train]
+manual-result=Set __1__ trains into automatic mode.
+
+[expcom-cheat]
+day=Always day is set to __1__
+
+[expcom-ff]
+ff=Friendly fire is set to __1__
+
+[expcom-res]
+res=Auto Research is set to __1__
+msg=[color=255, 255, 255] Research Completed at __1__ - [technology=__2__][/color]
+inf=[color=255, 255, 255] Research Completed at __1__ - [technology=__2__] - __3__[/color]
+main-tooltip=Research GUI
+
+[expcom-waterfill]
+waterfill-distance=Too close to designated location
+waterfill-cliff=Not enough cliff explosive to create water
+entered-area-selection=Entered area selection, select areas to convert.

locale/en/data.cfg

@@ -10,6 +10,7 @@ saved=Your quickbar filters have been saved.
 Warnings=Warnings
 Warnings-tooltip=The total number of warnings you have received from staff
 Warnings-value-tooltip=The total number of warnings you have received from staff
+
 [exp-settings]
 Colour=Colour
 Colour-tooltip=Your player colour
@@ -35,6 +36,7 @@ TagColor-value-tooltip=Change by using /tag-color
 Bonus=Player Bonus
 Bonus-tooltip=The bonus given to your character
 Bonus-value-tooltip=Change by using /bonus
+HasEnabledDecon=Quick Tree Decon
 
 [exp-statistics]
 MapsPlayed=Maps Played
@@ -84,4 +86,20 @@ EntityRepaired-tooltip=The number of machines which you have repaired
 DeconstructionPlannerUsed=Decon Planner Used
 DeconstructionPlannerUsed-tooltip=The number of times you have used the deconstruction planner
 MapTagsMade=Map Tags Created
-MapTagsMade-tooltip=The number of map tags you have created
+MapTagsMade-tooltip=The number of map tags you have created
+DamageDeathRatio=Damage Death Ratio
+DamageDeathRatio-tooltip=Damage over Death
+KillDeathRatio=Kill Death Ratio
+KillDeathRatio-tooltip=Kill over Death
+SessionTime=Session Time
+SessionTime-tooltip=Session Time
+BuildRatio=Build Ratio
+BuildRatio-tooltip=Build over Remove
+RocketPerHour=Rocket Per Hour
+RocketPerHour-tooltip=Rocket Launched Over Play Time in Hour
+TreeKillPerMinute=Tree Kill Per Minute
+TreeKillPerMinute-tooltip=Tree Destroyed Per Minute
+NetPlayTime=Net Play Time
+NetPlayTime-tooltip=Net Play Time
+AFKTimeRatio=AFK Time Ratio
+AFKTimeRatio-tooltip=AFK Time over Play Time

locale/en/gui.cfg

@@ -87,6 +87,7 @@ edit-tooltip-none=Currently being edited by: Nobody
 create-footer-header=Create task
 edit-footer-header=Edit task
 view-footer-header=Task details
+
 [autofill]
 main-tooltip=Autofill settings
 toggle-section-caption=__1__ __2__
@@ -206,4 +207,7 @@ data-format=__1____2__
 main-tooltip=Toggle fast tree decon
 enabled=enabled
 disabled=disabled
-toggle-msg=Fast decon has been __1__
+toggle-msg=Fast decon has been __1__
+
+[vlayer]
+main-tooltip=Enable vlayer GUI