Merge branch 'explosivegaming:main' into dev

exp_scenario/module/gui/research_milestones.lua

@@ -43,12 +43,12 @@ local research_targets = {
 
 do --- Calculate the research targets
     local research_index = 1
-    local total_time = config.milestone_warmup_time * 60
+    local total_time = config.milestone_warmup_time * 3600
     for _, name in pairs(research_data.milestone[research_data.mod_set]) do
         if prototypes.technology[name] and (not prototypes.technology[name].hidden) then
             research_targets.index_lookup[name] = research_index
             -- The number is affected by multiplier already
-            total_time = total_time + math.ceil(prototypes.technology[name].research_unit_count * 60 / config.milestone_rate)
+            total_time = total_time + math.ceil(prototypes.technology[name].research_unit_count * 3600 / config.milestone_rate)
 
             research_targets.target_times[research_index] = {
                 name = name,

exp_scenario/module/locale/en.cfg

@@ -68,6 +68,8 @@ none-matching=No servers were found with that name, if you used an address pleas
 description=Opens the debug gui.
 
 [exp-commands_enemy]
+kill=__1__ killed all enemies.
+remove=__1__ removed and disabled all enemies.
 description-kill=Kill all enemy units.
 description-remove=Remove all enemy spawners.
 arg-surface=Surface to remove spawners from.

exp_scenario/module/locale/zh-CN.cfg

@@ -65,6 +65,8 @@ none-matching=沒找到服務器。
 description=打開偵錯介面。
 
 [exp-commands_enemy]
+kill=__1__ 消滅了所有敵人。
+remove=__1__ 移除和停用了所有敵人。
 description-kill=僅移除蟲單位。
 description-remove=移除蟲單位及停止生產器。
 arg-surface=要移除蟲巢的位面。

exp_scenario/module/locale/zh-TW.cfg

@@ -65,6 +65,8 @@ none-matching=沒找到服務器。
 description=打開偵錯介面。
 
 [exp-commands_enemy]
+kill=__1__ 消滅了所有敵人。
+remove=__1__ 移除和停用了所有敵人。
 description-kill=僅移除蟲單位。
 description-remove=移除蟲單位及停止生產器。
 arg-surface=要移除蟲巢的位面。