@@ -2441,7 +2443,7 @@ nb: use error(error_message) within your callback to trigger do not trigger dire
generated by LDoc
diff --git a/docs/core/Common.html b/docs/core/Common.html
index 1b9c70f3..922eb5d8 100644
--- a/docs/core/Common.html
+++ b/docs/core/Common.html
@@ -92,6 +92,7 @@
@@ -3404,7 +3406,7 @@ nb: this is one way, failing false after already gaining the role will not revok
generated by LDoc
diff --git a/docs/data/Alt-View.html b/docs/data/Alt-View.html
index 56dbf6df..b3746dc7 100644
--- a/docs/data/Alt-View.html
+++ b/docs/data/Alt-View.html
@@ -101,6 +101,7 @@
Sends alert messages to our discord server when certain events are triggered
@@ -429,6 +433,10 @@
This config controls what happens when a player dies mostly about map markers and item collection;
allow_teleport_to_body_command and allow_collect_bodies_command can be over ridden if command_auth_runtime_disable is present;
if not present then the commands will not be loaded into the game
Moves items to the position and stores them in the closest entity of the type given
+
Moves items to the position and stores them in the closest entity of the type given
+-- Copies the items by prototype name, but keeps them in the original inventory
Moves items to the position and stores them in the closest entity of the type given
+-- Differs from move_items by accepting a table of LuaItemStack and transferring them into the inventory - not copying
Moves items to the position and stores them in the closest entity of the type given
+
Moves items to the position and stores them in the closest entity of the type given
+-- Copies the items by prototype name, but keeps them in the original inventory
Moves items to the position and stores them in the closest entity of the type given
+-- Differs from move_items by accepting a table of LuaItemStack and transferring them into the inventory - not copying
+
+
+
+ Parameters:
+
+
+
+
+
+
+
+
+
+ items
+
+ :
+
+ (table)
+
+ items which are to be added to the chests, an array of LuaItemStack
+
+
+
+
+
+
+
+
+
+ surface
+
+ :
+
+ (LuaSurface)
+
+ the surface that the items will be moved to
+
+ (default: navies)
+
+
+
+
+
+
+
+
+ position
+
+ :
+
+ (table)
+
+ the position that the items will be moved to {x=100, y=100}
+
+ (default: {0)
+
+
+
+
+
+
+
+
+ radius
+
+ :
+
+ (number)
+
+ the radius in which the items are allowed to be placed
+
+ (default: 32)
+
+
+
+
+
+
+
+
+ chest_type
+
+ :
+
+ (string)
+
+ the chest type that the items should be moved into
+
+ (default: iron-chest)
+
+
+
+
+
+
+
+
+ Returns:
+
+
+ (LuaEntity)
+ the last chest that had items inserted into it
+
+
+
+
+
+
+
+
+
+ Usage:
+
-- Copy all the items in a players inventory and place them in chests at {0, 0}
+move_items(game.player.get_main_inventory())
+
+
@@ -2782,7 +2918,7 @@ https://github.com/Refactorio/RedMew/blob/9184b2940f311d8c9c891e83429fc57ec7e0c4
generated by LDoc
diff --git a/docs/core/Datastore.html b/docs/core/Datastore.html
index 9d89147b..15e468f1 100644
--- a/docs/core/Datastore.html
+++ b/docs/core/Datastore.html
@@ -2979,7 +2979,7 @@ ExampleData:on_update(function(key, value)
generated by LDoc
diff --git a/docs/core/External.html b/docs/core/External.html
index ad12cfeb..3a0846f2 100644
--- a/docs/core/External.html
+++ b/docs/core/External.html
@@ -763,7 +763,7 @@
generated by LDoc
diff --git a/docs/core/Groups.html b/docs/core/Groups.html
index c5956084..f288da23 100644
--- a/docs/core/Groups.html
+++ b/docs/core/Groups.html
@@ -1458,7 +1458,7 @@
generated by LDoc
diff --git a/docs/core/Gui.html b/docs/core/Gui.html
index cfb5fb9a..bdb7d86c 100644
--- a/docs/core/Gui.html
+++ b/docs/core/Gui.html
@@ -4436,7 +4436,7 @@ Gui.left_toolbar_button('entity/inserter', generated by LDoc
diff --git a/docs/core/PlayerData.html b/docs/core/PlayerData.html
index 1c0c4eb9..2086f44e 100644
--- a/docs/core/PlayerData.html
+++ b/docs/core/PlayerData.html
@@ -546,7 +546,7 @@
generated by LDoc
diff --git a/docs/core/Roles.html b/docs/core/Roles.html
index 36caa810..f82c07c4 100644
--- a/docs/core/Roles.html
+++ b/docs/core/Roles.html
@@ -3406,7 +3406,7 @@ nb: this is one way, failing false after already gaining the role will not revok
generated by LDoc
diff --git a/docs/data/Alt-View.html b/docs/data/Alt-View.html
index b658f19e..fa28be84 100644
--- a/docs/data/Alt-View.html
+++ b/docs/data/Alt-View.html
@@ -350,7 +350,7 @@
generated by LDoc
diff --git a/docs/data/Bonus.html b/docs/data/Bonus.html
index ca2264dd..15066f2d 100644
--- a/docs/data/Bonus.html
+++ b/docs/data/Bonus.html
@@ -502,7 +502,7 @@
generated by LDoc
diff --git a/docs/data/Greetings.html b/docs/data/Greetings.html
index 2a7afff1..62b62fee 100644
--- a/docs/data/Greetings.html
+++ b/docs/data/Greetings.html
@@ -445,7 +445,7 @@
generated by LDoc
diff --git a/docs/data/Player-Colours.html b/docs/data/Player-Colours.html
index 9b716641..03119bf0 100644
--- a/docs/data/Player-Colours.html
+++ b/docs/data/Player-Colours.html
@@ -406,7 +406,7 @@
generated by LDoc
diff --git a/docs/data/Quickbar.html b/docs/data/Quickbar.html
index 0048ab58..e85aa30b 100644
--- a/docs/data/Quickbar.html
+++ b/docs/data/Quickbar.html
@@ -423,7 +423,7 @@
generated by LDoc
diff --git a/docs/data/Tag.html b/docs/data/Tag.html
index 663433ed..c52cbc91 100644
--- a/docs/data/Tag.html
+++ b/docs/data/Tag.html
@@ -555,7 +555,7 @@
generated by LDoc
diff --git a/docs/guis/Autofill.html b/docs/guis/Autofill.html
index faa6dd03..ee6bad51 100644
--- a/docs/guis/Autofill.html
+++ b/docs/guis/Autofill.html
@@ -607,7 +607,7 @@
generated by LDoc
diff --git a/docs/guis/Player-List.html b/docs/guis/Player-List.html
index 353a0931..9a2c3339 100644
--- a/docs/guis/Player-List.html
+++ b/docs/guis/Player-List.html
@@ -721,7 +721,7 @@
generated by LDoc
diff --git a/docs/guis/Readme.html b/docs/guis/Readme.html
index e005c58d..bda73dc2 100644
--- a/docs/guis/Readme.html
+++ b/docs/guis/Readme.html
@@ -1013,7 +1013,7 @@
generated by LDoc
diff --git a/docs/guis/Rocket-Info.html b/docs/guis/Rocket-Info.html
index 88c5abc2..dfa09c0c 100644
--- a/docs/guis/Rocket-Info.html
+++ b/docs/guis/Rocket-Info.html
@@ -721,7 +721,7 @@
generated by LDoc
diff --git a/docs/guis/Science-Info.html b/docs/guis/Science-Info.html
index b8e24c86..ae875088 100644
--- a/docs/guis/Science-Info.html
+++ b/docs/guis/Science-Info.html
@@ -600,7 +600,7 @@
generated by LDoc
diff --git a/docs/guis/Task-List.html b/docs/guis/Task-List.html
index 2b1ad029..d3294e16 100644
--- a/docs/guis/Task-List.html
+++ b/docs/guis/Task-List.html
@@ -1124,7 +1124,7 @@
generated by LDoc
diff --git a/docs/guis/Warps-List.html b/docs/guis/Warps-List.html
index 5aeaeb93..5aecf73f 100644
--- a/docs/guis/Warps-List.html
+++ b/docs/guis/Warps-List.html
@@ -1090,7 +1090,7 @@
generated by LDoc
diff --git a/docs/guis/server-ups.html b/docs/guis/server-ups.html
index 6b2dcc07..b54e06b9 100644
--- a/docs/guis/server-ups.html
+++ b/docs/guis/server-ups.html
@@ -523,7 +523,7 @@
generated by LDoc
diff --git a/docs/index.html b/docs/index.html
index 017754d7..6943ecef 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -618,7 +618,7 @@ Events.set_event_filter(defines.events.on_built_entity, {{filter = "name", name
generated by LDoc
diff --git a/docs/modules/control.html b/docs/modules/control.html
index 077ee485..6da49aba 100644
--- a/docs/modules/control.html
+++ b/docs/modules/control.html
@@ -270,7 +270,7 @@
generated by LDoc
diff --git a/docs/modules/modules.addons.station-auto-name.html b/docs/modules/modules.addons.station-auto-name.html
index c3879511..b5761720 100644
--- a/docs/modules/modules.addons.station-auto-name.html
+++ b/docs/modules/modules.addons.station-auto-name.html
@@ -323,7 +323,7 @@ Events.set_event_filter(defines.events.on_built_entity, {{filter = "name", name
generated by LDoc
diff --git a/docs/modules/overrides.debug.html b/docs/modules/overrides.debug.html
index a374acd2..aa2b6995 100644
--- a/docs/modules/overrides.debug.html
+++ b/docs/modules/overrides.debug.html
@@ -684,7 +684,7 @@
generated by LDoc
diff --git a/docs/modules/overrides.math.html b/docs/modules/overrides.math.html
index bd3b9521..5bbf978b 100644
--- a/docs/modules/overrides.math.html
+++ b/docs/modules/overrides.math.html
@@ -383,7 +383,7 @@
generated by LDoc
diff --git a/docs/modules/overrides.table.html b/docs/modules/overrides.table.html
index 8d0c2e2f..a43201fc 100644
--- a/docs/modules/overrides.table.html
+++ b/docs/modules/overrides.table.html
@@ -2038,7 +2038,7 @@
generated by LDoc
diff --git a/docs/modules/utils.event.html b/docs/modules/utils.event.html
index ad4423c7..03a8d750 100644
--- a/docs/modules/utils.event.html
+++ b/docs/modules/utils.event.html
@@ -1322,7 +1322,7 @@
generated by LDoc
diff --git a/docs/modules/utils.event_core.html b/docs/modules/utils.event_core.html
index 91e6e516..481e2aa3 100644
--- a/docs/modules/utils.event_core.html
+++ b/docs/modules/utils.event_core.html
@@ -464,7 +464,7 @@
generated by LDoc
diff --git a/docs/modules/utils.task.html b/docs/modules/utils.task.html
index 00d9ba8d..c13f5182 100644
--- a/docs/modules/utils.task.html
+++ b/docs/modules/utils.task.html
@@ -681,7 +681,7 @@
generated by LDoc
diff --git a/docs/topics/LICENSE.html b/docs/topics/LICENSE.html
index 53ccb66e..bcee8580 100644
--- a/docs/topics/LICENSE.html
+++ b/docs/topics/LICENSE.html
@@ -819,7 +819,7 @@ Public License instead of this License. But first, please read
generated by LDoc
diff --git a/docs/topics/README.md.html b/docs/topics/README.md.html
index d8ae8895..c2e473ee 100644
--- a/docs/topics/README.md.html
+++ b/docs/topics/README.md.html
@@ -379,7 +379,7 @@
generated by LDoc
From 2c21f989ae2fd0253e99d21a7bdeed75fecaa1f6 Mon Sep 17 00:00:00 2001
From: oof2win2
Date: Sat, 14 May 2022 22:29:11 +0200
Subject: [PATCH 040/129] fix(graftorio): config issues
---
config/graftorio.lua | 7 ++++---
modules/graftorio/forcestats.lua | 3 ++-
modules/graftorio/require.lua | 11 +++++++----
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/config/graftorio.lua b/config/graftorio.lua
index 2f80e5fc..20dca369 100644
--- a/config/graftorio.lua
+++ b/config/graftorio.lua
@@ -1,6 +1,7 @@
return {
modules = {
- ["forcestats"]=true,
- ["general"]=true,
+ ["forcestats"] = true,
+ ["logistorage"] = false,
+ ["general"] = true,
}
-}
\ No newline at end of file
+}
diff --git a/modules/graftorio/forcestats.lua b/modules/graftorio/forcestats.lua
index fa95dc69..e7e1f9fe 100644
--- a/modules/graftorio/forcestats.lua
+++ b/modules/graftorio/forcestats.lua
@@ -1,5 +1,6 @@
local Event = require("utils.event")
local general = require("modules.graftorio.general")
+local config = require("config.graftorio")
local lib = {}
@@ -114,7 +115,7 @@ lib.collect_loginet = function()
stats.to_charge_robot_count = (stats.to_charge_robot_count) + cell.to_charge_robot_count
end
- if settings.general.data["graftorio-logistic-items"].value then
+ if config.modules.logistorage then
for name, v in pairs(network.get_contents()) do
stats.items[name] = (stats.items[name] or 0) + v
end
diff --git a/modules/graftorio/require.lua b/modules/graftorio/require.lua
index c94d0608..d4c05257 100644
--- a/modules/graftorio/require.lua
+++ b/modules/graftorio/require.lua
@@ -1,12 +1,14 @@
local Commands = require("expcore.commands")
local config = require("config.graftorio")
-
-local general = require("modules.graftorio.general")
local statics = require("modules.graftorio.statics")
-local forcestats = {}
+local forcestats = nil
+local general = nil
if config.modules.forcestats then
forcestats = require("modules.graftorio.forcestats")
end
+if config.modules.general then
+ general = require("modules.graftorio.general")
+end
Commands.new_command("collectdata", "Collect data for RCON usage")
:add_param("location", true)
@@ -14,9 +16,10 @@ Commands.new_command("collectdata", "Collect data for RCON usage")
-- this must be first as it overwrites the stats
-- also makes the .other table for all forces
statics.collect_statics()
- general.collect_other()
+ if config.modules.general then general.collect_other() end
if config.modules.forcestats then
forcestats.collect_production()
+ forcestats.collect_loginet()
end
rcon.print(game.table_to_json(general.data.output))
return Commands.success()
From e3f78387e4e7a0ff60bc82f293c166ec4765e082 Mon Sep 17 00:00:00 2001
From: oof2win2
Date: Sat, 14 May 2022 22:31:36 +0200
Subject: [PATCH 041/129] fix(graftorio): CI fix
---
modules/graftorio/forcestats.lua | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/modules/graftorio/forcestats.lua b/modules/graftorio/forcestats.lua
index e7e1f9fe..9839a484 100644
--- a/modules/graftorio/forcestats.lua
+++ b/modules/graftorio/forcestats.lua
@@ -173,9 +173,7 @@ Event.on_nth_tick(60, function()
for _, force in pairs(game.forces) do
if not general.data.output[force.name].research then general.data.output[force.name].research = {} end
- local force_research = general.data.output[force.name].research or {}
-
- force_research = {}
+ local force_research = {}
-- this works even if the queue is disabled, but it will always be just 1 long in that case
for _, research in pairs(force.research_queue) do
table.insert(force_research, {
From 995590507996fdb4eb8dde364a0e9eec409e7418 Mon Sep 17 00:00:00 2001
From: Cooldude2606 <25043174+Cooldude2606@users.noreply.github.com>
Date: Sat, 14 May 2022 20:36:59 +0000
Subject: [PATCH 042/129] Automatic Doc Update
---
docs/addons/Advanced-Start.html | 2 +-
docs/addons/Chat-Popups.html | 2 +-
docs/addons/Chat-Reply.html | 2 +-
docs/addons/Compilatron.html | 2 +-
docs/addons/Damage-Popups.html | 2 +-
docs/addons/Death-Logger.html | 2 +-
docs/addons/Deconlog.html | 2 +-
docs/addons/Discord-Alerts.html | 2 +-
docs/addons/Inventory-Clear.html | 2 +-
docs/addons/Pollution-Grading.html | 2 +-
docs/addons/Scorched-Earth.html | 2 +-
docs/addons/Spawn-Area.html | 2 +-
docs/addons/Tree-Decon.html | 2 +-
docs/addons/afk-kick.html | 2 +-
docs/addons/protection-jail.html | 2 +-
docs/addons/report-jail.html | 2 +-
docs/commands/Admin-Chat.html | 2 +-
docs/commands/Admin-Markers.html | 2 +-
docs/commands/Cheat-Mode.html | 2 +-
docs/commands/Clear-Inventory.html | 2 +-
docs/commands/Connect.html | 2 +-
docs/commands/Debug.html | 2 +-
docs/commands/Find.html | 2 +-
docs/commands/Help.html | 2 +-
docs/commands/Home.html | 2 +-
docs/commands/Interface.html | 2 +-
docs/commands/InventorySearch.html | 2 +-
docs/commands/Jail.html | 2 +-
docs/commands/Kill.html | 2 +-
docs/commands/LastLocation.html | 2 +-
docs/commands/Me.html | 2 +-
docs/commands/Protection.html | 2 +-
docs/commands/Rainbow.html | 2 +-
docs/commands/Repair.html | 2 +-
docs/commands/Reports.html | 2 +-
docs/commands/Roles.html | 2 +-
docs/commands/Spawn.html | 2 +-
docs/commands/Spectate.html | 2 +-
docs/commands/Teleport.html | 2 +-
docs/commands/Warnings.html | 2 +-
docs/configs/Advanced-Start.html | 2 +-
docs/configs/Autofill.html | 2 +-
docs/configs/Bonuses.html | 2 +-
docs/configs/Chat-Reply.html | 2 +-
docs/configs/Commands-Auth-Admin.html | 2 +-
docs/configs/Commands-Auth-Roles.html | 2 +-
docs/configs/Commands-Auth-Runtime-Disable.html | 2 +-
docs/configs/Commands-Color-Parse.html | 2 +-
docs/configs/Commands-Parse-Roles.html | 2 +-
docs/configs/Commands-Parse.html | 2 +-
docs/configs/Compilatron.html | 2 +-
docs/configs/Death-Logger.html | 2 +-
docs/configs/Deconlog.html | 2 +-
docs/configs/Discord-Alerts.html | 2 +-
docs/configs/File-Loader.html | 2 +-
docs/configs/Permission-Groups.html | 2 +-
docs/configs/Player-List.html | 2 +-
docs/configs/Pollution-Grading.html | 2 +-
docs/configs/Popup-Messages.html | 2 +-
docs/configs/Preset-Player-Colours.html | 2 +-
docs/configs/Preset-Player-Quickbar.html | 2 +-
docs/configs/Repair.html | 2 +-
docs/configs/Rockets.html | 2 +-
docs/configs/Roles.html | 2 +-
docs/configs/Science.html | 2 +-
docs/configs/Scorched-Earth.html | 2 +-
docs/configs/Spawn-Area.html | 2 +-
docs/configs/Statistics.html | 2 +-
docs/configs/Tasks.html | 2 +-
docs/configs/Warnings.html | 2 +-
docs/configs/Warps.html | 2 +-
docs/configs/inventory_clear.html | 2 +-
docs/control/Jail.html | 2 +-
docs/control/Production.html | 2 +-
docs/control/Protection.html | 2 +-
docs/control/Reports.html | 2 +-
docs/control/Rockets.html | 2 +-
docs/control/Selection.html | 2 +-
docs/control/Tasks.html | 2 +-
docs/control/Warnings.html | 2 +-
docs/control/Warps.html | 2 +-
docs/core/Async.html | 2 +-
docs/core/Commands.html | 2 +-
docs/core/Common.html | 2 +-
docs/core/Datastore.html | 2 +-
docs/core/External.html | 2 +-
docs/core/Groups.html | 2 +-
docs/core/Gui.html | 2 +-
docs/core/PlayerData.html | 2 +-
docs/core/Roles.html | 2 +-
docs/data/Alt-View.html | 2 +-
docs/data/Bonus.html | 2 +-
docs/data/Greetings.html | 2 +-
docs/data/Player-Colours.html | 2 +-
docs/data/Quickbar.html | 2 +-
docs/data/Tag.html | 2 +-
docs/guis/Autofill.html | 2 +-
docs/guis/Player-List.html | 2 +-
docs/guis/Readme.html | 2 +-
docs/guis/Rocket-Info.html | 2 +-
docs/guis/Science-Info.html | 2 +-
docs/guis/Task-List.html | 2 +-
docs/guis/Warps-List.html | 2 +-
docs/guis/server-ups.html | 2 +-
docs/index.html | 2 +-
docs/modules/control.html | 2 +-
docs/modules/modules.addons.station-auto-name.html | 2 +-
docs/modules/overrides.debug.html | 2 +-
docs/modules/overrides.math.html | 2 +-
docs/modules/overrides.table.html | 2 +-
docs/modules/utils.event.html | 2 +-
docs/modules/utils.event_core.html | 2 +-
docs/modules/utils.task.html | 2 +-
docs/topics/LICENSE.html | 2 +-
docs/topics/README.md.html | 2 +-
115 files changed, 115 insertions(+), 115 deletions(-)
diff --git a/docs/addons/Advanced-Start.html b/docs/addons/Advanced-Start.html
index 844baf4a..7cac27f3 100644
--- a/docs/addons/Advanced-Start.html
+++ b/docs/addons/Advanced-Start.html
@@ -350,7 +350,7 @@
generated by LDoc
diff --git a/docs/addons/Chat-Popups.html b/docs/addons/Chat-Popups.html
index 24b57eb4..57689bf7 100644
--- a/docs/addons/Chat-Popups.html
+++ b/docs/addons/Chat-Popups.html
@@ -379,7 +379,7 @@
generated by LDoc
diff --git a/docs/addons/Chat-Reply.html b/docs/addons/Chat-Reply.html
index 7c388366..dd3be7aa 100644
--- a/docs/addons/Chat-Reply.html
+++ b/docs/addons/Chat-Reply.html
@@ -378,7 +378,7 @@
generated by LDoc
diff --git a/docs/addons/Compilatron.html b/docs/addons/Compilatron.html
index fd224f8d..382f862c 100644
--- a/docs/addons/Compilatron.html
+++ b/docs/addons/Compilatron.html
@@ -587,7 +587,7 @@
generated by LDoc
diff --git a/docs/addons/Damage-Popups.html b/docs/addons/Damage-Popups.html
index d62855e1..062a5d6f 100644
--- a/docs/addons/Damage-Popups.html
+++ b/docs/addons/Damage-Popups.html
@@ -379,7 +379,7 @@
generated by LDoc
diff --git a/docs/addons/Death-Logger.html b/docs/addons/Death-Logger.html
index 49eb5374..fd729585 100644
--- a/docs/addons/Death-Logger.html
+++ b/docs/addons/Death-Logger.html
@@ -406,7 +406,7 @@
generated by LDoc
diff --git a/docs/addons/Deconlog.html b/docs/addons/Deconlog.html
index 2be9123f..26be43b6 100644
--- a/docs/addons/Deconlog.html
+++ b/docs/addons/Deconlog.html
@@ -378,7 +378,7 @@
generated by LDoc
diff --git a/docs/addons/Discord-Alerts.html b/docs/addons/Discord-Alerts.html
index 97fa90c9..38cf31e8 100644
--- a/docs/addons/Discord-Alerts.html
+++ b/docs/addons/Discord-Alerts.html
@@ -490,7 +490,7 @@
generated by LDoc
diff --git a/docs/addons/Inventory-Clear.html b/docs/addons/Inventory-Clear.html
index 403f847b..4e271c3e 100644
--- a/docs/addons/Inventory-Clear.html
+++ b/docs/addons/Inventory-Clear.html
@@ -378,7 +378,7 @@
generated by LDoc
diff --git a/docs/addons/Pollution-Grading.html b/docs/addons/Pollution-Grading.html
index 84495b27..771ec366 100644
--- a/docs/addons/Pollution-Grading.html
+++ b/docs/addons/Pollution-Grading.html
@@ -350,7 +350,7 @@
generated by LDoc
diff --git a/docs/addons/Scorched-Earth.html b/docs/addons/Scorched-Earth.html
index 91b1b7b6..4f787100 100644
--- a/docs/addons/Scorched-Earth.html
+++ b/docs/addons/Scorched-Earth.html
@@ -406,7 +406,7 @@
generated by LDoc
diff --git a/docs/addons/Spawn-Area.html b/docs/addons/Spawn-Area.html
index fd35f608..53662bfa 100644
--- a/docs/addons/Spawn-Area.html
+++ b/docs/addons/Spawn-Area.html
@@ -378,7 +378,7 @@
generated by LDoc
diff --git a/docs/addons/Tree-Decon.html b/docs/addons/Tree-Decon.html
index 0a7f8e24..8346a48a 100644
--- a/docs/addons/Tree-Decon.html
+++ b/docs/addons/Tree-Decon.html
@@ -434,7 +434,7 @@
generated by LDoc
diff --git a/docs/addons/afk-kick.html b/docs/addons/afk-kick.html
index 466c59c3..cc6d0e1d 100644
--- a/docs/addons/afk-kick.html
+++ b/docs/addons/afk-kick.html
@@ -406,7 +406,7 @@
generated by LDoc
diff --git a/docs/addons/protection-jail.html b/docs/addons/protection-jail.html
index abaee313..93556b02 100644
--- a/docs/addons/protection-jail.html
+++ b/docs/addons/protection-jail.html
@@ -434,7 +434,7 @@
generated by LDoc
diff --git a/docs/addons/report-jail.html b/docs/addons/report-jail.html
index 4c216389..171d2616 100644
--- a/docs/addons/report-jail.html
+++ b/docs/addons/report-jail.html
@@ -406,7 +406,7 @@
generated by LDoc
diff --git a/docs/commands/Admin-Chat.html b/docs/commands/Admin-Chat.html
index ea551172..fafbb803 100644
--- a/docs/commands/Admin-Chat.html
+++ b/docs/commands/Admin-Chat.html
@@ -418,7 +418,7 @@
generated by LDoc
diff --git a/docs/commands/Admin-Markers.html b/docs/commands/Admin-Markers.html
index aa8a9589..ebd1d737 100644
--- a/docs/commands/Admin-Markers.html
+++ b/docs/commands/Admin-Markers.html
@@ -423,7 +423,7 @@
generated by LDoc
diff --git a/docs/commands/Cheat-Mode.html b/docs/commands/Cheat-Mode.html
index eb5d5328..ecf26d6b 100644
--- a/docs/commands/Cheat-Mode.html
+++ b/docs/commands/Cheat-Mode.html
@@ -391,7 +391,7 @@
generated by LDoc
diff --git a/docs/commands/Clear-Inventory.html b/docs/commands/Clear-Inventory.html
index 56ad7c15..e20cdbc0 100644
--- a/docs/commands/Clear-Inventory.html
+++ b/docs/commands/Clear-Inventory.html
@@ -418,7 +418,7 @@
generated by LDoc
diff --git a/docs/commands/Connect.html b/docs/commands/Connect.html
index fe62f74c..4208cfed 100644
--- a/docs/commands/Connect.html
+++ b/docs/commands/Connect.html
@@ -621,7 +621,7 @@
generated by LDoc
diff --git a/docs/commands/Debug.html b/docs/commands/Debug.html
index 789ca7b0..6eabccce 100644
--- a/docs/commands/Debug.html
+++ b/docs/commands/Debug.html
@@ -395,7 +395,7 @@
generated by LDoc
diff --git a/docs/commands/Find.html b/docs/commands/Find.html
index dc954b12..d241e4bc 100644
--- a/docs/commands/Find.html
+++ b/docs/commands/Find.html
@@ -390,7 +390,7 @@
generated by LDoc
diff --git a/docs/commands/Help.html b/docs/commands/Help.html
index 6b4289e4..746fce88 100644
--- a/docs/commands/Help.html
+++ b/docs/commands/Help.html
@@ -434,7 +434,7 @@
generated by LDoc
diff --git a/docs/commands/Home.html b/docs/commands/Home.html
index 20be0d7c..9cd2509b 100644
--- a/docs/commands/Home.html
+++ b/docs/commands/Home.html
@@ -488,7 +488,7 @@
generated by LDoc
diff --git a/docs/commands/Interface.html b/docs/commands/Interface.html
index 67f805e6..00dc7c96 100644
--- a/docs/commands/Interface.html
+++ b/docs/commands/Interface.html
@@ -418,7 +418,7 @@
generated by LDoc
diff --git a/docs/commands/InventorySearch.html b/docs/commands/InventorySearch.html
index 95bac750..24a5eb5e 100644
--- a/docs/commands/InventorySearch.html
+++ b/docs/commands/InventorySearch.html
@@ -608,7 +608,7 @@
generated by LDoc
diff --git a/docs/commands/Jail.html b/docs/commands/Jail.html
index c8b5922f..fa424ce3 100644
--- a/docs/commands/Jail.html
+++ b/docs/commands/Jail.html
@@ -517,7 +517,7 @@
generated by LDoc
diff --git a/docs/commands/Kill.html b/docs/commands/Kill.html
index a9f41f48..5b578ea8 100644
--- a/docs/commands/Kill.html
+++ b/docs/commands/Kill.html
@@ -419,7 +419,7 @@
generated by LDoc
diff --git a/docs/commands/LastLocation.html b/docs/commands/LastLocation.html
index 5200d7be..4baba3df 100644
--- a/docs/commands/LastLocation.html
+++ b/docs/commands/LastLocation.html
@@ -418,7 +418,7 @@
generated by LDoc
diff --git a/docs/commands/Me.html b/docs/commands/Me.html
index f8e1077c..dcc1529f 100644
--- a/docs/commands/Me.html
+++ b/docs/commands/Me.html
@@ -390,7 +390,7 @@
generated by LDoc
diff --git a/docs/commands/Protection.html b/docs/commands/Protection.html
index 02a973c3..156d6904 100644
--- a/docs/commands/Protection.html
+++ b/docs/commands/Protection.html
@@ -566,7 +566,7 @@
generated by LDoc
diff --git a/docs/commands/Rainbow.html b/docs/commands/Rainbow.html
index 758eac8d..f9f8434c 100644
--- a/docs/commands/Rainbow.html
+++ b/docs/commands/Rainbow.html
@@ -418,7 +418,7 @@
generated by LDoc
diff --git a/docs/commands/Repair.html b/docs/commands/Repair.html
index a41a2e43..91989405 100644
--- a/docs/commands/Repair.html
+++ b/docs/commands/Repair.html
@@ -351,7 +351,7 @@
generated by LDoc
diff --git a/docs/commands/Reports.html b/docs/commands/Reports.html
index aa11688f..6923d0ea 100644
--- a/docs/commands/Reports.html
+++ b/docs/commands/Reports.html
@@ -615,7 +615,7 @@
generated by LDoc
diff --git a/docs/commands/Roles.html b/docs/commands/Roles.html
index 6fd206d6..5e5f0445 100644
--- a/docs/commands/Roles.html
+++ b/docs/commands/Roles.html
@@ -587,7 +587,7 @@
generated by LDoc
diff --git a/docs/commands/Spawn.html b/docs/commands/Spawn.html
index 2c17e8e2..8271e300 100644
--- a/docs/commands/Spawn.html
+++ b/docs/commands/Spawn.html
@@ -419,7 +419,7 @@
generated by LDoc
diff --git a/docs/commands/Spectate.html b/docs/commands/Spectate.html
index 8755a575..5d5ba9b7 100644
--- a/docs/commands/Spectate.html
+++ b/docs/commands/Spectate.html
@@ -449,7 +449,7 @@
generated by LDoc
diff --git a/docs/commands/Teleport.html b/docs/commands/Teleport.html
index e5b03e6d..2d618df5 100644
--- a/docs/commands/Teleport.html
+++ b/docs/commands/Teleport.html
@@ -514,7 +514,7 @@
generated by LDoc
diff --git a/docs/commands/Warnings.html b/docs/commands/Warnings.html
index 12f42269..71fe8da6 100644
--- a/docs/commands/Warnings.html
+++ b/docs/commands/Warnings.html
@@ -599,7 +599,7 @@
generated by LDoc
diff --git a/docs/configs/Advanced-Start.html b/docs/configs/Advanced-Start.html
index fbe1f046..139da2ce 100644
--- a/docs/configs/Advanced-Start.html
+++ b/docs/configs/Advanced-Start.html
@@ -536,7 +536,7 @@
generated by LDoc
diff --git a/docs/configs/Autofill.html b/docs/configs/Autofill.html
index 92a65e55..37ee980b 100644
--- a/docs/configs/Autofill.html
+++ b/docs/configs/Autofill.html
@@ -267,7 +267,7 @@
generated by LDoc
diff --git a/docs/configs/Bonuses.html b/docs/configs/Bonuses.html
index adb25f3a..2b701bbe 100644
--- a/docs/configs/Bonuses.html
+++ b/docs/configs/Bonuses.html
@@ -267,7 +267,7 @@
generated by LDoc
diff --git a/docs/configs/Chat-Reply.html b/docs/configs/Chat-Reply.html
index 0d098534..8010ab5a 100644
--- a/docs/configs/Chat-Reply.html
+++ b/docs/configs/Chat-Reply.html
@@ -515,7 +515,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Auth-Admin.html b/docs/configs/Commands-Auth-Admin.html
index b74b4ca4..a30e9984 100644
--- a/docs/configs/Commands-Auth-Admin.html
+++ b/docs/configs/Commands-Auth-Admin.html
@@ -324,7 +324,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Auth-Roles.html b/docs/configs/Commands-Auth-Roles.html
index 50a782fb..1059b1c8 100644
--- a/docs/configs/Commands-Auth-Roles.html
+++ b/docs/configs/Commands-Auth-Roles.html
@@ -350,7 +350,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Auth-Runtime-Disable.html b/docs/configs/Commands-Auth-Runtime-Disable.html
index 13f24502..b264e0f5 100644
--- a/docs/configs/Commands-Auth-Runtime-Disable.html
+++ b/docs/configs/Commands-Auth-Runtime-Disable.html
@@ -472,7 +472,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Color-Parse.html b/docs/configs/Commands-Color-Parse.html
index 87ef565e..8716bb93 100644
--- a/docs/configs/Commands-Color-Parse.html
+++ b/docs/configs/Commands-Color-Parse.html
@@ -350,7 +350,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Parse-Roles.html b/docs/configs/Commands-Parse-Roles.html
index c467a139..107750cd 100644
--- a/docs/configs/Commands-Parse-Roles.html
+++ b/docs/configs/Commands-Parse-Roles.html
@@ -384,7 +384,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Parse.html b/docs/configs/Commands-Parse.html
index 7ae854dc..31f59d03 100644
--- a/docs/configs/Commands-Parse.html
+++ b/docs/configs/Commands-Parse.html
@@ -340,7 +340,7 @@ see ./expcore/commands.lua for more details
generated by LDoc
diff --git a/docs/configs/Compilatron.html b/docs/configs/Compilatron.html
index d832289b..8a99edd4 100644
--- a/docs/configs/Compilatron.html
+++ b/docs/configs/Compilatron.html
@@ -384,7 +384,7 @@
generated by LDoc
diff --git a/docs/configs/Death-Logger.html b/docs/configs/Death-Logger.html
index 52c3b508..5a9ca46d 100644
--- a/docs/configs/Death-Logger.html
+++ b/docs/configs/Death-Logger.html
@@ -506,7 +506,7 @@
generated by LDoc
diff --git a/docs/configs/Deconlog.html b/docs/configs/Deconlog.html
index 1db6824d..e21fc96a 100644
--- a/docs/configs/Deconlog.html
+++ b/docs/configs/Deconlog.html
@@ -414,7 +414,7 @@
generated by LDoc
diff --git a/docs/configs/Discord-Alerts.html b/docs/configs/Discord-Alerts.html
index 754682d1..b5193df1 100644
--- a/docs/configs/Discord-Alerts.html
+++ b/docs/configs/Discord-Alerts.html
@@ -267,7 +267,7 @@
generated by LDoc
diff --git a/docs/configs/File-Loader.html b/docs/configs/File-Loader.html
index 20152234..03e3ea86 100644
--- a/docs/configs/File-Loader.html
+++ b/docs/configs/File-Loader.html
@@ -270,7 +270,7 @@
generated by LDoc
diff --git a/docs/configs/Permission-Groups.html b/docs/configs/Permission-Groups.html
index 313409d9..d350b318 100644
--- a/docs/configs/Permission-Groups.html
+++ b/docs/configs/Permission-Groups.html
@@ -325,7 +325,7 @@
generated by LDoc
diff --git a/docs/configs/Player-List.html b/docs/configs/Player-List.html
index ca5ee0ba..f20f3142 100644
--- a/docs/configs/Player-List.html
+++ b/docs/configs/Player-List.html
@@ -724,7 +724,7 @@
generated by LDoc
diff --git a/docs/configs/Pollution-Grading.html b/docs/configs/Pollution-Grading.html
index 62e15671..3ddee680 100644
--- a/docs/configs/Pollution-Grading.html
+++ b/docs/configs/Pollution-Grading.html
@@ -414,7 +414,7 @@
generated by LDoc
diff --git a/docs/configs/Popup-Messages.html b/docs/configs/Popup-Messages.html
index 6fad9a96..f32db796 100644
--- a/docs/configs/Popup-Messages.html
+++ b/docs/configs/Popup-Messages.html
@@ -444,7 +444,7 @@
generated by LDoc
diff --git a/docs/configs/Preset-Player-Colours.html b/docs/configs/Preset-Player-Colours.html
index 4428d72f..59daea0b 100644
--- a/docs/configs/Preset-Player-Colours.html
+++ b/docs/configs/Preset-Player-Colours.html
@@ -354,7 +354,7 @@
generated by LDoc
diff --git a/docs/configs/Preset-Player-Quickbar.html b/docs/configs/Preset-Player-Quickbar.html
index 91d42164..abf5e254 100644
--- a/docs/configs/Preset-Player-Quickbar.html
+++ b/docs/configs/Preset-Player-Quickbar.html
@@ -267,7 +267,7 @@
generated by LDoc
diff --git a/docs/configs/Repair.html b/docs/configs/Repair.html
index af2607b2..52bf69c4 100644
--- a/docs/configs/Repair.html
+++ b/docs/configs/Repair.html
@@ -444,7 +444,7 @@
generated by LDoc
diff --git a/docs/configs/Rockets.html b/docs/configs/Rockets.html
index 0dbabb8f..caed3b2c 100644
--- a/docs/configs/Rockets.html
+++ b/docs/configs/Rockets.html
@@ -864,7 +864,7 @@
generated by LDoc
diff --git a/docs/configs/Roles.html b/docs/configs/Roles.html
index 619b6e9f..6b617f55 100644
--- a/docs/configs/Roles.html
+++ b/docs/configs/Roles.html
@@ -350,7 +350,7 @@
generated by LDoc
diff --git a/docs/configs/Science.html b/docs/configs/Science.html
index 76d5aad5..969c6188 100644
--- a/docs/configs/Science.html
+++ b/docs/configs/Science.html
@@ -384,7 +384,7 @@
generated by LDoc
diff --git a/docs/configs/Scorched-Earth.html b/docs/configs/Scorched-Earth.html
index c27dde48..b43575d7 100644
--- a/docs/configs/Scorched-Earth.html
+++ b/docs/configs/Scorched-Earth.html
@@ -418,7 +418,7 @@
generated by LDoc
diff --git a/docs/configs/Spawn-Area.html b/docs/configs/Spawn-Area.html
index 932eba99..cd89b6cd 100644
--- a/docs/configs/Spawn-Area.html
+++ b/docs/configs/Spawn-Area.html
@@ -1225,7 +1225,7 @@
generated by LDoc
diff --git a/docs/configs/Statistics.html b/docs/configs/Statistics.html
index 55b10895..318a678f 100644
--- a/docs/configs/Statistics.html
+++ b/docs/configs/Statistics.html
@@ -684,7 +684,7 @@
generated by LDoc
diff --git a/docs/configs/Tasks.html b/docs/configs/Tasks.html
index 2c6ff3ec..c0043c24 100644
--- a/docs/configs/Tasks.html
+++ b/docs/configs/Tasks.html
@@ -414,7 +414,7 @@
generated by LDoc
diff --git a/docs/configs/Warnings.html b/docs/configs/Warnings.html
index 86077cb4..6e6e5d6d 100644
--- a/docs/configs/Warnings.html
+++ b/docs/configs/Warnings.html
@@ -385,7 +385,7 @@
generated by LDoc
diff --git a/docs/configs/Warps.html b/docs/configs/Warps.html
index ea18cfd3..0401708b 100644
--- a/docs/configs/Warps.html
+++ b/docs/configs/Warps.html
@@ -774,7 +774,7 @@
generated by LDoc
diff --git a/docs/configs/inventory_clear.html b/docs/configs/inventory_clear.html
index dc660004..479b1d68 100644
--- a/docs/configs/inventory_clear.html
+++ b/docs/configs/inventory_clear.html
@@ -267,7 +267,7 @@
generated by LDoc
diff --git a/docs/control/Jail.html b/docs/control/Jail.html
index 05b0d3b2..7446603f 100644
--- a/docs/control/Jail.html
+++ b/docs/control/Jail.html
@@ -805,7 +805,7 @@
generated by LDoc
diff --git a/docs/control/Production.html b/docs/control/Production.html
index 09a287eb..9ca55560 100644
--- a/docs/control/Production.html
+++ b/docs/control/Production.html
@@ -1359,7 +1359,7 @@
generated by LDoc
diff --git a/docs/control/Protection.html b/docs/control/Protection.html
index 2d3bb580..fb3c6ae4 100644
--- a/docs/control/Protection.html
+++ b/docs/control/Protection.html
@@ -1031,7 +1031,7 @@
generated by LDoc
diff --git a/docs/control/Reports.html b/docs/control/Reports.html
index 3e7208ae..70fa898d 100644
--- a/docs/control/Reports.html
+++ b/docs/control/Reports.html
@@ -1172,7 +1172,7 @@
generated by LDoc
diff --git a/docs/control/Rockets.html b/docs/control/Rockets.html
index 8d254a7f..866f970b 100644
--- a/docs/control/Rockets.html
+++ b/docs/control/Rockets.html
@@ -1014,7 +1014,7 @@
generated by LDoc
diff --git a/docs/control/Selection.html b/docs/control/Selection.html
index ecde6c5b..dd70acca 100644
--- a/docs/control/Selection.html
+++ b/docs/control/Selection.html
@@ -921,7 +921,7 @@
generated by LDoc
diff --git a/docs/control/Tasks.html b/docs/control/Tasks.html
index e16cdbbf..202f08d3 100644
--- a/docs/control/Tasks.html
+++ b/docs/control/Tasks.html
@@ -1015,7 +1015,7 @@ Tasks.update_task(task_id, 'We need more iron!', gam
generated by LDoc
diff --git a/docs/control/Warnings.html b/docs/control/Warnings.html
index 9b5cdf64..8e0bef3a 100644
--- a/docs/control/Warnings.html
+++ b/docs/control/Warnings.html
@@ -1555,7 +1555,7 @@
generated by LDoc
diff --git a/docs/control/Warps.html b/docs/control/Warps.html
index dd0a3883..8f0a4eea 100644
--- a/docs/control/Warps.html
+++ b/docs/control/Warps.html
@@ -1537,7 +1537,7 @@ Warps.make_warp_tag(warp_id)
generated by LDoc
diff --git a/docs/core/Async.html b/docs/core/Async.html
index 5dc9fcdf..e46de6af 100644
--- a/docs/core/Async.html
+++ b/docs/core/Async.html
@@ -628,7 +628,7 @@ Async.register(function(player, message)
generated by LDoc
diff --git a/docs/core/Commands.html b/docs/core/Commands.html
index 4507ca34..42141eef 100644
--- a/docs/core/Commands.html
+++ b/docs/core/Commands.html
@@ -2443,7 +2443,7 @@ nb: use error(error_message) within your callback to trigger do not trigger dire
generated by LDoc
diff --git a/docs/core/Common.html b/docs/core/Common.html
index a354ee26..423ec0b9 100644
--- a/docs/core/Common.html
+++ b/docs/core/Common.html
@@ -2918,7 +2918,7 @@ https://github.com/Refactorio/RedMew/blob/9184b2940f311d8c9c891e83429fc57ec7e0c4
generated by LDoc
diff --git a/docs/core/Datastore.html b/docs/core/Datastore.html
index 15e468f1..9c0a77c1 100644
--- a/docs/core/Datastore.html
+++ b/docs/core/Datastore.html
@@ -2979,7 +2979,7 @@ ExampleData:on_update(function(key, value)
generated by LDoc
diff --git a/docs/core/External.html b/docs/core/External.html
index 3a0846f2..5f82eb6b 100644
--- a/docs/core/External.html
+++ b/docs/core/External.html
@@ -763,7 +763,7 @@
generated by LDoc
diff --git a/docs/core/Groups.html b/docs/core/Groups.html
index f288da23..78c41aa6 100644
--- a/docs/core/Groups.html
+++ b/docs/core/Groups.html
@@ -1458,7 +1458,7 @@
generated by LDoc
diff --git a/docs/core/Gui.html b/docs/core/Gui.html
index bdb7d86c..0b5412af 100644
--- a/docs/core/Gui.html
+++ b/docs/core/Gui.html
@@ -4436,7 +4436,7 @@ Gui.left_toolbar_button('entity/inserter', generated by LDoc
diff --git a/docs/core/PlayerData.html b/docs/core/PlayerData.html
index 2086f44e..da1a21d5 100644
--- a/docs/core/PlayerData.html
+++ b/docs/core/PlayerData.html
@@ -546,7 +546,7 @@
generated by LDoc
diff --git a/docs/core/Roles.html b/docs/core/Roles.html
index f82c07c4..944b64f1 100644
--- a/docs/core/Roles.html
+++ b/docs/core/Roles.html
@@ -3406,7 +3406,7 @@ nb: this is one way, failing false after already gaining the role will not revok
generated by LDoc
diff --git a/docs/data/Alt-View.html b/docs/data/Alt-View.html
index fa28be84..8dba5a81 100644
--- a/docs/data/Alt-View.html
+++ b/docs/data/Alt-View.html
@@ -350,7 +350,7 @@
generated by LDoc
diff --git a/docs/data/Bonus.html b/docs/data/Bonus.html
index 15066f2d..d7efcb51 100644
--- a/docs/data/Bonus.html
+++ b/docs/data/Bonus.html
@@ -502,7 +502,7 @@
generated by LDoc
diff --git a/docs/data/Greetings.html b/docs/data/Greetings.html
index 62b62fee..73191694 100644
--- a/docs/data/Greetings.html
+++ b/docs/data/Greetings.html
@@ -445,7 +445,7 @@
generated by LDoc
diff --git a/docs/data/Player-Colours.html b/docs/data/Player-Colours.html
index 03119bf0..3ccda7a2 100644
--- a/docs/data/Player-Colours.html
+++ b/docs/data/Player-Colours.html
@@ -406,7 +406,7 @@
generated by LDoc
diff --git a/docs/data/Quickbar.html b/docs/data/Quickbar.html
index e85aa30b..0e00dd51 100644
--- a/docs/data/Quickbar.html
+++ b/docs/data/Quickbar.html
@@ -423,7 +423,7 @@
generated by LDoc
diff --git a/docs/data/Tag.html b/docs/data/Tag.html
index c52cbc91..07029761 100644
--- a/docs/data/Tag.html
+++ b/docs/data/Tag.html
@@ -555,7 +555,7 @@
generated by LDoc
diff --git a/docs/guis/Autofill.html b/docs/guis/Autofill.html
index ee6bad51..eb6140c7 100644
--- a/docs/guis/Autofill.html
+++ b/docs/guis/Autofill.html
@@ -607,7 +607,7 @@
generated by LDoc
diff --git a/docs/guis/Player-List.html b/docs/guis/Player-List.html
index 9a2c3339..b0f2a91e 100644
--- a/docs/guis/Player-List.html
+++ b/docs/guis/Player-List.html
@@ -721,7 +721,7 @@
generated by LDoc
diff --git a/docs/guis/Readme.html b/docs/guis/Readme.html
index bda73dc2..cc2097ac 100644
--- a/docs/guis/Readme.html
+++ b/docs/guis/Readme.html
@@ -1013,7 +1013,7 @@
generated by LDoc
diff --git a/docs/guis/Rocket-Info.html b/docs/guis/Rocket-Info.html
index dfa09c0c..fc3d2872 100644
--- a/docs/guis/Rocket-Info.html
+++ b/docs/guis/Rocket-Info.html
@@ -721,7 +721,7 @@
generated by LDoc
diff --git a/docs/guis/Science-Info.html b/docs/guis/Science-Info.html
index ae875088..6e88d06a 100644
--- a/docs/guis/Science-Info.html
+++ b/docs/guis/Science-Info.html
@@ -600,7 +600,7 @@
generated by LDoc
diff --git a/docs/guis/Task-List.html b/docs/guis/Task-List.html
index d3294e16..45521c0d 100644
--- a/docs/guis/Task-List.html
+++ b/docs/guis/Task-List.html
@@ -1124,7 +1124,7 @@
generated by LDoc
diff --git a/docs/guis/Warps-List.html b/docs/guis/Warps-List.html
index 5aecf73f..273e0479 100644
--- a/docs/guis/Warps-List.html
+++ b/docs/guis/Warps-List.html
@@ -1090,7 +1090,7 @@
generated by LDoc
diff --git a/docs/guis/server-ups.html b/docs/guis/server-ups.html
index b54e06b9..88d50bee 100644
--- a/docs/guis/server-ups.html
+++ b/docs/guis/server-ups.html
@@ -523,7 +523,7 @@
generated by LDoc
diff --git a/docs/index.html b/docs/index.html
index 6943ecef..0ed036bf 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -618,7 +618,7 @@ Events.set_event_filter(defines.events.on_built_entity, {{filter = "name", name
generated by LDoc
diff --git a/docs/modules/control.html b/docs/modules/control.html
index 6da49aba..e7908c04 100644
--- a/docs/modules/control.html
+++ b/docs/modules/control.html
@@ -270,7 +270,7 @@
generated by LDoc
diff --git a/docs/modules/modules.addons.station-auto-name.html b/docs/modules/modules.addons.station-auto-name.html
index b5761720..e163b90b 100644
--- a/docs/modules/modules.addons.station-auto-name.html
+++ b/docs/modules/modules.addons.station-auto-name.html
@@ -323,7 +323,7 @@ Events.set_event_filter(defines.events.on_built_entity, {{filter = "name", name
generated by LDoc
diff --git a/docs/modules/overrides.debug.html b/docs/modules/overrides.debug.html
index aa2b6995..181e3b2a 100644
--- a/docs/modules/overrides.debug.html
+++ b/docs/modules/overrides.debug.html
@@ -684,7 +684,7 @@
generated by LDoc
diff --git a/docs/modules/overrides.math.html b/docs/modules/overrides.math.html
index 5bbf978b..650cca9c 100644
--- a/docs/modules/overrides.math.html
+++ b/docs/modules/overrides.math.html
@@ -383,7 +383,7 @@
generated by LDoc
diff --git a/docs/modules/overrides.table.html b/docs/modules/overrides.table.html
index a43201fc..9b94f6c3 100644
--- a/docs/modules/overrides.table.html
+++ b/docs/modules/overrides.table.html
@@ -2038,7 +2038,7 @@
generated by LDoc
diff --git a/docs/modules/utils.event.html b/docs/modules/utils.event.html
index 03a8d750..4b8dfa40 100644
--- a/docs/modules/utils.event.html
+++ b/docs/modules/utils.event.html
@@ -1322,7 +1322,7 @@
generated by LDoc
diff --git a/docs/modules/utils.event_core.html b/docs/modules/utils.event_core.html
index 481e2aa3..a843a562 100644
--- a/docs/modules/utils.event_core.html
+++ b/docs/modules/utils.event_core.html
@@ -464,7 +464,7 @@
generated by LDoc
diff --git a/docs/modules/utils.task.html b/docs/modules/utils.task.html
index c13f5182..ad616393 100644
--- a/docs/modules/utils.task.html
+++ b/docs/modules/utils.task.html
@@ -681,7 +681,7 @@
generated by LDoc
diff --git a/docs/topics/LICENSE.html b/docs/topics/LICENSE.html
index bcee8580..efb2a02b 100644
--- a/docs/topics/LICENSE.html
+++ b/docs/topics/LICENSE.html
@@ -819,7 +819,7 @@ Public License instead of this License. But first, please read
generated by LDoc
diff --git a/docs/topics/README.md.html b/docs/topics/README.md.html
index c2e473ee..05c29cf7 100644
--- a/docs/topics/README.md.html
+++ b/docs/topics/README.md.html
@@ -379,7 +379,7 @@
generated by LDoc
From b164e4dd6897083e260deecc43aa5a2bbb418a09 Mon Sep 17 00:00:00 2001
From: oof2win2
Date: Sat, 14 May 2022 23:22:05 +0200
Subject: [PATCH 043/129] fix(common): remove wrong move_items Have only
copy_items_stack and move_items_stack
---
expcore/common.lua | 95 ++++++++++++++++++++++++----------------------
1 file changed, 50 insertions(+), 45 deletions(-)
diff --git a/expcore/common.lua b/expcore/common.lua
index 38d58e52..337b1c28 100644
--- a/expcore/common.lua
+++ b/expcore/common.lua
@@ -540,7 +540,7 @@ end
--[[-- Moves items to the position and stores them in the closest entity of the type given
-- Copies the items by prototype name, but keeps them in the original inventory
-@tparam table items items which are to be added to the chests, ['name']=count
+@tparam table items items which are to be added to the chests, an array of LuaItemStack
@tparam[opt=navies] LuaSurface surface the surface that the items will be moved to
@tparam[opt={0, 0}] table position the position that the items will be moved to {x=100, y=100}
@tparam[opt=32] number radius the radius in which the items are allowed to be placed
@@ -551,49 +551,52 @@ end
move_items(game.player.get_main_inventory().get_contents())
]]
-function Common.move_items(items, surface, position, radius, chest_type)
- chest_type = chest_type or 'iron-chest'
- surface = surface or game.surfaces[1]
- if position and type(position) ~= 'table' then return end
- if type(items) ~= 'table' then return end
- -- Finds all entities of the given type
- local p = position or {x=0, y=0}
- local r = radius or 32
- local entities = surface.find_entities_filtered{area={{p.x-r, p.y-r}, {p.x+r, p.y+r}}, name=chest_type} or {}
- local count = #entities
- local current = 1
- -- Makes a new empty chest when it is needed
- local function make_new_chest()
- local pos = surface.find_non_colliding_position(chest_type, position, 32, 1)
- local chest = surface.create_entity{name=chest_type, position=pos, force='neutral'}
- table.insert(entities, chest)
- count = count + 1
- return chest
- end
- -- Function used to round robin the items into all chests
- local function next_chest(item)
- local chest = entities[current]
- if count == 0 then return make_new_chest() end
- if chest.get_inventory(defines.inventory.chest).can_insert(item) then
- -- If the item can be inserted then the chest is returned
- current = current+1
- if current > count then current = 1 end
- return chest
- else
- -- Other wise it is removed from the list
- table.remove(entities, current)
- count = count - 1
- end
- end
- -- Inserts the items into the chests
- local last_chest
- for item_name, item_count in pairs(items) do
- local chest = next_chest{name=item_name, count=item_count}
- if not chest then return error(string.format('Cant move item %s to %s{%s, %s} no valid chest in radius', item_name, surface.name, p.x, p.y)) end
- Util.insert_safe(chest, {[item_name]=item_count})
- last_chest = chest
- end
- return last_chest
+function Common.copy_items_stack(items, surface, position, radius, chest_type)
+ chest_type = chest_type or 'iron-chest'
+ surface = surface or game.surfaces[1]
+ if position and type(position) ~= 'table' then return end
+ if type(items) ~= 'table' then return end
+ -- Finds all entities of the given type
+ local p = position or {x=0, y=0}
+ local r = radius or 32
+ local entities = surface.find_entities_filtered{area={{p.x-r, p.y-r}, {p.x+r, p.y+r}}, name=chest_type} or {}
+ local count = #entities
+ local current = 1
+ -- Makes a new empty chest when it is needed
+ local function make_new_chest()
+ local pos = surface.find_non_colliding_position(chest_type, position, 32, 1)
+ local chest = surface.create_entity{name=chest_type, position=pos, force='neutral'}
+ table.insert(entities, chest)
+ count = count + 1
+ return chest
+ end
+ -- Function used to round robin the items into all chests
+ local function next_chest(item)
+ local chest = entities[current]
+ if count == 0 then return make_new_chest() end
+ if chest.get_inventory(defines.inventory.chest).can_insert(item) then
+ -- If the item can be inserted then the chest is returned
+ current = current+1
+ if current > count then current = 1 end
+ return chest
+ else
+ -- Other wise it is removed from the list
+ table.remove(entities, current)
+ count = count - 1
+ end
+ end
+ -- Inserts the items into the chests
+ local last_chest
+ for i=1,#items do
+ local item = items[i]
+ if item.valid_for_read then
+ local chest = next_chest(item)
+ if not chest or not chest.valid then return error(string.format('Cant move item %s to %s{%s, %s} no valid chest in radius', item.name, surface.name, p.x, p.y)) end
+ chest.insert(item)
+ last_chest = chest
+ end
+ end
+ return last_chest
end
--[[-- Moves items to the position and stores them in the closest entity of the type given
@@ -650,7 +653,9 @@ function Common.move_items_stack(items, surface, position, radius, chest_type)
if item.valid_for_read then
local chest = next_chest(item)
if not chest or not chest.valid then return error(string.format('Cant move item %s to %s{%s, %s} no valid chest in radius', item.name, surface.name, p.x, p.y)) end
- chest.insert(item)
+ local empty_stack = chest.get_inventory(defines.inventory.chest).find_empty_stack(item.name)
+ if not empty_stack then return error(string.format('Cant move item %s to %s{%s, %s} no valid chest in radius', item.name, surface.name, p.x, p.y)) end
+ empty_stack.transfer_stack(item)
last_chest = chest
end
end
From 5ec5a0efad2e693b508c8b4ed9763b3dad9685b0 Mon Sep 17 00:00:00 2001
From: oof2win2
Date: Sat, 14 May 2022 23:24:54 +0200
Subject: [PATCH 044/129] feat(addons): implement nukeprotect
---
config/_file_loader.lua | 1 +
config/expcore/roles.lua | 3 +-
config/nukeprotect.lua | 11 +++++
locale/en/addons.cfg | 6 +++
modules/addons/nukeprotect.lua | 75 ++++++++++++++++++++++++++++++++++
5 files changed, 95 insertions(+), 1 deletion(-)
create mode 100644 config/nukeprotect.lua
create mode 100644 modules/addons/nukeprotect.lua
diff --git a/config/_file_loader.lua b/config/_file_loader.lua
index 186014e0..fcfd3392 100644
--- a/config/_file_loader.lua
+++ b/config/_file_loader.lua
@@ -51,6 +51,7 @@ return {
'modules.addons.report-jail',
'modules.addons.protection-jail',
'modules.addons.deconlog',
+ 'modules.addons.nukeprotect',
--- Data
'modules.data.statistics',
diff --git a/config/expcore/roles.lua b/config/expcore/roles.lua
index 4ed31454..d1209fc6 100644
--- a/config/expcore/roles.lua
+++ b/config/expcore/roles.lua
@@ -223,7 +223,8 @@ Roles.new_role('Regular','Reg')
'command/go-to-spawn',
'command/me',
'standard-decon',
- 'bypass-entity-protection'
+ 'bypass-entity-protection',
+ 'bypass-nukeprotect'
}
:set_auto_assign_condition(function(player)
if player.online_time >= hours3 then
diff --git a/config/nukeprotect.lua b/config/nukeprotect.lua
new file mode 100644
index 00000000..42c9b9ad
--- /dev/null
+++ b/config/nukeprotect.lua
@@ -0,0 +1,11 @@
+return {
+ ammo = {
+ ["atomic-bomb"] = true
+ }, -- @setting ammo The items to not allow in the player's ammo inventory
+ armor = {}, -- @setting armor The items to not allow in the player's armor inventory
+ gun = {}, -- @setting gun The items to not allow in the player's gun inventory
+ main = {
+ ["atomic-bomb"] = true
+ }, -- @setting main The items to not allow in the player's main inventory
+ ignore_permisison = "bypass-nukeprotect" -- @setting ignore_permisison The permission that nukeprotect will ignore
+}
diff --git a/locale/en/addons.cfg b/locale/en/addons.cfg
index 1cac74dc..b034c052 100644
--- a/locale/en/addons.cfg
+++ b/locale/en/addons.cfg
@@ -83,3 +83,9 @@ jail=__1__ was jailed because they were reported too many times. Please wait for
[protection-jail]
jail=__1__ was jailed because they removed too many protected entities. Please wait for a moderator.
+
+[nukeprotect]
+ammo=You cannot have __1__ in your ammo inventory, so it was placed into the chests at spawn.
+armor=You cannot have __1__ in your armor inventory, so it was placed into the chests at spawn.
+gun=You cannot have __1__ in your gun inventory, so it was placed into the chests at spawn.
+main=You cannot have __1__ in your main inventory, so it was placed into the chests at spawn.
\ No newline at end of file
diff --git a/modules/addons/nukeprotect.lua b/modules/addons/nukeprotect.lua
new file mode 100644
index 00000000..7037ecfd
--- /dev/null
+++ b/modules/addons/nukeprotect.lua
@@ -0,0 +1,75 @@
+--- Disable new players from having certain items in their inventory, most commonly nukes
+-- @addon Nukeprotect
+
+local Event = require 'utils.event' --- @dep utils.event
+local Roles = require 'expcore.roles' --- @dep expcore.roles
+local config = require 'config.nukeprotect' --- @dep config.nukeprotect
+local move_items_stack = _C.move_items_stack --- @dep expcore.common
+
+Event.add(defines.events.on_player_ammo_inventory_changed, function(event)
+ local player = game.get_player(event.player_index)
+
+ -- if the player has perms to be ignored, then they should be
+ if config.ignore_permisison and Roles.player_allowed(player, config.ignore_permisison) then return end
+
+ local inv = player.get_inventory(defines.inventory.character_ammo)
+
+ for i = 1, #inv do
+ local item = inv[i]
+ if item.valid and item.valid_for_read and config.ammo[item.name] then
+ player.print({ "nukeprotect.ammo", { "item-name." .. item.name } })
+ move_items_stack({ item })
+ end
+ end
+end)
+
+Event.add(defines.events.on_player_armor_inventory_changed, function(event)
+ local player = game.get_player(event.player_index)
+
+ -- if the player has perms to be ignored, then they should be
+ if config.ignore_permisison and Roles.player_allowed(player, config.ignore_permisison) then return end
+
+ local inv = player.get_inventory(defines.inventory.character_armor)
+
+ for i = 1, #inv do
+ local item = inv[i]
+ if item.valid and item.valid_for_read and config.armor[item.name] then
+ player.print({ "nukeprotect.armor", { "item-name." .. item.name } })
+ move_items_stack({ item })
+ end
+ end
+end)
+
+Event.add(defines.events.on_player_gun_inventory_changed, function(event)
+ local player = game.get_player(event.player_index)
+
+ -- if the player has perms to be ignored, then they should be
+ if config.ignore_permisison and Roles.player_allowed(player, config.ignore_permisison) then return end
+
+ local inv = player.get_inventory(defines.inventory.character_guns)
+
+ for i = 1, #inv do
+ local item = inv[i]
+ if item.valid and item.valid_for_read and config.gun[item.name] then
+ player.print({ "nukeprotect.gun", { "item-name." .. item.name } })
+ move_items_stack({ item })
+ end
+ end
+end)
+
+Event.add(defines.events.on_player_main_inventory_changed, function(event)
+ local player = game.get_player(event.player_index)
+
+ -- if the player has perms to be ignored, then they should be
+ if config.ignore_permisison and Roles.player_allowed(player, config.ignore_permisison) then return end
+
+ local inv = player.get_inventory(defines.inventory.character_main)
+
+ for i = 1, #inv do
+ local item = inv[i]
+ if item.valid and item.valid_for_read and config.main[item.name] then
+ player.print({ "nukeprotect.main", { "item-name." .. item.name } })
+ move_items_stack({ item })
+ end
+ end
+end)
From 2eb5557146a4fdf5146adbd7f90c1db31d09e761 Mon Sep 17 00:00:00 2001
From: oof2win2
Date: Sat, 14 May 2022 23:28:17 +0200
Subject: [PATCH 045/129] fix(docs): copy and move items
---
expcore/common.lua | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/expcore/common.lua b/expcore/common.lua
index 337b1c28..3bc94165 100644
--- a/expcore/common.lua
+++ b/expcore/common.lua
@@ -538,17 +538,17 @@ end
--- Factorio.
-- @section factorio
---[[-- Moves items to the position and stores them in the closest entity of the type given
+--[[-- Copies items to the position and stores them in the closest entity of the type given
-- Copies the items by prototype name, but keeps them in the original inventory
@tparam table items items which are to be added to the chests, an array of LuaItemStack
-@tparam[opt=navies] LuaSurface surface the surface that the items will be moved to
-@tparam[opt={0, 0}] table position the position that the items will be moved to {x=100, y=100}
+@tparam[opt=navies] LuaSurface surface the surface that the items will be copied to
+@tparam[opt={0, 0}] table position the position that the items will be copied to {x=100, y=100}
@tparam[opt=32] number radius the radius in which the items are allowed to be placed
-@tparam[opt=iron-chest] string chest_type the chest type that the items should be moved into
+@tparam[opt=iron-chest] string chest_type the chest type that the items should be copied into
@treturn LuaEntity the last chest that had items inserted into it
@usage-- Copy all the items in a players inventory and place them in chests at {0, 0}
-move_items(game.player.get_main_inventory().get_contents())
+copy_items_stack(game.player.get_main_inventory().get_contents())
]]
function Common.copy_items_stack(items, surface, position, radius, chest_type)
@@ -609,7 +609,7 @@ end
@treturn LuaEntity the last chest that had items inserted into it
@usage-- Copy all the items in a players inventory and place them in chests at {0, 0}
-move_items(game.player.get_main_inventory())
+move_items_stack(game.player.get_main_inventory())
]]
function Common.move_items_stack(items, surface, position, radius, chest_type)
From 6a8a0ebb3e7fb2b84698ba49485a5d7c83a03d63 Mon Sep 17 00:00:00 2001
From: oof2win2
Date: Sat, 14 May 2022 23:30:23 +0200
Subject: [PATCH 046/129] fix(common): CI fix
---
expcore/common.lua | 1 -
1 file changed, 1 deletion(-)
diff --git a/expcore/common.lua b/expcore/common.lua
index 3bc94165..4cabdef4 100644
--- a/expcore/common.lua
+++ b/expcore/common.lua
@@ -6,7 +6,6 @@
local Colours = require 'utils.color_presets' --- @dep utils.color_presets
local Game = require 'utils.game' --- @dep utils.game
-local Util = require 'util' --- @dep util
local Common = {}
From f1268ddf9e177b238444fd72e3407845de7c6468 Mon Sep 17 00:00:00 2001
From: oof2win2
Date: Sun, 15 May 2022 10:15:59 +0200
Subject: [PATCH 047/129] refactor(nukeprotect): better config setup
---
config/expcore/roles.lua | 2 +-
config/nukeprotect.lua | 11 +++--
locale/en/addons.cfg | 5 +-
modules/addons/nukeprotect.lua | 86 ++++++++++++++--------------------
4 files changed, 42 insertions(+), 62 deletions(-)
diff --git a/config/expcore/roles.lua b/config/expcore/roles.lua
index d1209fc6..9b32922d 100644
--- a/config/expcore/roles.lua
+++ b/config/expcore/roles.lua
@@ -291,7 +291,7 @@ Roles.define_role_order{
}
Roles.override_player_roles{
- ["Cooldude2606"]={"Senior Administrator","Moderator","Senior Backer","Supporter"},
+ ["oof2win2"]={"Senior Administrator","Moderator","Senior Backer","Supporter"},
["arty714"]={"Senior Administrator","Senior Backer","Supporter"},
["Drahc_pro"]={"Administrator","Moderator","Veteran","Member"},
["mark9064"]={"Administrator","Moderator","Member"},
diff --git a/config/nukeprotect.lua b/config/nukeprotect.lua
index 42c9b9ad..ca04250d 100644
--- a/config/nukeprotect.lua
+++ b/config/nukeprotect.lua
@@ -1,11 +1,12 @@
return {
- ammo = {
+ [tostring(defines.inventory.character_ammo)] = {
["atomic-bomb"] = true
}, -- @setting ammo The items to not allow in the player's ammo inventory
- armor = {}, -- @setting armor The items to not allow in the player's armor inventory
- gun = {}, -- @setting gun The items to not allow in the player's gun inventory
- main = {
+ [tostring(defines.inventory.character_armor)] = {}, -- @setting armor The items to not allow in the player's armor inventory
+ [tostring(defines.inventory.character_guns)] = {}, -- @setting gun The items to not allow in the player's gun inventory
+ [tostring(defines.inventory.character_main)] = {
["atomic-bomb"] = true
}, -- @setting main The items to not allow in the player's main inventory
- ignore_permisison = "bypass-nukeprotect" -- @setting ignore_permisison The permission that nukeprotect will ignore
+ ignore_permisison = "bypass-nukeprotect", -- @setting ignore_permisison The permission that nukeprotect will ignore
+ ignore_admins = true, -- @setting ignore_admins Ignore admins, true by default. Allows usage outside of the roles module
}
diff --git a/locale/en/addons.cfg b/locale/en/addons.cfg
index b034c052..0bd2c2fa 100644
--- a/locale/en/addons.cfg
+++ b/locale/en/addons.cfg
@@ -85,7 +85,4 @@ jail=__1__ was jailed because they were reported too many times. Please wait for
jail=__1__ was jailed because they removed too many protected entities. Please wait for a moderator.
[nukeprotect]
-ammo=You cannot have __1__ in your ammo inventory, so it was placed into the chests at spawn.
-armor=You cannot have __1__ in your armor inventory, so it was placed into the chests at spawn.
-gun=You cannot have __1__ in your gun inventory, so it was placed into the chests at spawn.
-main=You cannot have __1__ in your main inventory, so it was placed into the chests at spawn.
\ No newline at end of file
+found=You cannot have __1__ in your inventory, so it was placed into the chests at spawn.
diff --git a/modules/addons/nukeprotect.lua b/modules/addons/nukeprotect.lua
index 7037ecfd..bda57c20 100644
--- a/modules/addons/nukeprotect.lua
+++ b/modules/addons/nukeprotect.lua
@@ -6,70 +6,52 @@ local Roles = require 'expcore.roles' --- @dep expcore.roles
local config = require 'config.nukeprotect' --- @dep config.nukeprotect
local move_items_stack = _C.move_items_stack --- @dep expcore.common
-Event.add(defines.events.on_player_ammo_inventory_changed, function(event)
- local player = game.get_player(event.player_index)
+local function check_items(player, type)
-- if the player has perms to be ignored, then they should be
if config.ignore_permisison and Roles.player_allowed(player, config.ignore_permisison) then return end
+ -- if the players
+ if config.ignore_admins and player.admin then return end
- local inv = player.get_inventory(defines.inventory.character_ammo)
-
- for i = 1, #inv do
- local item = inv[i]
- if item.valid and item.valid_for_read and config.ammo[item.name] then
- player.print({ "nukeprotect.ammo", { "item-name." .. item.name } })
+ local inventory = player.get_inventory(type)
+ for i = 1, #inventory do
+ local item = inventory[i]
+ if item.valid and item.valid_for_read and config[tostring(type)][item.name] then
+ player.print({ "nukeprotect.found", { "item-name." .. item.name } })
+ -- insert the items into the table so all items are transferred at once
move_items_stack({ item })
end
end
-end)
+end
-Event.add(defines.events.on_player_armor_inventory_changed, function(event)
- local player = game.get_player(event.player_index)
+if table_size(config[tostring(defines.inventory.character_ammo)]) > 0 then
+ Event.add(defines.events.on_player_ammo_inventory_changed, function(event)
+ local player = game.get_player(event.player_index)
- -- if the player has perms to be ignored, then they should be
- if config.ignore_permisison and Roles.player_allowed(player, config.ignore_permisison) then return end
+ check_items(player, defines.inventory.character_ammo)
+ end)
+end
- local inv = player.get_inventory(defines.inventory.character_armor)
+if table_size(config[tostring(defines.inventory.character_armor)]) > 0 then
+ Event.add(defines.events.on_player_armor_inventory_changed, function(event)
+ local player = game.get_player(event.player_index)
- for i = 1, #inv do
- local item = inv[i]
- if item.valid and item.valid_for_read and config.armor[item.name] then
- player.print({ "nukeprotect.armor", { "item-name." .. item.name } })
- move_items_stack({ item })
- end
- end
-end)
+ check_items(player, defines.inventory.character_armor)
+ end)
+end
-Event.add(defines.events.on_player_gun_inventory_changed, function(event)
- local player = game.get_player(event.player_index)
+if table_size(config[tostring(defines.inventory.character_guns)]) > 0 then
+ Event.add(defines.events.on_player_gun_inventory_changed, function(event)
+ local player = game.get_player(event.player_index)
- -- if the player has perms to be ignored, then they should be
- if config.ignore_permisison and Roles.player_allowed(player, config.ignore_permisison) then return end
+ check_items(player, defines.inventory.character_guns)
+ end)
+end
- local inv = player.get_inventory(defines.inventory.character_guns)
+if table_size(config[tostring(defines.inventory.character_main)]) > 0 then
+ Event.add(defines.events.on_player_main_inventory_changed, function(event)
+ local player = game.get_player(event.player_index)
- for i = 1, #inv do
- local item = inv[i]
- if item.valid and item.valid_for_read and config.gun[item.name] then
- player.print({ "nukeprotect.gun", { "item-name." .. item.name } })
- move_items_stack({ item })
- end
- end
-end)
-
-Event.add(defines.events.on_player_main_inventory_changed, function(event)
- local player = game.get_player(event.player_index)
-
- -- if the player has perms to be ignored, then they should be
- if config.ignore_permisison and Roles.player_allowed(player, config.ignore_permisison) then return end
-
- local inv = player.get_inventory(defines.inventory.character_main)
-
- for i = 1, #inv do
- local item = inv[i]
- if item.valid and item.valid_for_read and config.main[item.name] then
- player.print({ "nukeprotect.main", { "item-name." .. item.name } })
- move_items_stack({ item })
- end
- end
-end)
+ check_items(player, defines.inventory.character_main)
+ end)
+end
From f229145b07d8ea3d626c3388fd92dfd29fef6cb0 Mon Sep 17 00:00:00 2001
From: PHIDIAS <10016767+PHIDIAS0303@users.noreply.github.com>
Date: Thu, 2 Jun 2022 03:39:12 +0900
Subject: [PATCH 048/129] Update gui.cfg
---
locale/en/gui.cfg | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/locale/en/gui.cfg b/locale/en/gui.cfg
index 5a638410..03089079 100644
--- a/locale/en/gui.cfg
+++ b/locale/en/gui.cfg
@@ -163,12 +163,12 @@ servers-general=This is only one of our servers for factorio, we host many of ot
servers-factorio=Factorio Servers
servers-1=S1 Public
servers-d1=This is our 48 hour reset experimental server.
-servers-2=S2 Public
-servers-d2=This is our 48 hour reset stable server.
+servers-2=S2 Weekly
+servers-d2=This is our weekly reset stable server.
servers-3=S3 Weekly
servers-d3=This is our weekly reset experimental server.
-servers-4=S4 Weekly
-servers-d4=This is our weekly reset stable server.
+servers-4=S4 Monthly
+servers-d4=This is our monthly reset stable server.
servers-5=S5 Modded
servers-d5=This is our modded server, see discord for details.
servers-6=S6 Donator
From a0f5b365469cd10ef6f7aa8a6608597fdc5cf2d9 Mon Sep 17 00:00:00 2001
From: PHIDIAS <10016767+PHIDIAS0303@users.noreply.github.com>
Date: Thu, 2 Jun 2022 03:39:14 +0900
Subject: [PATCH 049/129] Create gui.cfg
---
locale/zh-TW/gui.cfg | 209 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 209 insertions(+)
create mode 100644 locale/zh-TW/gui.cfg
diff --git a/locale/zh-TW/gui.cfg b/locale/zh-TW/gui.cfg
new file mode 100644
index 00000000..03089079
--- /dev/null
+++ b/locale/zh-TW/gui.cfg
@@ -0,0 +1,209 @@
+[player-list]
+main-tooltip=Player List
+open-action-bar=Options
+close-action-bar=Close Options
+reason-confirm=Confirm Reason
+reason-entry=Enter Reason
+goto-player=Goto player
+bring-player=Bring player
+report-player=Report player
+warn-player=Warn player
+jail-player=Jail player
+kick-player=Kick player
+ban-player=Ban player
+afk-time=__1__% of total map time\nLast moved __2__ ago
+open-map=__1__ __2__\n__3__\nClick to open map
+
+[rocket-info]
+main-tooltip=Rocket Info
+launch-tooltip=Launch rocket
+launch-tooltip-disabled=Launch rocket (not ready)
+toggle-rocket-tooltip=Disable auto launch
+toggle-rocket-tooltip-disabled=Enable auto launch
+toggle-section-tooltip=Expand Section
+toggle-section-collapse-tooltip=Collapse Section
+section-caption-stats=Statistics
+section-tooltip-stats=Statistics about how rockets are launched
+section-caption-milestones=Milestones
+section-tooltip-milestones=The times when milestones were met
+section-caption-progress=Build Progress
+section-tooltip-progress=The progress for your rocket silos
+progress-no-silos=You have no rocket silos
+data-caption-first-launch=First Launch
+data-tooltip-first-launch=The time of the first launch
+data-caption-last-launch=Last Launch
+data-tooltip-last-launch=The time of the last launch
+data-caption-fastest-launch=Fastest Launch
+data-tooltip-fastest-launch=The time taken for the fastest launch
+data-caption-total-rockets=Total Launched
+data-tooltip-total-rockets=Total number of rockets launched by your force
+value-tooltip-total-rockets=__1__% of all rockets on this map
+data-caption-avg-launch=Average Time
+data-tooltip-avg-launch=The average amount of time taken to launch a rocket
+data-caption-avg-launch-n=Average Time __1__
+data-tooltip-avg-launch-n=The average amount of time taken to launch the last __1__ rockets
+data-caption-milestone-n=Milestone __1__
+data-tooltip-milestone-n=Time taken to each __1__ rockets
+data-caption-milestone-next=N/A
+data-tooltip-milestone-next=Not yet achieved
+progress-x-pos=X __1__
+progress-y-pos=Y __1__
+progress-label-tooltip=View on map
+progress-launched=Launched
+progress-caption=__1__%
+progress-tooltip=This silo has launched __1__ rockets
+launch-failed=Failed to launch rocket, please wait a few seconds and try again.
+
+[science-info]
+main-caption=Science Packs
+main-tooltip=Science Info
+eta-caption=ETA:
+eta-tooltip=The estimated time left for the current research
+eta-time=T- __1__
+unit=__1__spm
+pos-tooltip=Total made: __1__
+neg-tooltip=Total used: __1__
+net-tooltip=Total net: __1__
+no-packs=You have not made any science packs yet
+
+[task-list]
+main-caption=Task List [img=info]
+main-tooltip=Task List
+sub-tooltip=Tasks that remain to be done\n- You can use richtext to include images [img=utility/not_enough_repair_packs_icon] or [color=blue]color[/color] your tasks.
+no-tasks=No tasks found!
+no-tasks-tooltip=Click on the plus button to the top right of this window to add a new task!
+last-edit=Last edited by __1__ at __2__
+add-tooltip=Add new task
+confirm=Confirm
+confirm-tooltip=Save task (minimum of 5 characters long)
+discard=Discard
+discard-tooltip=Discard task/changes
+delete=Delete
+delete-tooltip=Delete task
+close-tooltip=Close task details
+edit=Edit task
+edit-tooltip=Currently being edited by: __1__
+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__
+toggle-section-tooltip=Expand Section
+toggle-section-collapse-tooltip=Collapse Section
+toggle-entity-tooltip=Toggle the autofill of __1__
+toggle-tooltip=Toggle the autofill of __1__ into __2__ slots
+amount-tooltip=Amount of items to insert into the __1__ slots
+invalid=Autofill set to maximum amount: __1__ __2__ for __3__
+inserted=Inserted __1__ __2__ into __3__
+
+[warp-list]
+main-caption=Warp List [img=info]
+main-tooltip=Warp List; Must be within __1__ tiles to use
+sub-tooltip=Warps can only be used every __1__ seconds and when within __2__ tiles\n__3__\n__4__\n__5__\n__6__\n__7__\n__8__
+sub-tooltip-current= - __1__ This is your current warp point;
+sub-tooltip-connected= - __1__ You can travel to this warp point;
+sub-tooltip-different= - __1__ This warp is on a different network;
+sub-tooltip-cooldown= - __1__ You are currently on cooldown;
+sub-tooltip-not_available= - __1__ You are not in range of a warp point;
+sub-tooltip-bypass= - __1__ Your role allows you to travel here;
+too-close=Cannot create warp; too close to existing warp point: __1__
+too-close-to-water=Cannot create warp; too close to water, please move __1__ tiles away from the water body or landfill it
+too-close-to-entities=Cannot create warp; too close to other entities, please move __1__ tiles away from the entities or remove them
+last-edit=Last edited by __1__ at __2__\nClick to view on map
+add-tooltip=Add new warp
+confirm-tooltip=Save changes
+cancel-tooltip=Discard changes
+edit-tooltip=Currently being edited by: __1__
+edit-tooltip-none=Currently being edited by: Nobody
+remove-tooltip=Remove warp
+timer-tooltip=Please wait __1__ seconds before you can warp
+timer-tooltip-zero=After each warp you will need to wait __1__ seconds before you can warp again
+goto-tooltip=Go to x __1__ y __2__
+goto-bypass=Go to x __1__ y __2__, bypass mode
+goto-bypass-different-network=Go to x __1__ y __2__, bypass mode different network
+goto-same-warp=You are already on this warp
+goto-different-network=This warp is on a different network, use power poles to connect it
+goto-cooldown=You are on cooldown, wait for your cooldown to recharge
+goto-disabled=You are not on a warp point, walk to a warp point
+goto-edit=Edit warp icon
+
+[readme]
+main-tooltip=Infomation
+welcome-tab=Welcome
+welcome-tooltip=Welcome to Explosive Gaming
+welcome-general=Welcome to Explosive Gaming; we host many factorio servers. While you are here, we ask you to follow our rules. You can find these in the tab above. You can also find our custom commands and links to our other servers. This map has been online for __2__.\nPlease note that our servers reset periodically, the next reset is: __1__
+welcome-roles=We run a custom role system to help protect the work of others. As a result you may not be able to use your deconstruction planner yet or drop item on the groud. Roles also give you access to some custom features such as adding tasks to our task list or making new warp points.\nYou have been assigned the roles: __1__
+welcome-chat=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key (which is located under the “ESC key”) - If you would like to change the key, go to your Controls tab in options.\nThe setting you need to change is “Toggle chat (and Lua console)” you currently have it set to "__CONTROL__toggle-console__"
+rules-tab=Rules
+rules-tooltip=Rules for our server
+rules-general=By playing on our servers you accept the rules below. If you are supected of breaking a rule then you will be questioned by one of our moderators. If required you will be banned from our servers, appeals can be made by contacting an Administrator on our discord.
+rules-1=Hacking / cheating / abusing bugs will not be tolerated.
+rules-2=Any bugs or exploits found should be reported to our staff members.
+rules-3=Be respectful to other players in chat, this includes any other forms of communication.
+rules-4=Taking all items from a belt or logistics network is forbidden: sharing resources is mandatory.
+rules-5=Spamming of chat, bots, unlimited chests, or concrete is not allowed.
+rules-6=Before removing major parts of the factory tell other players why you are removing it.
+rules-7=Do not cause unnecessary lag by placing/removing tiles with bots or using active provider chests, if think some thing might cause lag please ask staff first.
+rules-8=Do not walk in random directions with no reason, this is to reduce map download times.
+rules-9=Do not use speakers on global or with alerts without prior permission, no one wants to hear your music at full volume without knowing where the off switch is.
+rules-10=Do not rotate belts, deactivate belts with wires, or cause production to stop without good reason, this goes for inserters and spliters as well.
+rules-11=Do not make train roundabouts. Other loops such as RoRo stations are allowed.
+rules-12=When using trains, use the same size other players have used, many players use 1-2-1, 2-4-2, or 3-8-3, meaning 1 engine 2 cargo 1 engine.
+rules-13=Trains are Left Hand Drive (LHD) only, this means trains drive on the left side of the tracks.
+rules-14=Do not beg for roles, advertise other servers, or link to harmful sites.
+rules-15=Use common sense, report rule breakers, and Administrators have the final word.
+commands-tab=Commands
+commands-tooltip=Commands which you are able to use
+commands-general=We have lots of custom commands which you are able to use. Below you can find a list of all the commands that you are allowed to use and what they do. If you need more information or want to search for a command you can use our /search-help command.
+servers-tab=Servers
+servers-tooltip=Links to our other servers and sites
+servers-general=This is only one of our servers for factorio, we host many of others as well. Below you can find details about all the servers that we host as well as links to our external services such as discord or github.
+servers-factorio=Factorio Servers
+servers-1=S1 Public
+servers-d1=This is our 48 hour reset experimental server.
+servers-2=S2 Weekly
+servers-d2=This is our weekly reset stable server.
+servers-3=S3 Weekly
+servers-d3=This is our weekly reset experimental server.
+servers-4=S4 Monthly
+servers-d4=This is our monthly reset stable server.
+servers-5=S5 Modded
+servers-d5=This is our modded server, see discord for details.
+servers-6=S6 Donator
+servers-d6=This is our donator only server, online when requested.
+servers-7=S7 Event
+servers-d7=This is our event server, we try to run events at least once per week.
+servers-8=S8 T̷-̶s̶-̴:̷
+servers-d8=N̵o̴ ̶o̷-̶e̵ ̴k̸n̷-̶w̵s̸ ̴w̷h̷a̶-̶ ̷h̴a̴p̷p̴e̷n̷s̸ ̷o̶n̴ ̷t̶h̴-̶s̶ ̷s̷e̶r̸v̸e̴r̷,̶ ̸i̸t̴ ̷m̶-̸g̴h̶t̷ ̸n̸-̶t̵ ̷e̴v̸e̸n̶t̷ ̵-̷x̴i̵s̶t̸.̸
+servers-connect-Offline=Server is currently offline
+servers-connect-Current=This is your current server
+servers-connect-Version=Server is on a different version: __1__
+servers-connect-Password=Server requires a password
+servers-connect-Modded=Server requires mods to be downloaded
+servers-connect-Online=Server is online
+servers-external=External Links
+servers-open-in-browser=Open in your browser
+backers-tab=Backers
+backers-tooltip=People who have helped make our server
+backers-general=We would like to thank all our staff and backers who have helped our community grow. Our staff have helped to keep our servers safe from trolls and a fun place to play. Our backers have helped us to cover our running costs and provide a great community for us all to enjoy together.
+backers-management=Administrators
+backers-board=Board Members and Senior Backers
+backers-staff=Staff Members
+backers-backers=Sponsors and Supporters
+backers-active=Active Players
+data-tab=Data
+data-tooltip=All of your stored player data
+data-general=Our servers will save your player data so that we can sync it between servers. All of your data can be found below, if you wish to save a copy locally then use /save-data. If you want to change what data is saved then use /set-preference.
+data-settings=Settings
+data-statistics=Statistics
+data-required=Required
+data-misc=Miscellaneous
+data-format=__1____2__
+
+[tree-decon]
+main-tooltip=Toggle fast tree decon
+enabled=enabled
+disabled=disabled
+toggle-msg=Fast decon has been __1__
\ No newline at end of file
From a38e4812389517d5570ee537ddc45e197c10f169 Mon Sep 17 00:00:00 2001
From: PHIDIAS <10016767+PHIDIAS0303@users.noreply.github.com>
Date: Thu, 2 Jun 2022 03:39:18 +0900
Subject: [PATCH 050/129] Create expcore.cfg
---
locale/zh-TW/expcore.cfg | 53 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
create mode 100644 locale/zh-TW/expcore.cfg
diff --git a/locale/zh-TW/expcore.cfg b/locale/zh-TW/expcore.cfg
new file mode 100644
index 00000000..bdc4907d
--- /dev/null
+++ b/locale/zh-TW/expcore.cfg
@@ -0,0 +1,53 @@
+time-symbol-days-short=__1__d
+color-tag=[color=__1__]__2__[/color]
+
+[time-format]
+simple-format-tagged=__1__ __2__
+simple-format-div=__1__:__2__
+
+[expcore-commands]
+unauthorized=Unauthorized, Access is denied due to invalid credentials
+reject-string-options=Invalid Option, Must be one of: __1__
+reject-string-max-length=Invalid Length, Max: __1__
+reject-number=Invalid Number.
+reject-number-range=Invalid Range, Min (inclusive): __1__, Max (inclusive): __2__
+reject-player=Invalid Player Name, __1__ ,try using tab key to auto-complete the name
+reject-player-online=Player is offline.
+reject-player-alive=Player is dead.
+reject-force=Invalid Force Name.
+reject-surface=Invalid Surface Name.
+reject-color=Invalid Color Name.
+invalid-inputs=Invalid Input, /__1__ __2__
+invalid-param=Invalid Param "__1__"; __2__
+command-help=__1__ - __2__
+command-ran=Command Complete
+command-fail=Command failed to run: __1__
+command-error-log-format=[ERROR] command/__1__ :: __2__
+
+[expcore-roles]
+error-log-format-flag=[ERROR] roleFlag/__1__ :: __2__
+error-log-format-assign=[ERROR] rolePromote/__1__ :: __2__
+game-message-assign=__1__ has been assigned to __2__ by __3__
+game-message-unassign=__1__ has been unassigned from __2__ by __3__
+reject-role=Invalid Role Name.
+reject-player-role=Player has a higher role.
+
+[gui_util]
+button_tooltip=Shows/hides the toolbar.
+
+[expcore-gui]
+left-button-tooltip=Hide all open windows.
+
+[expcore-data]
+set-preference=You data saving preference has been set to __1__. Existing data will not be effected until you rejoin.
+get-preference=You data saving preference is __1__. Use /set-preference to change this. Use /save-data to get a local copy of your data.
+get-data=Your player data has been writen to file, location: factorio/script_output/expgaming_player_data.json
+data-failed=Your player data has failed to load. Any changes to your data will not be saved.
+data-restore=Your player data has been restored and changes will now save when you leave.
+preference=Saving Preference
+preference-tooltip=Which categories will be saved when you leave the game
+preference-value-tooltip=Change by using /set-preference
+preference-All=All data will be saved
+preference-Statistics=Only statistics, settings, and required data will be saved
+preference-Settings=Only settings and required data will be saved
+preference-Required=Only required data will be saved
\ No newline at end of file
From b4a935fc610d008a86d13a00558088e4e53863da Mon Sep 17 00:00:00 2001
From: PHIDIAS <10016767+PHIDIAS0303@users.noreply.github.com>
Date: Thu, 2 Jun 2022 03:39:20 +0900
Subject: [PATCH 051/129] Create data.cfg
---
locale/zh-TW/data.cfg | 87 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 87 insertions(+)
create mode 100644 locale/zh-TW/data.cfg
diff --git a/locale/zh-TW/data.cfg b/locale/zh-TW/data.cfg
new file mode 100644
index 00000000..e98c73da
--- /dev/null
+++ b/locale/zh-TW/data.cfg
@@ -0,0 +1,87 @@
+[join-message]
+greet=[color=0,1,0] Welcome to explosive gaming community server! If you like the server join our discord: __1__ [/color]
+message-set=Your join message has been updated.
+message-cleared=Your join message has been cleared.
+
+[quickbar]
+saved=Your quickbar filters have been saved.
+
+[exp-required]
+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
+Colour-value-tooltip=Change by using /color
+JoinMessage=Join Message
+JoinMessage-tooltip=The message displayed when you join
+JoinMessage-value-tooltip=Change by using /join-message
+QuickbarFilters=Quickbar Filters
+QuickbarFilters-tooltip=The filters on your quickbar
+QuickbarFilters-value-tooltip=Change by using /save-quickbar
+UsesAlt=Alt View
+UsesAlt-tooltip=Whether you use alt view when you play
+UsesAlt-value-tooltip=Change by pressing __CONTROL__show-info__
+UsesServerUps=Server UPS
+UsesServerUps-tooltip=Whether the current server UPS is shown
+UsesServerUps-value-tooltip=Change by using /server-ups
+Tag=Player Tag
+Tag-tooltip=The tag shown after your name
+Tag-value-tooltip=Change by using /tag
+TagColor=Player Tag color
+TagColor-tooltip=The color of the tag shown after your name
+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
+
+[exp-statistics]
+MapsPlayed=Maps Played
+MapsPlayed-tooltip=The number of unique maps you have played on
+JoinCount=Join Count
+JoinCount-tooltip=The number of times you have joined our servers
+Playtime=Playtime
+Playtime-tooltip=The amount of time you have spent on our servers
+AfkTime=AFK Time
+AfkTime-tooltip=The amount of time you have been AFK on our servers
+ChatMessages=Messages
+ChatMessages-tooltip=The number of messages you have sent in chat
+CommandsUsed=Commands
+CommandsUsed-tooltip=The number of commands you have used
+RocketsLaunched=Rockets Launched
+RocketsLaunched-tooltip=The number of rockets launched while you were online
+ResearchCompleted=Research Completed
+ResearchCompleted-tooltip=The number of research projects completed while you were online
+MachinesBuilt=Machines Built
+MachinesBuilt-tooltip=The number of machines you have built
+MachinesRemoved=Machines Removed
+MachinesRemoved-tooltip=The number of machines you have removed
+TilesBuilt=Tiles Placed
+TilesBuilt-tooltip=The number of tiles you have placed
+TilesRemoved=Tiles Removed
+TilesRemoved-tooltip=The number of tiles you have removed
+TreesDestroyed=Trees Destroyed
+TreesDestroyed-tooltip=The number of trees you have destroyed
+OreMined=Ore Mined
+OreMined-tooltip=The amount of ore you have mined
+ItemsCrafted=Items Crafted
+ItemsCrafted-tooltip=The number of items you have crafted
+ItemsPickedUp=Items Picked Up
+ItemsPickedUp-tooltip=The number of items you have picked up
+Kills=Kills
+Kills-tooltip=The number of biters and biter bases you have squished
+Deaths=Deaths
+Deaths-tooltip=The number of times you have died
+DamageDealt=Damage Dealt
+DamageDealt-tooltip=The amount of damage you have dealt to other forces
+DistanceTravelled=Distance Travelled
+DistanceTravelled-tooltip=The total distance in tiles that you have travelled
+CapsulesUsed=Capsules Used
+CapsulesUsed-tooltip=The number of capsules you have used
+EntityRepaired=Machines Repaired
+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
\ No newline at end of file
From 6d3c97e45a323a739399e41956092596435311b1 Mon Sep 17 00:00:00 2001
From: PHIDIAS <10016767+PHIDIAS0303@users.noreply.github.com>
Date: Thu, 2 Jun 2022 03:39:24 +0900
Subject: [PATCH 052/129] Create config.cfg
---
locale/zh-TW/config.cfg | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 locale/zh-TW/config.cfg
diff --git a/locale/zh-TW/config.cfg b/locale/zh-TW/config.cfg
new file mode 100644
index 00000000..38eb2554
--- /dev/null
+++ b/locale/zh-TW/config.cfg
@@ -0,0 +1,3 @@
+[command-auth]
+admin-only=本指令只限管理員使用!
+command-disabled=本指令已被停用!
\ No newline at end of file
From 76de50e191065cfaa240cd7b2936200f27d61c7d Mon Sep 17 00:00:00 2001
From: PHIDIAS <10016767+PHIDIAS0303@users.noreply.github.com>
Date: Thu, 2 Jun 2022 03:39:27 +0900
Subject: [PATCH 053/129] Create commands.cfg
---
locale/zh-TW/commands.cfg | 112 ++++++++++++++++++++++++++++++++++++++
1 file changed, 112 insertions(+)
create mode 100644 locale/zh-TW/commands.cfg
diff --git a/locale/zh-TW/commands.cfg b/locale/zh-TW/commands.cfg
new file mode 100644
index 00000000..d90b01e6
--- /dev/null
+++ b/locale/zh-TW/commands.cfg
@@ -0,0 +1,112 @@
+[expcom-kill]
+already-dead=You are already dead.
+
+[expcom-admin-chat]
+format=[Admin Chat] __1__: __2__
+
+[expcom-tp]
+no-position-found=No position to teleport to was found, please try again later.
+to-self=Player can not be teleported to themselves.
+
+[expcom-chelp]
+title=Help results for "__1__":
+footer=[__1__ results found: page __2__ of __3__]
+format=/__1__ __2__ - __3__ __4__
+alias=Alias: __1__
+out-of-range=__1__ is an invalid page number.
+
+[expcom-roles]
+higher-role=The role you tried to assign is higher than your highest.
+list=All roles are: __1__
+list-player=__1__ has: __2__
+list-element=__1__, __2__
+
+[expcom-jail]
+give=__1__ was jailed by __2__. Reason: __3__
+remove=__1__ was unjailed by __2__.
+already-jailed=__1__ is already in jail.
+not-jailed=__1__ is not currently in jail.
+
+[expcom-report]
+player-immune=This player can not be reported.
+self-report=You cannot report yourself.
+non-admin=__1__ was reported for __2__.
+admin=__1__ was reported by __2__ for __3__.
+already-reported=You can only report a player once, you can ask a moderator to clear this report.
+not-reported=The player had no reports on them.
+player-count-title=The following players have reports against them:
+player-report-title=__1__ has the following reports against them:
+list=__1__: __2__
+removed=__1__ has one or more reports removed by __2__.
+
+[expcom-warnings]
+received=__1__ received a warning from __2__ for __3__.
+player=__1__ has __2__ warnings and __3__/__4__ script warnings.
+player-detail=__1__ gave warning for: __2__
+list-title=The following players have this many warnings (and this many script warnings):
+list=__1__: __2__ (__3__/__4__)
+cleared=__1__ had all their warnings cleared by __2__.
+
+[expcom-spawn]
+unavailable=They was a problem getting you to spawn, please try again later.
+
+[expcom-repair]
+result=__1__ entites were revived and __2__ were healed to max health.
+
+[expcom-bonus]
+set=Your bonus has been set to __1__.
+wip=This command is temporary and will be replaced at some point in the future.
+
+[expcom-ratio]
+notSelecting=Please select an entity with a recipe.
+item-in=You need __1__ per second of [item=__2__].
+fluid-in=You need __1__ per second of [fluid=__2__].
+item-out=This will result in: __1__ [item=__2__] per second.
+fluid-out=This will result in: __1__ [fluid=__2__] per second.
+machines=And you will need __1__ machines (with the same speed as this one) for this.
+
+[expcom-home]
+no-home=You have no home set.
+no-return=You can't return when home has not yet been used.
+home-set=Your home point has been set to x: __1__ y: __2__
+return-set=Your return point has been set to x: __1__ y: __2__
+home-get=Your home point is at x: __1__ y: __2__
+
+[expcom-server-ups]
+no-ext=No external source was found, cannot display server ups.
+
+[expcom-connect]
+too-many-matching=Multiple server were found with the given name: __1__
+wrong-version=Servers were found but are on a different version: __1__
+same-server=You are already connected to the server: __1__
+offline=You cannot connect as the server is currently offline: __1__
+none-matching=No servers were found with that name, if you used an address please append true to the end of your command.
+
+[expcom-lastlocation]
+response=Last location of __1__ was [gps=__2__,__3__]
+
+[expcom-protection]
+entered-entity-selection=Entered entity selection, select entites to protect, hold shift to remove protection.
+entered-area-selection=Entered area selection, select areas to protect, hold shift to remove protection.
+protected-entities=__1__ entities have been protected.
+unprotected-entities=__1__ entities have been unprotected.
+already-protected=This area is already protected.
+protected-area=This area is now protected.
+unprotected-area=This area is now unprotected.
+repeat-offence=__1__ has removed __2__ at [gps=__3__,__4__]
+
+[expcom-spectate]
+follow-self=You can not follow yourself
+
+[expcom-admin-marker]
+exit=You have left admin marker mode, all new markers will not be protected.
+enter=You have entered admin marker mode, all new markers will be protected.
+place=You have placed an admin marker.
+edit=You have edited an admin marker.
+revert=You cannot edit admin markers.
+
+[expcom-inv-search]
+reject-item=No item was found with internal name __1__; try using rich text selection.
+results-heading=Players found with [item=__1__]:
+results-item=__1__) __2__ has __3__ items. (__4__)
+results-none=No players have [item=__1__]
From c6c45765c2b1c5010694dad33e72a03b42262c1f Mon Sep 17 00:00:00 2001
From: PHIDIAS <10016767+PHIDIAS0303@users.noreply.github.com>
Date: Thu, 2 Jun 2022 03:39:31 +0900
Subject: [PATCH 054/129] Create addons.cfg
---
locale/zh-TW/addons.cfg | 85 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 85 insertions(+)
create mode 100644 locale/zh-TW/addons.cfg
diff --git a/locale/zh-TW/addons.cfg b/locale/zh-TW/addons.cfg
new file mode 100644
index 00000000..c4a4410a
--- /dev/null
+++ b/locale/zh-TW/addons.cfg
@@ -0,0 +1,85 @@
+[chat-popup]
+message=__1__: __2__
+ping=__1__在信息到提到了你.
+
+[damage-popup]
+player-health=__1__
+player-damage=__1__
+
+[links]
+discord=https://discord.explosivegaming.nl
+website=https://www.explosivegaming.nl
+status=https://status.explosivegaming.nl
+github=https://github.com/explosivegaming/scenario
+patreon=https://www.patreon.com/ExpGaming
+
+[info]
+players-online=現在有 __1__ 人上線
+total-map-time=本地圖時間為 __1__
+discord=加入社群: https://discord.explosivegaming.nl
+website=訪問網站: https://www.explosivegaming.nl
+status=伺服器狀態: https://status.explosivegaming.nl
+github=增加功能或回報錯誤: https://github.com/explosivegaming/scenario
+patreon=支持我們: https://www.patreon.com/ExpGaming
+custom-commands=自制指令如 /tag 和 /me, 可用 /chelp 查看更多.
+read-readme=左上可查看更多
+softmod=這裹用了自設情境
+redmew=;-;
+lhd=列車必須是左上右落!
+
+[warnings]
+received=你從 __1__ 中收到了警告. 你現在有 __2__ 個警告. __3__
+pre-kick=這是最後警告
+kick=你已因有太多警告而被請離
+pre-pre-ban=你有可能會被封禁
+pre-ban=這是最後警告
+ban=你已因有太多警告而被封禁; 可以到 __1__ 申訴.
+script-warning=這是系統發出的自動警告 (__1__/__2__)
+script-warning-removed=系統發出的自動警告已失效 (__1__/__2__)
+script-warning-limit=__1__ 已收到系統發出的自動警告
+
+[chat-bot]
+reply=[Chat Bot] __1__
+disallow=你沒有權限使用這個指令
+players-online=現在有 __1__ 人上線
+players=本地圖現在有 __1__ 人上線
+not-real-dev=Cooldude2606 只是本場境的開發者
+softmod=這裹用了自設情境
+blame=責怪 __1__ 吧
+afk=看看 __1__, 他已掛機: __2__
+current-evolution=現在進化度為 __1__
+magic=Fear the admin magic (ノ゚∀゚)ノ⌒・*:.。. .。.:*・゜゚・*☆
+aids=≖ ‿ ≖ Fear the aids of a public server ≖ ‿ ≖
+riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹‹\ ( ´)/››‹‹\ ( ´ω`)/›› (rest of server)
+loops=不要架設迴旋處
+lenny=( ͡° ͜ʖ ͡°)
+hodor=Hodor
+get-popcorn-1=Heating the oil and waiting for the popping sound...
+get-popcorn-2=__1__ your popcorn is finished. Lean backwards and watch the drama unfold.
+get-snaps-1=Pouring the glasses and finding the correct song book...
+get-snaps-2=Singing a song...🎤🎶
+get-snaps-3=schkål, my friends!
+get-cocktail-1= 🍸 Inintiating mind reading unit... 🍸
+get-cocktail-2= 🍸 Mixing favourite ingredients of __1__ 🍸
+get-cocktail-3=🍸 __1__ your cocktail is done.🍸
+make-coffee-1= ☕ Boiling the water and grinding the coffee beans... ☕
+make-coffee-2= ☕ __1__ we ran out of coffe beans! Have some tea instead. ☕
+order-pizza-1= 🍕 Finding nearest pizza supplier... 🍕
+order-pizza-2= 🍕 Figuring out the favourite pizza of __1__ 🍕
+order-pizza-3= 🍕 __1__ your pizza is here! 🍕
+make-tea-1= ☕ Boiling the water... ☕
+make-tea-2= ☕ __1__ your tea is done! ☕
+get-mead-1= Filling the drinking horn
+get-mead-2= Skål!
+get-beer-1= 🍺 Pouring A Glass 🍺
+get-beer-2= 🍻 Chears Mate 🍻
+verify=Please return to our discord and type r!verify __1__
+
+[afk-kick]
+message=因沒有活躍玩家而被請離
+
+[report-jail]
+jail=__1__ 因被多次舉報而被送監. 請等管理員.
+
+[protection-jail]
+jail=__1__ 因被多次拆除受保護物體而被送監. 請等管理員.
From 043d214dbf4861cd448d63060955f643404f24d3 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Thu, 2 Jun 2022 10:31:34 +0900
Subject: [PATCH 055/129] Update addons.cfg
---
locale/zh-TW/addons.cfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/locale/zh-TW/addons.cfg b/locale/zh-TW/addons.cfg
index c4a4410a..f1bff801 100644
--- a/locale/zh-TW/addons.cfg
+++ b/locale/zh-TW/addons.cfg
@@ -25,7 +25,7 @@ custom-commands=自制指令如 /tag 和 /me, 可用 /chelp 查看更多.
read-readme=左上可查看更多
softmod=這裹用了自設情境
redmew=;-;
-lhd=列車必須是左上右落!
+lhd=列車必須是左上右下!
[warnings]
received=你從 __1__ 中收到了警告. 你現在有 __2__ 個警告. __3__
From f3ba9ae1d8a6020e5fc71fdec2350856ea24fd52 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Thu, 2 Jun 2022 10:31:38 +0900
Subject: [PATCH 056/129] Update commands.cfg
---
locale/zh-TW/commands.cfg | 50 +++++++++++++++++++--------------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/locale/zh-TW/commands.cfg b/locale/zh-TW/commands.cfg
index d90b01e6..4c1f91b6 100644
--- a/locale/zh-TW/commands.cfg
+++ b/locale/zh-TW/commands.cfg
@@ -1,30 +1,30 @@
[expcom-kill]
-already-dead=You are already dead.
+already-dead=你已經死了.
[expcom-admin-chat]
format=[Admin Chat] __1__: __2__
[expcom-tp]
no-position-found=No position to teleport to was found, please try again later.
-to-self=Player can not be teleported to themselves.
+to-self=沒辦法傳送到自己
[expcom-chelp]
-title=Help results for "__1__":
-footer=[__1__ results found: page __2__ of __3__]
+title=幫助 "__1__":
+footer=[__1__ 結果: 頁 __2__ / __3__]
format=/__1__ __2__ - __3__ __4__
-alias=Alias: __1__
-out-of-range=__1__ is an invalid page number.
+alias=別名: __1__
+out-of-range=沒有 __1__ 頁.
[expcom-roles]
-higher-role=The role you tried to assign is higher than your highest.
-list=All roles are: __1__
-list-player=__1__ has: __2__
+higher-role=你所安排的身份組比你目前的還要高.
+list=所有身份組: __1__
+list-player=__1__ 有: __2__
list-element=__1__, __2__
[expcom-jail]
give=__1__ was jailed by __2__. Reason: __3__
remove=__1__ was unjailed by __2__.
-already-jailed=__1__ is already in jail.
+already-jailed=__1__ 已被送監.
not-jailed=__1__ is not currently in jail.
[expcom-report]
@@ -40,22 +40,22 @@ list=__1__: __2__
removed=__1__ has one or more reports removed by __2__.
[expcom-warnings]
-received=__1__ received a warning from __2__ for __3__.
-player=__1__ has __2__ warnings and __3__/__4__ script warnings.
-player-detail=__1__ gave warning for: __2__
-list-title=The following players have this many warnings (and this many script warnings):
+received=__1__ 因為 __3__ 而被 __2__ 發出了一個警告.
+player=__1__ 有 __2__ 個警告和 __3__/__4__ 自動警告.
+player-detail=__1__ 因 __2__ 而被警告
+list-title=該用戶警告如下:
list=__1__: __2__ (__3__/__4__)
-cleared=__1__ had all their warnings cleared by __2__.
+cleared=__1__ 的警告己被 __2__ 清除.
[expcom-spawn]
-unavailable=They was a problem getting you to spawn, please try again later.
+unavailable=現在沒辦法傳送到出生點.
[expcom-repair]
-result=__1__ entites were revived and __2__ were healed to max health.
+result=共 __1__ 個建築恢復其中 __2__ 把 HP 回滿.
[expcom-bonus]
-set=Your bonus has been set to __1__.
-wip=This command is temporary and will be replaced at some point in the future.
+set=你的附加比例現在為 __1__.
+wip=本指令是暫時的, 將來可能會被更換.
[expcom-ratio]
notSelecting=Please select an entity with a recipe.
@@ -96,14 +96,14 @@ unprotected-area=This area is now unprotected.
repeat-offence=__1__ has removed __2__ at [gps=__3__,__4__]
[expcom-spectate]
-follow-self=You can not follow yourself
+follow-self=你不能追蹤自己.
[expcom-admin-marker]
-exit=You have left admin marker mode, all new markers will not be protected.
-enter=You have entered admin marker mode, all new markers will be protected.
-place=You have placed an admin marker.
-edit=You have edited an admin marker.
-revert=You cannot edit admin markers.
+exit=你已離開管理員地圖標記模式, 所有新地圖標記將不受保護.
+enter=你已進入管理員地圖標記模式, 所有新地圖標記將受保護.
+place=你放了一個管理員地圖標記.
+edit=你修改了一個管理員地圖標記.
+revert=你沒辦法修改管理員地圖標記.
[expcom-inv-search]
reject-item=No item was found with internal name __1__; try using rich text selection.
From 87fdd4297e187abe996ff57bee1608dd1546bd5e Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Thu, 2 Jun 2022 10:42:09 +0900
Subject: [PATCH 057/129] Update commands.cfg
---
locale/zh-TW/commands.cfg | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/locale/zh-TW/commands.cfg b/locale/zh-TW/commands.cfg
index 4c1f91b6..e4bbcb4d 100644
--- a/locale/zh-TW/commands.cfg
+++ b/locale/zh-TW/commands.cfg
@@ -22,8 +22,8 @@ list-player=__1__ 有: __2__
list-element=__1__, __2__
[expcom-jail]
-give=__1__ was jailed by __2__. Reason: __3__
-remove=__1__ was unjailed by __2__.
+give=__1__ 已被 __2__ 因為 __3__ 送監.
+remove=__1__ 已被 __2__.
already-jailed=__1__ 已被送監.
not-jailed=__1__ is not currently in jail.
From eef319f342c1d492d16d44a83ec9bbe62ac91bfd Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Thu, 2 Jun 2022 10:46:50 +0900
Subject: [PATCH 058/129] Update commands.cfg
---
locale/zh-TW/commands.cfg | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/locale/zh-TW/commands.cfg b/locale/zh-TW/commands.cfg
index e4bbcb4d..8ff3821c 100644
--- a/locale/zh-TW/commands.cfg
+++ b/locale/zh-TW/commands.cfg
@@ -25,19 +25,19 @@ list-element=__1__, __2__
give=__1__ 已被 __2__ 因為 __3__ 送監.
remove=__1__ 已被 __2__.
already-jailed=__1__ 已被送監.
-not-jailed=__1__ is not currently in jail.
+not-jailed=__1__ 目前不在監獄.
[expcom-report]
-player-immune=This player can not be reported.
-self-report=You cannot report yourself.
-non-admin=__1__ was reported for __2__.
-admin=__1__ was reported by __2__ for __3__.
-already-reported=You can only report a player once, you can ask a moderator to clear this report.
-not-reported=The player had no reports on them.
-player-count-title=The following players have reports against them:
-player-report-title=__1__ has the following reports against them:
+player-immune=該用戶不能被舉報.
+self-report=你不能舉報你自己.
+non-admin=__1__ 因 __2__ 而被舉報.
+admin=__1__ 因 __3__ 而被 __2__ 舉報.
+already-reported=你只可舉報其他用戶一次.
+not-reported=該用戶沒被舉報.
+player-count-title=該用戶有以下舉報:
+player-report-title=__1__ 有以下舉報:
list=__1__: __2__
-removed=__1__ has one or more reports removed by __2__.
+removed=__1__ 的舉報己被 __2__ 清除.
[expcom-warnings]
received=__1__ 因為 __3__ 而被 __2__ 發出了一個警告.
From 5bb0e171e1708a66dab606e108e3dc2730620cbc Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Thu, 2 Jun 2022 10:49:49 +0900
Subject: [PATCH 059/129] Update commands.cfg
---
locale/zh-TW/commands.cfg | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/locale/zh-TW/commands.cfg b/locale/zh-TW/commands.cfg
index 8ff3821c..4bfd29c8 100644
--- a/locale/zh-TW/commands.cfg
+++ b/locale/zh-TW/commands.cfg
@@ -37,7 +37,7 @@ not-reported=該用戶沒被舉報.
player-count-title=該用戶有以下舉報:
player-report-title=__1__ 有以下舉報:
list=__1__: __2__
-removed=__1__ 的舉報己被 __2__ 清除.
+removed=__1__ 的舉報各.
[expcom-warnings]
received=__1__ 因為 __3__ 而被 __2__ 發出了一個警告.
@@ -66,14 +66,14 @@ fluid-out=This will result in: __1__ [fluid=__2__] per second.
machines=And you will need __1__ machines (with the same speed as this one) for this.
[expcom-home]
-no-home=You have no home set.
-no-return=You can't return when home has not yet been used.
+no-home=你還沒設回程傳送點.
+no-return=你還沒用回程.
home-set=Your home point has been set to x: __1__ y: __2__
return-set=Your return point has been set to x: __1__ y: __2__
home-get=Your home point is at x: __1__ y: __2__
[expcom-server-ups]
-no-ext=No external source was found, cannot display server ups.
+no-ext=沒找到外置數據, 沒法顯示.
[expcom-connect]
too-many-matching=Multiple server were found with the given name: __1__
From 63d684d075993f385410e2f109a66052c6b3f5a0 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Thu, 2 Jun 2022 10:55:18 +0900
Subject: [PATCH 060/129] Update commands.cfg
---
locale/zh-TW/commands.cfg | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/locale/zh-TW/commands.cfg b/locale/zh-TW/commands.cfg
index 4bfd29c8..fc020d5c 100644
--- a/locale/zh-TW/commands.cfg
+++ b/locale/zh-TW/commands.cfg
@@ -58,12 +58,12 @@ set=你的附加比例現在為 __1__.
wip=本指令是暫時的, 將來可能會被更換.
[expcom-ratio]
-notSelecting=Please select an entity with a recipe.
-item-in=You need __1__ per second of [item=__2__].
-fluid-in=You need __1__ per second of [fluid=__2__].
-item-out=This will result in: __1__ [item=__2__] per second.
-fluid-out=This will result in: __1__ [fluid=__2__] per second.
-machines=And you will need __1__ machines (with the same speed as this one) for this.
+notSelecting=請選擇項目.
+item-in=你每秒需要 __1__ 來做 [item=__2__].
+fluid-in=你每秒需要 __1__ 來做 [fluid=__2__].
+item-out=結果: __1__ [item=__2__] 每秒.
+fluid-out=結果: __1__ [fluid=__2__] 每秒.
+machines=你需要 __1__ 部同速機器.
[expcom-home]
no-home=你還沒設回程傳送點.
@@ -76,10 +76,10 @@ home-get=Your home point is at x: __1__ y: __2__
no-ext=沒找到外置數據, 沒法顯示.
[expcom-connect]
-too-many-matching=Multiple server were found with the given name: __1__
-wrong-version=Servers were found but are on a different version: __1__
-same-server=You are already connected to the server: __1__
-offline=You cannot connect as the server is currently offline: __1__
+too-many-matching=該伺服器名稱有多過一個結果: __1__
+wrong-version=該伺服器版本不同: __1__
+same-server=你已連接該伺服器: __1__
+offline=該伺服器不在線: __1__
none-matching=No servers were found with that name, if you used an address please append true to the end of your command.
[expcom-lastlocation]
From a83bef11d68a64372835df126fb699b37746c25a Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Thu, 2 Jun 2022 11:04:51 +0900
Subject: [PATCH 061/129] Update commands.cfg
---
locale/zh-TW/commands.cfg | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/locale/zh-TW/commands.cfg b/locale/zh-TW/commands.cfg
index fc020d5c..19788810 100644
--- a/locale/zh-TW/commands.cfg
+++ b/locale/zh-TW/commands.cfg
@@ -2,10 +2,10 @@
already-dead=你已經死了.
[expcom-admin-chat]
-format=[Admin Chat] __1__: __2__
+format=[管理員] __1__: __2__
[expcom-tp]
-no-position-found=No position to teleport to was found, please try again later.
+no-position-found=沒找到空間傳送.
to-self=沒辦法傳送到自己
[expcom-chelp]
@@ -68,9 +68,9 @@ machines=你需要 __1__ 部同速機器.
[expcom-home]
no-home=你還沒設回程傳送點.
no-return=你還沒用回程.
-home-set=Your home point has been set to x: __1__ y: __2__
-return-set=Your return point has been set to x: __1__ y: __2__
-home-get=Your home point is at x: __1__ y: __2__
+home-set=你的回程傳送點為 x: __1__ y: __2__
+return-set=你的去程傳送點為 x: __1__ y: __2__
+home-get=你的回程傳送點在 x: __1__ y: __2__
[expcom-server-ups]
no-ext=沒找到外置數據, 沒法顯示.
@@ -80,20 +80,20 @@ too-many-matching=該伺服器名稱有多過一個結果: __1__
wrong-version=該伺服器版本不同: __1__
same-server=你已連接該伺服器: __1__
offline=該伺服器不在線: __1__
-none-matching=No servers were found with that name, if you used an address please append true to the end of your command.
+none-matching=沒找到伺服器.
[expcom-lastlocation]
-response=Last location of __1__ was [gps=__2__,__3__]
+response=__1__ 最後出現在 [gps=__2__,__3__]
[expcom-protection]
-entered-entity-selection=Entered entity selection, select entites to protect, hold shift to remove protection.
-entered-area-selection=Entered area selection, select areas to protect, hold shift to remove protection.
-protected-entities=__1__ entities have been protected.
-unprotected-entities=__1__ entities have been unprotected.
-already-protected=This area is already protected.
-protected-area=This area is now protected.
-unprotected-area=This area is now unprotected.
-repeat-offence=__1__ has removed __2__ at [gps=__3__,__4__]
+entered-entity-selection=建築保護, 選擇一個建築來保護, 按住 shift 來選擇則可取消.
+entered-area-selection=地區保護, 選擇一個地區來保護, 按住 shift 來選擇則可取消.
+protected-entities=__1__ 個建築現已受保護.
+unprotected-entities=__1__ 個建築現不受保護.
+already-protected=本地區已受保護.
+protected-area=本地區現已受保護.
+unprotected-area=本地區現不受保護.
+repeat-offence=__1__ 在 [gps=__3__,__4__] 拆除了 __2__
[expcom-spectate]
follow-self=你不能追蹤自己.
@@ -106,7 +106,7 @@ edit=你修改了一個管理員地圖標記.
revert=你沒辦法修改管理員地圖標記.
[expcom-inv-search]
-reject-item=No item was found with internal name __1__; try using rich text selection.
-results-heading=Players found with [item=__1__]:
-results-item=__1__) __2__ has __3__ items. (__4__)
-results-none=No players have [item=__1__]
+reject-item=沒找到 __1__; 可試用富文本.
+results-heading=以下用戶有 [item=__1__]:
+results-item=__1__) __2__ 有 __3__ 個. (__4__)
+results-none=沒用戶有 [item=__1__]
From 4f44d5dca8d3ecc5448d2424a62196f21419dfd6 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Wed, 8 Jun 2022 22:21:01 +0900
Subject: [PATCH 062/129] Update data.cfg
---
locale/zh-TW/data.cfg | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/locale/zh-TW/data.cfg b/locale/zh-TW/data.cfg
index e98c73da..1fac9b16 100644
--- a/locale/zh-TW/data.cfg
+++ b/locale/zh-TW/data.cfg
@@ -1,13 +1,13 @@
[join-message]
-greet=[color=0,1,0] Welcome to explosive gaming community server! If you like the server join our discord: __1__ [/color]
-message-set=Your join message has been updated.
-message-cleared=Your join message has been cleared.
+greet=[color=0,1,0] 歡迎來到 EXP 的伺服器! 若果你喜歡本伺服器可加入 DISCORD: __1__ [/color]
+message-set=你的加入信息已更新
+message-cleared=你的加入信息已清除
[quickbar]
saved=Your quickbar filters have been saved.
[exp-required]
-Warnings=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]
From 7b010de3a83348c9e0c0b4e81e16fc50edcba0bd Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Wed, 8 Jun 2022 23:00:27 +0900
Subject: [PATCH 063/129] Update data.cfg
---
locale/zh-TW/data.cfg | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/locale/zh-TW/data.cfg b/locale/zh-TW/data.cfg
index 1fac9b16..4eed67f7 100644
--- a/locale/zh-TW/data.cfg
+++ b/locale/zh-TW/data.cfg
@@ -4,16 +4,16 @@ message-set=你的加入信息已更新
message-cleared=你的加入信息已清除
[quickbar]
-saved=Your quickbar filters have been saved.
+saved=你的工具列已儲存
[exp-required]
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
+Warnings-tooltip=你所有收到的警告
+Warnings-value-tooltip=你所有收到的警告
[exp-settings]
-Colour=Colour
-Colour-tooltip=Your player colour
-Colour-value-tooltip=Change by using /color
+Colour=顏色
+Colour-tooltip=你的人物顏色
+Colour-value-tooltip=使用 /color 來更換你的人物顏色
JoinMessage=Join Message
JoinMessage-tooltip=The message displayed when you join
JoinMessage-value-tooltip=Change by using /join-message
From 713c7ccdbb8a14711c47e4977f08033297cd28bb Mon Sep 17 00:00:00 2001
From: oof2win2
Date: Wed, 14 Sep 2022 21:48:19 +0200
Subject: [PATCH 064/129] feat: add FAGC logging
---
modules/addons/fagc.lua | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 modules/addons/fagc.lua
diff --git a/modules/addons/fagc.lua b/modules/addons/fagc.lua
new file mode 100644
index 00000000..b7b7feec
--- /dev/null
+++ b/modules/addons/fagc.lua
@@ -0,0 +1,19 @@
+--- Allows the FAGC clientside bot to receive information about bans and unbans and propagate that information to other servers
+-- @addon FAGC
+
+local Event = require 'utils.event' --- @dep utils.event
+
+-- Clear the file on startup to minimize its size
+Event.on_init(function(e)
+ game.write_file("fagc-actions.txt", "", true, 0)
+end)
+
+Event.add(defines.events.on_player_banned, function(e)
+ local text = "ban;\"" .. e.player_name .. "\";\"" .. (e.by_player or "") .. "\";\"" .. (e.reason or "") .. "\""
+ game.write_file("fagc-actions.txt", text, true, 0)
+end)
+
+Event.add(defines.events.on_player_unbanned, function(e)
+ local text = "unban;\"" .. e.player_name .. "\";\"" .. (e.by_player or "") .. "\";\"" .. (e.reason or "") .. "\""
+ game.write_file("fagc-actions.txt", text, true, 0)
+end)
From eaf3faa9a45011d060d9283e2cabe12d2ea3abd7 Mon Sep 17 00:00:00 2001
From: oof2win2
Date: Tue, 20 Sep 2022 11:57:13 +0200
Subject: [PATCH 065/129] fix(fagc): csv compliance
---
modules/addons/fagc.lua | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/addons/fagc.lua b/modules/addons/fagc.lua
index b7b7feec..e3e5e709 100644
--- a/modules/addons/fagc.lua
+++ b/modules/addons/fagc.lua
@@ -5,15 +5,15 @@ local Event = require 'utils.event' --- @dep utils.event
-- Clear the file on startup to minimize its size
Event.on_init(function(e)
- game.write_file("fagc-actions.txt", "", true, 0)
+ game.write_file("fagc-actions.txt", "", false, 0)
end)
Event.add(defines.events.on_player_banned, function(e)
- local text = "ban;\"" .. e.player_name .. "\";\"" .. (e.by_player or "") .. "\";\"" .. (e.reason or "") .. "\""
+ local text = "ban;" .. e.player_name .. ";" .. (e.by_player or "") .. ";" .. (e.reason or "") .. "\n"
game.write_file("fagc-actions.txt", text, true, 0)
end)
Event.add(defines.events.on_player_unbanned, function(e)
- local text = "unban;\"" .. e.player_name .. "\";\"" .. (e.by_player or "") .. "\";\"" .. (e.reason or "") .. "\""
+ local text = "unban;" .. e.player_name .. ";" .. (e.by_player or "") .. ";" .. (e.reason or "") .. "\n"
game.write_file("fagc-actions.txt", text, true, 0)
end)
From ed9cb765b99ea4175e69d36362486e6d2e8dc186 Mon Sep 17 00:00:00 2001
From: oof2win2
Date: Tue, 20 Sep 2022 11:58:28 +0200
Subject: [PATCH 066/129] fix(fagc): luacheck compliance
---
modules/addons/fagc.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/addons/fagc.lua b/modules/addons/fagc.lua
index e3e5e709..ddf10485 100644
--- a/modules/addons/fagc.lua
+++ b/modules/addons/fagc.lua
@@ -4,7 +4,7 @@
local Event = require 'utils.event' --- @dep utils.event
-- Clear the file on startup to minimize its size
-Event.on_init(function(e)
+Event.on_init(function()
game.write_file("fagc-actions.txt", "", false, 0)
end)
From c36f42d7e86f1942645932da85a35f2d324926bc Mon Sep 17 00:00:00 2001
From: Cooldude2606 <25043174+Cooldude2606@users.noreply.github.com>
Date: Sun, 25 Sep 2022 00:10:59 +0000
Subject: [PATCH 067/129] Automatic Doc Update
---
docs/addons/Advanced-Start.html | 3 +-
docs/addons/Chat-Popups.html | 3 +-
docs/addons/Chat-Reply.html | 3 +-
docs/addons/Compilatron.html | 3 +-
docs/addons/Damage-Popups.html | 3 +-
docs/addons/Death-Logger.html | 3 +-
docs/addons/Deconlog.html | 3 +-
docs/addons/Discord-Alerts.html | 3 +-
docs/addons/FAGC.html | 331 ++++++++++++++++++
docs/addons/Inventory-Clear.html | 3 +-
docs/addons/Pollution-Grading.html | 3 +-
docs/addons/Scorched-Earth.html | 3 +-
docs/addons/Spawn-Area.html | 3 +-
docs/addons/Tree-Decon.html | 3 +-
docs/addons/afk-kick.html | 3 +-
docs/addons/protection-jail.html | 3 +-
docs/addons/report-jail.html | 3 +-
docs/commands/Admin-Chat.html | 3 +-
docs/commands/Admin-Markers.html | 3 +-
docs/commands/Cheat-Mode.html | 3 +-
docs/commands/Clear-Inventory.html | 3 +-
docs/commands/Connect.html | 3 +-
docs/commands/Debug.html | 3 +-
docs/commands/Find.html | 3 +-
docs/commands/Help.html | 3 +-
docs/commands/Home.html | 3 +-
docs/commands/Interface.html | 3 +-
docs/commands/InventorySearch.html | 3 +-
docs/commands/Jail.html | 3 +-
docs/commands/Kill.html | 3 +-
docs/commands/LastLocation.html | 3 +-
docs/commands/Me.html | 3 +-
docs/commands/Protection.html | 3 +-
docs/commands/Rainbow.html | 3 +-
docs/commands/Repair.html | 3 +-
docs/commands/Reports.html | 3 +-
docs/commands/Roles.html | 3 +-
docs/commands/Spawn.html | 3 +-
docs/commands/Spectate.html | 3 +-
docs/commands/Teleport.html | 3 +-
docs/commands/Warnings.html | 3 +-
docs/configs/Advanced-Start.html | 3 +-
docs/configs/Autofill.html | 3 +-
docs/configs/Bonuses.html | 3 +-
docs/configs/Chat-Reply.html | 3 +-
docs/configs/Commands-Auth-Admin.html | 3 +-
docs/configs/Commands-Auth-Roles.html | 3 +-
.../Commands-Auth-Runtime-Disable.html | 3 +-
docs/configs/Commands-Color-Parse.html | 3 +-
docs/configs/Commands-Parse-Roles.html | 3 +-
docs/configs/Commands-Parse.html | 3 +-
docs/configs/Compilatron.html | 3 +-
docs/configs/Death-Logger.html | 3 +-
docs/configs/Deconlog.html | 3 +-
docs/configs/Discord-Alerts.html | 3 +-
docs/configs/File-Loader.html | 3 +-
docs/configs/Permission-Groups.html | 3 +-
docs/configs/Player-List.html | 3 +-
docs/configs/Pollution-Grading.html | 3 +-
docs/configs/Popup-Messages.html | 3 +-
docs/configs/Preset-Player-Colours.html | 3 +-
docs/configs/Preset-Player-Quickbar.html | 3 +-
docs/configs/Repair.html | 3 +-
docs/configs/Rockets.html | 3 +-
docs/configs/Roles.html | 3 +-
docs/configs/Science.html | 3 +-
docs/configs/Scorched-Earth.html | 3 +-
docs/configs/Spawn-Area.html | 3 +-
docs/configs/Statistics.html | 3 +-
docs/configs/Tasks.html | 3 +-
docs/configs/Warnings.html | 3 +-
docs/configs/Warps.html | 3 +-
docs/configs/inventory_clear.html | 3 +-
docs/control/Jail.html | 3 +-
docs/control/Production.html | 3 +-
docs/control/Protection.html | 3 +-
docs/control/Reports.html | 3 +-
docs/control/Rockets.html | 3 +-
docs/control/Selection.html | 3 +-
docs/control/Tasks.html | 3 +-
docs/control/Warnings.html | 3 +-
docs/control/Warps.html | 3 +-
docs/core/Async.html | 3 +-
docs/core/Commands.html | 3 +-
docs/core/Common.html | 3 +-
docs/core/Datastore.html | 3 +-
docs/core/External.html | 3 +-
docs/core/Groups.html | 3 +-
docs/core/Gui.html | 3 +-
docs/core/PlayerData.html | 3 +-
docs/core/Roles.html | 3 +-
docs/data/Alt-View.html | 3 +-
docs/data/Bonus.html | 3 +-
docs/data/Greetings.html | 3 +-
docs/data/Player-Colours.html | 3 +-
docs/data/Quickbar.html | 3 +-
docs/data/Tag.html | 3 +-
docs/guis/Autofill.html | 3 +-
docs/guis/Player-List.html | 3 +-
docs/guis/Readme.html | 3 +-
docs/guis/Rocket-Info.html | 3 +-
docs/guis/Science-Info.html | 3 +-
docs/guis/Task-List.html | 3 +-
docs/guis/Warps-List.html | 3 +-
docs/guis/server-ups.html | 3 +-
docs/index.html | 6 +-
docs/modules/control.html | 3 +-
.../modules.addons.station-auto-name.html | 3 +-
docs/modules/overrides.debug.html | 3 +-
docs/modules/overrides.math.html | 3 +-
docs/modules/overrides.table.html | 3 +-
docs/modules/utils.event.html | 3 +-
docs/modules/utils.event_core.html | 3 +-
docs/modules/utils.task.html | 3 +-
docs/topics/LICENSE.html | 3 +-
docs/topics/README.md.html | 3 +-
116 files changed, 564 insertions(+), 115 deletions(-)
create mode 100644 docs/addons/FAGC.html
diff --git a/docs/addons/Advanced-Start.html b/docs/addons/Advanced-Start.html
index 7cac27f3..6126b9d4 100644
--- a/docs/addons/Advanced-Start.html
+++ b/docs/addons/Advanced-Start.html
@@ -58,6 +58,7 @@
@@ -2443,7 +2444,7 @@ nb: use error(error_message) within your callback to trigger do not trigger dire
generated by LDoc
diff --git a/docs/core/Common.html b/docs/core/Common.html
index 423ec0b9..90eea8b0 100644
--- a/docs/core/Common.html
+++ b/docs/core/Common.html
@@ -94,6 +94,7 @@
@@ -3406,7 +3407,7 @@ nb: this is one way, failing false after already gaining the role will not revok
generated by LDoc
diff --git a/docs/data/Alt-View.html b/docs/data/Alt-View.html
index 8dba5a81..ed4edc11 100644
--- a/docs/data/Alt-View.html
+++ b/docs/data/Alt-View.html
@@ -103,6 +103,7 @@
diff --git a/docs/configs/Discord-Alerts.html b/docs/configs/Discord-Alerts.html
index 4de1d1a5..4189224e 100644
--- a/docs/configs/Discord-Alerts.html
+++ b/docs/configs/Discord-Alerts.html
@@ -268,7 +268,7 @@
generated by LDoc
diff --git a/docs/configs/File-Loader.html b/docs/configs/File-Loader.html
index 26a16b59..674f9763 100644
--- a/docs/configs/File-Loader.html
+++ b/docs/configs/File-Loader.html
@@ -271,7 +271,7 @@
generated by LDoc
diff --git a/docs/configs/Permission-Groups.html b/docs/configs/Permission-Groups.html
index 3ab25bfe..4c1586cd 100644
--- a/docs/configs/Permission-Groups.html
+++ b/docs/configs/Permission-Groups.html
@@ -326,7 +326,7 @@
generated by LDoc
diff --git a/docs/configs/Player-List.html b/docs/configs/Player-List.html
index c377590a..441842f2 100644
--- a/docs/configs/Player-List.html
+++ b/docs/configs/Player-List.html
@@ -725,7 +725,7 @@
generated by LDoc
diff --git a/docs/configs/Pollution-Grading.html b/docs/configs/Pollution-Grading.html
index d7abaf39..69697034 100644
--- a/docs/configs/Pollution-Grading.html
+++ b/docs/configs/Pollution-Grading.html
@@ -415,7 +415,7 @@
generated by LDoc
diff --git a/docs/configs/Popup-Messages.html b/docs/configs/Popup-Messages.html
index 6ce06617..7b5efa5c 100644
--- a/docs/configs/Popup-Messages.html
+++ b/docs/configs/Popup-Messages.html
@@ -445,7 +445,7 @@
generated by LDoc
diff --git a/docs/configs/Preset-Player-Colours.html b/docs/configs/Preset-Player-Colours.html
index 17979cb1..66e1210e 100644
--- a/docs/configs/Preset-Player-Colours.html
+++ b/docs/configs/Preset-Player-Colours.html
@@ -355,7 +355,7 @@
generated by LDoc
diff --git a/docs/configs/Preset-Player-Quickbar.html b/docs/configs/Preset-Player-Quickbar.html
index f9d41993..3ea8bb61 100644
--- a/docs/configs/Preset-Player-Quickbar.html
+++ b/docs/configs/Preset-Player-Quickbar.html
@@ -268,7 +268,7 @@
generated by LDoc
diff --git a/docs/configs/Repair.html b/docs/configs/Repair.html
index f472e24f..55246310 100644
--- a/docs/configs/Repair.html
+++ b/docs/configs/Repair.html
@@ -445,7 +445,7 @@
generated by LDoc
diff --git a/docs/configs/Rockets.html b/docs/configs/Rockets.html
index 6fb100c5..e523b465 100644
--- a/docs/configs/Rockets.html
+++ b/docs/configs/Rockets.html
@@ -865,7 +865,7 @@
generated by LDoc
diff --git a/docs/configs/Roles.html b/docs/configs/Roles.html
index 0a7bf582..2e0e3a8a 100644
--- a/docs/configs/Roles.html
+++ b/docs/configs/Roles.html
@@ -351,7 +351,7 @@
generated by LDoc
diff --git a/docs/configs/Science.html b/docs/configs/Science.html
index 55271828..b515fbae 100644
--- a/docs/configs/Science.html
+++ b/docs/configs/Science.html
@@ -385,7 +385,7 @@
generated by LDoc
diff --git a/docs/configs/Scorched-Earth.html b/docs/configs/Scorched-Earth.html
index e0d02ad7..1ad0f7bb 100644
--- a/docs/configs/Scorched-Earth.html
+++ b/docs/configs/Scorched-Earth.html
@@ -419,7 +419,7 @@
generated by LDoc
diff --git a/docs/configs/Spawn-Area.html b/docs/configs/Spawn-Area.html
index f68d80ee..dfe2115a 100644
--- a/docs/configs/Spawn-Area.html
+++ b/docs/configs/Spawn-Area.html
@@ -1226,7 +1226,7 @@
generated by LDoc
diff --git a/docs/configs/Statistics.html b/docs/configs/Statistics.html
index 0cfeab5d..c1004e20 100644
--- a/docs/configs/Statistics.html
+++ b/docs/configs/Statistics.html
@@ -685,7 +685,7 @@
generated by LDoc
diff --git a/docs/configs/Tasks.html b/docs/configs/Tasks.html
index cd9b33e4..bc50abc6 100644
--- a/docs/configs/Tasks.html
+++ b/docs/configs/Tasks.html
@@ -415,7 +415,7 @@
generated by LDoc
diff --git a/docs/configs/Warnings.html b/docs/configs/Warnings.html
index 8b352395..da3696c5 100644
--- a/docs/configs/Warnings.html
+++ b/docs/configs/Warnings.html
@@ -386,7 +386,7 @@
generated by LDoc
diff --git a/docs/configs/Warps.html b/docs/configs/Warps.html
index f52542b4..613767f3 100644
--- a/docs/configs/Warps.html
+++ b/docs/configs/Warps.html
@@ -775,7 +775,7 @@
generated by LDoc
diff --git a/docs/configs/inventory_clear.html b/docs/configs/inventory_clear.html
index 6205189c..6bf1af59 100644
--- a/docs/configs/inventory_clear.html
+++ b/docs/configs/inventory_clear.html
@@ -268,7 +268,7 @@
generated by LDoc
diff --git a/docs/control/Jail.html b/docs/control/Jail.html
index 33c4b370..6392f6a2 100644
--- a/docs/control/Jail.html
+++ b/docs/control/Jail.html
@@ -806,7 +806,7 @@
generated by LDoc
diff --git a/docs/control/Production.html b/docs/control/Production.html
index c4a17dba..8f6a6db1 100644
--- a/docs/control/Production.html
+++ b/docs/control/Production.html
@@ -1360,7 +1360,7 @@
generated by LDoc
diff --git a/docs/control/Protection.html b/docs/control/Protection.html
index 0f5d5bcd..18f632ba 100644
--- a/docs/control/Protection.html
+++ b/docs/control/Protection.html
@@ -1032,7 +1032,7 @@
generated by LDoc
diff --git a/docs/control/Reports.html b/docs/control/Reports.html
index 94a66e0a..55d458c9 100644
--- a/docs/control/Reports.html
+++ b/docs/control/Reports.html
@@ -1173,7 +1173,7 @@
generated by LDoc
diff --git a/docs/control/Rockets.html b/docs/control/Rockets.html
index e2684fd1..f3e9b775 100644
--- a/docs/control/Rockets.html
+++ b/docs/control/Rockets.html
@@ -1015,7 +1015,7 @@
generated by LDoc
diff --git a/docs/control/Selection.html b/docs/control/Selection.html
index ddeb587c..c03bdab1 100644
--- a/docs/control/Selection.html
+++ b/docs/control/Selection.html
@@ -922,7 +922,7 @@
generated by LDoc
diff --git a/docs/control/Tasks.html b/docs/control/Tasks.html
index 2bf2c80f..6962302c 100644
--- a/docs/control/Tasks.html
+++ b/docs/control/Tasks.html
@@ -1016,7 +1016,7 @@ Tasks.update_task(task_id, 'We need more iron!', gam
generated by LDoc
diff --git a/docs/control/Warnings.html b/docs/control/Warnings.html
index d70792e7..f4a9b14b 100644
--- a/docs/control/Warnings.html
+++ b/docs/control/Warnings.html
@@ -1556,7 +1556,7 @@
generated by LDoc
diff --git a/docs/control/Warps.html b/docs/control/Warps.html
index bbebe83c..825f57a4 100644
--- a/docs/control/Warps.html
+++ b/docs/control/Warps.html
@@ -1538,7 +1538,7 @@ Warps.make_warp_tag(warp_id)
generated by LDoc
diff --git a/docs/core/Async.html b/docs/core/Async.html
index 52e1366b..fec3f932 100644
--- a/docs/core/Async.html
+++ b/docs/core/Async.html
@@ -629,7 +629,7 @@ Async.register(function(player, message)
generated by LDoc
diff --git a/docs/core/Commands.html b/docs/core/Commands.html
index f4bfadde..b641bbde 100644
--- a/docs/core/Commands.html
+++ b/docs/core/Commands.html
@@ -2444,7 +2444,7 @@ nb: use error(error_message) within your callback to trigger do not trigger dire
generated by LDoc
diff --git a/docs/core/Common.html b/docs/core/Common.html
index 90eea8b0..b8b70fdf 100644
--- a/docs/core/Common.html
+++ b/docs/core/Common.html
@@ -2919,7 +2919,7 @@ https://github.com/Refactorio/RedMew/blob/9184b2940f311d8c9c891e83429fc57ec7e0c4
generated by LDoc
diff --git a/docs/core/Datastore.html b/docs/core/Datastore.html
index 75fd79a2..dda70c82 100644
--- a/docs/core/Datastore.html
+++ b/docs/core/Datastore.html
@@ -2980,7 +2980,7 @@ ExampleData:on_update(function(key, value)
generated by LDoc
diff --git a/docs/core/External.html b/docs/core/External.html
index d39ee1f8..ef97774f 100644
--- a/docs/core/External.html
+++ b/docs/core/External.html
@@ -764,7 +764,7 @@
generated by LDoc
diff --git a/docs/core/Groups.html b/docs/core/Groups.html
index c7a60194..524db0d0 100644
--- a/docs/core/Groups.html
+++ b/docs/core/Groups.html
@@ -1459,7 +1459,7 @@
generated by LDoc
diff --git a/docs/core/Gui.html b/docs/core/Gui.html
index 1a23a7b6..4a9ba07e 100644
--- a/docs/core/Gui.html
+++ b/docs/core/Gui.html
@@ -4437,7 +4437,7 @@ Gui.left_toolbar_button('entity/inserter', generated by LDoc
diff --git a/docs/core/PlayerData.html b/docs/core/PlayerData.html
index 4b805a3e..b2a52341 100644
--- a/docs/core/PlayerData.html
+++ b/docs/core/PlayerData.html
@@ -547,7 +547,7 @@
generated by LDoc
diff --git a/docs/core/Roles.html b/docs/core/Roles.html
index 0666671f..a267b62b 100644
--- a/docs/core/Roles.html
+++ b/docs/core/Roles.html
@@ -3407,7 +3407,7 @@ nb: this is one way, failing false after already gaining the role will not revok
generated by LDoc
diff --git a/docs/data/Alt-View.html b/docs/data/Alt-View.html
index ed4edc11..ac88368f 100644
--- a/docs/data/Alt-View.html
+++ b/docs/data/Alt-View.html
@@ -351,7 +351,7 @@
generated by LDoc
diff --git a/docs/data/Bonus.html b/docs/data/Bonus.html
index c1be5ff3..6f268e81 100644
--- a/docs/data/Bonus.html
+++ b/docs/data/Bonus.html
@@ -503,7 +503,7 @@
generated by LDoc
diff --git a/docs/data/Greetings.html b/docs/data/Greetings.html
index 73fee5b9..57c5bfbf 100644
--- a/docs/data/Greetings.html
+++ b/docs/data/Greetings.html
@@ -446,7 +446,7 @@
generated by LDoc
diff --git a/docs/data/Player-Colours.html b/docs/data/Player-Colours.html
index 2f697770..052b57c3 100644
--- a/docs/data/Player-Colours.html
+++ b/docs/data/Player-Colours.html
@@ -407,7 +407,7 @@
generated by LDoc
diff --git a/docs/data/Quickbar.html b/docs/data/Quickbar.html
index bac0aed0..77cffcc2 100644
--- a/docs/data/Quickbar.html
+++ b/docs/data/Quickbar.html
@@ -424,7 +424,7 @@
generated by LDoc
diff --git a/docs/data/Tag.html b/docs/data/Tag.html
index 3b5ed7a1..ad600488 100644
--- a/docs/data/Tag.html
+++ b/docs/data/Tag.html
@@ -556,7 +556,7 @@
generated by LDoc
diff --git a/docs/guis/Autofill.html b/docs/guis/Autofill.html
index b62331c5..10524159 100644
--- a/docs/guis/Autofill.html
+++ b/docs/guis/Autofill.html
@@ -608,7 +608,7 @@
generated by LDoc
diff --git a/docs/guis/Player-List.html b/docs/guis/Player-List.html
index d5c6fbaf..57a72d56 100644
--- a/docs/guis/Player-List.html
+++ b/docs/guis/Player-List.html
@@ -722,7 +722,7 @@
generated by LDoc
diff --git a/docs/guis/Readme.html b/docs/guis/Readme.html
index 5e886de4..097717d9 100644
--- a/docs/guis/Readme.html
+++ b/docs/guis/Readme.html
@@ -1014,7 +1014,7 @@
generated by LDoc
diff --git a/docs/guis/Rocket-Info.html b/docs/guis/Rocket-Info.html
index 39bac7d5..3fd91bfd 100644
--- a/docs/guis/Rocket-Info.html
+++ b/docs/guis/Rocket-Info.html
@@ -722,7 +722,7 @@
generated by LDoc
diff --git a/docs/guis/Science-Info.html b/docs/guis/Science-Info.html
index 3f71b455..8faed8f0 100644
--- a/docs/guis/Science-Info.html
+++ b/docs/guis/Science-Info.html
@@ -601,7 +601,7 @@
generated by LDoc
diff --git a/docs/guis/Task-List.html b/docs/guis/Task-List.html
index 51ca62f5..e8876483 100644
--- a/docs/guis/Task-List.html
+++ b/docs/guis/Task-List.html
@@ -1125,7 +1125,7 @@
generated by LDoc
diff --git a/docs/guis/Warps-List.html b/docs/guis/Warps-List.html
index 5b0df47b..80f92547 100644
--- a/docs/guis/Warps-List.html
+++ b/docs/guis/Warps-List.html
@@ -1091,7 +1091,7 @@
generated by LDoc
diff --git a/docs/guis/server-ups.html b/docs/guis/server-ups.html
index f704eaf3..6093c058 100644
--- a/docs/guis/server-ups.html
+++ b/docs/guis/server-ups.html
@@ -524,7 +524,7 @@
generated by LDoc
diff --git a/docs/index.html b/docs/index.html
index b6cfd776..75cbcdc8 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -622,7 +622,7 @@ Events.set_event_filter(defines.events.on_built_entity, {{filter = "name", name
generated by LDoc
diff --git a/docs/modules/control.html b/docs/modules/control.html
index 8b112dbf..c653c9e4 100644
--- a/docs/modules/control.html
+++ b/docs/modules/control.html
@@ -271,7 +271,7 @@
generated by LDoc
diff --git a/docs/modules/modules.addons.station-auto-name.html b/docs/modules/modules.addons.station-auto-name.html
index 15db991c..585e2ed1 100644
--- a/docs/modules/modules.addons.station-auto-name.html
+++ b/docs/modules/modules.addons.station-auto-name.html
@@ -324,7 +324,7 @@ Events.set_event_filter(defines.events.on_built_entity, {{filter = "name", name
generated by LDoc
diff --git a/docs/modules/overrides.debug.html b/docs/modules/overrides.debug.html
index 6c3471ec..bb823bdc 100644
--- a/docs/modules/overrides.debug.html
+++ b/docs/modules/overrides.debug.html
@@ -685,7 +685,7 @@
generated by LDoc
diff --git a/docs/modules/overrides.math.html b/docs/modules/overrides.math.html
index 0dc864cd..716aff4b 100644
--- a/docs/modules/overrides.math.html
+++ b/docs/modules/overrides.math.html
@@ -384,7 +384,7 @@
generated by LDoc
diff --git a/docs/modules/overrides.table.html b/docs/modules/overrides.table.html
index 3f247fc5..06da4a09 100644
--- a/docs/modules/overrides.table.html
+++ b/docs/modules/overrides.table.html
@@ -2039,7 +2039,7 @@
generated by LDoc
diff --git a/docs/modules/utils.event.html b/docs/modules/utils.event.html
index 0e880563..46540441 100644
--- a/docs/modules/utils.event.html
+++ b/docs/modules/utils.event.html
@@ -1323,7 +1323,7 @@
generated by LDoc
diff --git a/docs/modules/utils.event_core.html b/docs/modules/utils.event_core.html
index afedf176..1aa0abfc 100644
--- a/docs/modules/utils.event_core.html
+++ b/docs/modules/utils.event_core.html
@@ -465,7 +465,7 @@
generated by LDoc
diff --git a/docs/modules/utils.task.html b/docs/modules/utils.task.html
index b8b2277c..b84c0e24 100644
--- a/docs/modules/utils.task.html
+++ b/docs/modules/utils.task.html
@@ -682,7 +682,7 @@
generated by LDoc
diff --git a/docs/topics/LICENSE.html b/docs/topics/LICENSE.html
index 5dd2949d..cf48ae39 100644
--- a/docs/topics/LICENSE.html
+++ b/docs/topics/LICENSE.html
@@ -820,7 +820,7 @@ Public License instead of this License. But first, please read
generated by LDoc
diff --git a/docs/topics/README.md.html b/docs/topics/README.md.html
index d359a9aa..ab518531 100644
--- a/docs/topics/README.md.html
+++ b/docs/topics/README.md.html
@@ -380,7 +380,7 @@
generated by LDoc
From f6982f6b79225388ac4af922265ea31eda90873e Mon Sep 17 00:00:00 2001
From: Windsinger
Date: Sun, 23 Oct 2022 19:20:51 +0200
Subject: [PATCH 071/129] Update reports.lua
As discussed on discord
---
modules/control/reports.lua | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/control/reports.lua b/modules/control/reports.lua
index 62d3bea7..d7004316 100644
--- a/modules/control/reports.lua
+++ b/modules/control/reports.lua
@@ -132,7 +132,7 @@ function Reports.report_player(player, by_player_name, reason)
if not player then return end
local player_name = player.name
- if reason == nil or not reason:find("/S") then reason = 'No reason given' end
+ if reason == nil or not reason:find("%S") then reason = 'No reason given' end
local reports = user_reports[player_name]
if not reports then
@@ -222,4 +222,4 @@ function Reports.remove_all(player, removed_by_name)
return true
end
-return Reports
\ No newline at end of file
+return Reports
From 22cc0905df27f6b476e7ef4aa1fd56c5df2a6bca Mon Sep 17 00:00:00 2001
From: Cooldude2606 <25043174+Cooldude2606@users.noreply.github.com>
Date: Sun, 23 Oct 2022 17:22:37 +0000
Subject: [PATCH 072/129] Automatic Doc Update
---
docs/addons/Advanced-Start.html | 2 +-
docs/addons/Chat-Popups.html | 2 +-
docs/addons/Chat-Reply.html | 2 +-
docs/addons/Compilatron.html | 2 +-
docs/addons/Damage-Popups.html | 2 +-
docs/addons/Death-Logger.html | 2 +-
docs/addons/Deconlog.html | 2 +-
docs/addons/Discord-Alerts.html | 2 +-
docs/addons/FAGC.html | 2 +-
docs/addons/Inventory-Clear.html | 2 +-
docs/addons/Pollution-Grading.html | 2 +-
docs/addons/Scorched-Earth.html | 2 +-
docs/addons/Spawn-Area.html | 2 +-
docs/addons/Tree-Decon.html | 2 +-
docs/addons/afk-kick.html | 2 +-
docs/addons/protection-jail.html | 2 +-
docs/addons/report-jail.html | 2 +-
docs/commands/Admin-Chat.html | 2 +-
docs/commands/Admin-Markers.html | 2 +-
docs/commands/Cheat-Mode.html | 2 +-
docs/commands/Clear-Inventory.html | 2 +-
docs/commands/Connect.html | 2 +-
docs/commands/Debug.html | 2 +-
docs/commands/Find.html | 2 +-
docs/commands/Help.html | 2 +-
docs/commands/Home.html | 2 +-
docs/commands/Interface.html | 2 +-
docs/commands/InventorySearch.html | 2 +-
docs/commands/Jail.html | 2 +-
docs/commands/Kill.html | 2 +-
docs/commands/LastLocation.html | 2 +-
docs/commands/Me.html | 2 +-
docs/commands/Protection.html | 2 +-
docs/commands/Rainbow.html | 2 +-
docs/commands/Repair.html | 2 +-
docs/commands/Reports.html | 2 +-
docs/commands/Roles.html | 2 +-
docs/commands/Spawn.html | 2 +-
docs/commands/Spectate.html | 2 +-
docs/commands/Teleport.html | 2 +-
docs/commands/Warnings.html | 2 +-
docs/configs/Advanced-Start.html | 2 +-
docs/configs/Autofill.html | 2 +-
docs/configs/Bonuses.html | 2 +-
docs/configs/Chat-Reply.html | 2 +-
docs/configs/Commands-Auth-Admin.html | 2 +-
docs/configs/Commands-Auth-Roles.html | 2 +-
docs/configs/Commands-Auth-Runtime-Disable.html | 2 +-
docs/configs/Commands-Color-Parse.html | 2 +-
docs/configs/Commands-Parse-Roles.html | 2 +-
docs/configs/Commands-Parse.html | 2 +-
docs/configs/Compilatron.html | 2 +-
docs/configs/Death-Logger.html | 2 +-
docs/configs/Deconlog.html | 2 +-
docs/configs/Discord-Alerts.html | 2 +-
docs/configs/File-Loader.html | 2 +-
docs/configs/Permission-Groups.html | 2 +-
docs/configs/Player-List.html | 2 +-
docs/configs/Pollution-Grading.html | 2 +-
docs/configs/Popup-Messages.html | 2 +-
docs/configs/Preset-Player-Colours.html | 2 +-
docs/configs/Preset-Player-Quickbar.html | 2 +-
docs/configs/Repair.html | 2 +-
docs/configs/Rockets.html | 2 +-
docs/configs/Roles.html | 2 +-
docs/configs/Science.html | 2 +-
docs/configs/Scorched-Earth.html | 2 +-
docs/configs/Spawn-Area.html | 2 +-
docs/configs/Statistics.html | 2 +-
docs/configs/Tasks.html | 2 +-
docs/configs/Warnings.html | 2 +-
docs/configs/Warps.html | 2 +-
docs/configs/inventory_clear.html | 2 +-
docs/control/Jail.html | 2 +-
docs/control/Production.html | 2 +-
docs/control/Protection.html | 2 +-
docs/control/Reports.html | 2 +-
docs/control/Rockets.html | 2 +-
docs/control/Selection.html | 2 +-
docs/control/Tasks.html | 2 +-
docs/control/Warnings.html | 2 +-
docs/control/Warps.html | 2 +-
docs/core/Async.html | 2 +-
docs/core/Commands.html | 2 +-
docs/core/Common.html | 2 +-
docs/core/Datastore.html | 2 +-
docs/core/External.html | 2 +-
docs/core/Groups.html | 2 +-
docs/core/Gui.html | 2 +-
docs/core/PlayerData.html | 2 +-
docs/core/Roles.html | 2 +-
docs/data/Alt-View.html | 2 +-
docs/data/Bonus.html | 2 +-
docs/data/Greetings.html | 2 +-
docs/data/Player-Colours.html | 2 +-
docs/data/Quickbar.html | 2 +-
docs/data/Tag.html | 2 +-
docs/guis/Autofill.html | 2 +-
docs/guis/Player-List.html | 2 +-
docs/guis/Readme.html | 2 +-
docs/guis/Rocket-Info.html | 2 +-
docs/guis/Science-Info.html | 2 +-
docs/guis/Task-List.html | 2 +-
docs/guis/Warps-List.html | 2 +-
docs/guis/server-ups.html | 2 +-
docs/index.html | 2 +-
docs/modules/control.html | 2 +-
docs/modules/modules.addons.station-auto-name.html | 2 +-
docs/modules/overrides.debug.html | 2 +-
docs/modules/overrides.math.html | 2 +-
docs/modules/overrides.table.html | 2 +-
docs/modules/utils.event.html | 2 +-
docs/modules/utils.event_core.html | 2 +-
docs/modules/utils.task.html | 2 +-
docs/topics/LICENSE.html | 2 +-
docs/topics/README.md.html | 2 +-
116 files changed, 116 insertions(+), 116 deletions(-)
diff --git a/docs/addons/Advanced-Start.html b/docs/addons/Advanced-Start.html
index d8bd6b1f..fb4a5373 100644
--- a/docs/addons/Advanced-Start.html
+++ b/docs/addons/Advanced-Start.html
@@ -351,7 +351,7 @@
generated by LDoc
diff --git a/docs/addons/Chat-Popups.html b/docs/addons/Chat-Popups.html
index 9e4bdb8e..840fbfb2 100644
--- a/docs/addons/Chat-Popups.html
+++ b/docs/addons/Chat-Popups.html
@@ -380,7 +380,7 @@
generated by LDoc
diff --git a/docs/addons/Chat-Reply.html b/docs/addons/Chat-Reply.html
index 0e0a2921..4287e624 100644
--- a/docs/addons/Chat-Reply.html
+++ b/docs/addons/Chat-Reply.html
@@ -379,7 +379,7 @@
generated by LDoc
diff --git a/docs/addons/Compilatron.html b/docs/addons/Compilatron.html
index bd351260..d97c1dc3 100644
--- a/docs/addons/Compilatron.html
+++ b/docs/addons/Compilatron.html
@@ -588,7 +588,7 @@
generated by LDoc
diff --git a/docs/addons/Damage-Popups.html b/docs/addons/Damage-Popups.html
index ef0590db..315de197 100644
--- a/docs/addons/Damage-Popups.html
+++ b/docs/addons/Damage-Popups.html
@@ -380,7 +380,7 @@
generated by LDoc
diff --git a/docs/addons/Death-Logger.html b/docs/addons/Death-Logger.html
index e0295427..7014f338 100644
--- a/docs/addons/Death-Logger.html
+++ b/docs/addons/Death-Logger.html
@@ -407,7 +407,7 @@
generated by LDoc
diff --git a/docs/addons/Deconlog.html b/docs/addons/Deconlog.html
index 647f19ed..1b6969f9 100644
--- a/docs/addons/Deconlog.html
+++ b/docs/addons/Deconlog.html
@@ -379,7 +379,7 @@
generated by LDoc
diff --git a/docs/addons/Discord-Alerts.html b/docs/addons/Discord-Alerts.html
index cb46c430..e8d84e07 100644
--- a/docs/addons/Discord-Alerts.html
+++ b/docs/addons/Discord-Alerts.html
@@ -491,7 +491,7 @@
generated by LDoc
diff --git a/docs/addons/FAGC.html b/docs/addons/FAGC.html
index aed7d621..9c7ccfb8 100644
--- a/docs/addons/FAGC.html
+++ b/docs/addons/FAGC.html
@@ -323,7 +323,7 @@
generated by LDoc
diff --git a/docs/addons/Inventory-Clear.html b/docs/addons/Inventory-Clear.html
index 82fa022b..7d88dae0 100644
--- a/docs/addons/Inventory-Clear.html
+++ b/docs/addons/Inventory-Clear.html
@@ -379,7 +379,7 @@
generated by LDoc
diff --git a/docs/addons/Pollution-Grading.html b/docs/addons/Pollution-Grading.html
index f6548cb1..951626e2 100644
--- a/docs/addons/Pollution-Grading.html
+++ b/docs/addons/Pollution-Grading.html
@@ -351,7 +351,7 @@
generated by LDoc
diff --git a/docs/addons/Scorched-Earth.html b/docs/addons/Scorched-Earth.html
index 6db7318f..41e913bf 100644
--- a/docs/addons/Scorched-Earth.html
+++ b/docs/addons/Scorched-Earth.html
@@ -407,7 +407,7 @@
generated by LDoc
diff --git a/docs/addons/Spawn-Area.html b/docs/addons/Spawn-Area.html
index 5063686a..587d2bfc 100644
--- a/docs/addons/Spawn-Area.html
+++ b/docs/addons/Spawn-Area.html
@@ -379,7 +379,7 @@
generated by LDoc
diff --git a/docs/addons/Tree-Decon.html b/docs/addons/Tree-Decon.html
index e64e96c7..1e207029 100644
--- a/docs/addons/Tree-Decon.html
+++ b/docs/addons/Tree-Decon.html
@@ -435,7 +435,7 @@
generated by LDoc
diff --git a/docs/addons/afk-kick.html b/docs/addons/afk-kick.html
index 5174ca9a..9b794cc2 100644
--- a/docs/addons/afk-kick.html
+++ b/docs/addons/afk-kick.html
@@ -407,7 +407,7 @@
generated by LDoc
diff --git a/docs/addons/protection-jail.html b/docs/addons/protection-jail.html
index d4834639..4c4bdd4e 100644
--- a/docs/addons/protection-jail.html
+++ b/docs/addons/protection-jail.html
@@ -435,7 +435,7 @@
generated by LDoc
diff --git a/docs/addons/report-jail.html b/docs/addons/report-jail.html
index 3dad6b8d..e660e7e1 100644
--- a/docs/addons/report-jail.html
+++ b/docs/addons/report-jail.html
@@ -407,7 +407,7 @@
generated by LDoc
diff --git a/docs/commands/Admin-Chat.html b/docs/commands/Admin-Chat.html
index 37e55f3d..4065422a 100644
--- a/docs/commands/Admin-Chat.html
+++ b/docs/commands/Admin-Chat.html
@@ -419,7 +419,7 @@
generated by LDoc
diff --git a/docs/commands/Admin-Markers.html b/docs/commands/Admin-Markers.html
index efa20644..1c0faa63 100644
--- a/docs/commands/Admin-Markers.html
+++ b/docs/commands/Admin-Markers.html
@@ -424,7 +424,7 @@
generated by LDoc
diff --git a/docs/commands/Cheat-Mode.html b/docs/commands/Cheat-Mode.html
index cf264568..2bc63ba5 100644
--- a/docs/commands/Cheat-Mode.html
+++ b/docs/commands/Cheat-Mode.html
@@ -392,7 +392,7 @@
generated by LDoc
diff --git a/docs/commands/Clear-Inventory.html b/docs/commands/Clear-Inventory.html
index 52af903a..85814887 100644
--- a/docs/commands/Clear-Inventory.html
+++ b/docs/commands/Clear-Inventory.html
@@ -419,7 +419,7 @@
generated by LDoc
diff --git a/docs/commands/Connect.html b/docs/commands/Connect.html
index 4a1f4671..dd5898aa 100644
--- a/docs/commands/Connect.html
+++ b/docs/commands/Connect.html
@@ -622,7 +622,7 @@
generated by LDoc
diff --git a/docs/commands/Debug.html b/docs/commands/Debug.html
index 2a26616d..9905558a 100644
--- a/docs/commands/Debug.html
+++ b/docs/commands/Debug.html
@@ -396,7 +396,7 @@
generated by LDoc
diff --git a/docs/commands/Find.html b/docs/commands/Find.html
index bc7e1dc2..093eca12 100644
--- a/docs/commands/Find.html
+++ b/docs/commands/Find.html
@@ -391,7 +391,7 @@
generated by LDoc
diff --git a/docs/commands/Help.html b/docs/commands/Help.html
index 5f62ff72..3471d054 100644
--- a/docs/commands/Help.html
+++ b/docs/commands/Help.html
@@ -435,7 +435,7 @@
generated by LDoc
diff --git a/docs/commands/Home.html b/docs/commands/Home.html
index 7ad7d639..9c17220f 100644
--- a/docs/commands/Home.html
+++ b/docs/commands/Home.html
@@ -489,7 +489,7 @@
generated by LDoc
diff --git a/docs/commands/Interface.html b/docs/commands/Interface.html
index 9c684639..b5de34ff 100644
--- a/docs/commands/Interface.html
+++ b/docs/commands/Interface.html
@@ -419,7 +419,7 @@
generated by LDoc
diff --git a/docs/commands/InventorySearch.html b/docs/commands/InventorySearch.html
index 46fb020a..523e70ed 100644
--- a/docs/commands/InventorySearch.html
+++ b/docs/commands/InventorySearch.html
@@ -609,7 +609,7 @@
generated by LDoc
diff --git a/docs/commands/Jail.html b/docs/commands/Jail.html
index bf5d322e..e399aacc 100644
--- a/docs/commands/Jail.html
+++ b/docs/commands/Jail.html
@@ -518,7 +518,7 @@
generated by LDoc
diff --git a/docs/commands/Kill.html b/docs/commands/Kill.html
index d5e220c2..f8e69500 100644
--- a/docs/commands/Kill.html
+++ b/docs/commands/Kill.html
@@ -420,7 +420,7 @@
generated by LDoc
diff --git a/docs/commands/LastLocation.html b/docs/commands/LastLocation.html
index 031fff93..543b3919 100644
--- a/docs/commands/LastLocation.html
+++ b/docs/commands/LastLocation.html
@@ -419,7 +419,7 @@
generated by LDoc
diff --git a/docs/commands/Me.html b/docs/commands/Me.html
index 71bb30ea..e087f09c 100644
--- a/docs/commands/Me.html
+++ b/docs/commands/Me.html
@@ -391,7 +391,7 @@
generated by LDoc
diff --git a/docs/commands/Protection.html b/docs/commands/Protection.html
index b87ddba1..8e5c4783 100644
--- a/docs/commands/Protection.html
+++ b/docs/commands/Protection.html
@@ -567,7 +567,7 @@
generated by LDoc
diff --git a/docs/commands/Rainbow.html b/docs/commands/Rainbow.html
index 777645a0..e6157038 100644
--- a/docs/commands/Rainbow.html
+++ b/docs/commands/Rainbow.html
@@ -419,7 +419,7 @@
generated by LDoc
diff --git a/docs/commands/Repair.html b/docs/commands/Repair.html
index 6fa8b44b..daec8634 100644
--- a/docs/commands/Repair.html
+++ b/docs/commands/Repair.html
@@ -352,7 +352,7 @@
generated by LDoc
diff --git a/docs/commands/Reports.html b/docs/commands/Reports.html
index 5a20667d..ca9b3020 100644
--- a/docs/commands/Reports.html
+++ b/docs/commands/Reports.html
@@ -616,7 +616,7 @@
generated by LDoc
diff --git a/docs/commands/Roles.html b/docs/commands/Roles.html
index 4fffc0ba..98788fd2 100644
--- a/docs/commands/Roles.html
+++ b/docs/commands/Roles.html
@@ -588,7 +588,7 @@
generated by LDoc
diff --git a/docs/commands/Spawn.html b/docs/commands/Spawn.html
index b559a358..2053e47b 100644
--- a/docs/commands/Spawn.html
+++ b/docs/commands/Spawn.html
@@ -420,7 +420,7 @@
generated by LDoc
diff --git a/docs/commands/Spectate.html b/docs/commands/Spectate.html
index c0f7bb33..5166401d 100644
--- a/docs/commands/Spectate.html
+++ b/docs/commands/Spectate.html
@@ -450,7 +450,7 @@
generated by LDoc
diff --git a/docs/commands/Teleport.html b/docs/commands/Teleport.html
index 7b96452a..eb73b9c4 100644
--- a/docs/commands/Teleport.html
+++ b/docs/commands/Teleport.html
@@ -515,7 +515,7 @@
generated by LDoc
diff --git a/docs/commands/Warnings.html b/docs/commands/Warnings.html
index 3e31d9ff..4fcb47ef 100644
--- a/docs/commands/Warnings.html
+++ b/docs/commands/Warnings.html
@@ -600,7 +600,7 @@
generated by LDoc
diff --git a/docs/configs/Advanced-Start.html b/docs/configs/Advanced-Start.html
index ef788919..3bad9faf 100644
--- a/docs/configs/Advanced-Start.html
+++ b/docs/configs/Advanced-Start.html
@@ -537,7 +537,7 @@
generated by LDoc
diff --git a/docs/configs/Autofill.html b/docs/configs/Autofill.html
index f8c501ab..babc334d 100644
--- a/docs/configs/Autofill.html
+++ b/docs/configs/Autofill.html
@@ -268,7 +268,7 @@
generated by LDoc
diff --git a/docs/configs/Bonuses.html b/docs/configs/Bonuses.html
index 2bcf9b04..2e062871 100644
--- a/docs/configs/Bonuses.html
+++ b/docs/configs/Bonuses.html
@@ -268,7 +268,7 @@
generated by LDoc
diff --git a/docs/configs/Chat-Reply.html b/docs/configs/Chat-Reply.html
index 159736dd..3d089f08 100644
--- a/docs/configs/Chat-Reply.html
+++ b/docs/configs/Chat-Reply.html
@@ -516,7 +516,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Auth-Admin.html b/docs/configs/Commands-Auth-Admin.html
index e7a38ace..178fc624 100644
--- a/docs/configs/Commands-Auth-Admin.html
+++ b/docs/configs/Commands-Auth-Admin.html
@@ -325,7 +325,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Auth-Roles.html b/docs/configs/Commands-Auth-Roles.html
index 86fe6020..e200d497 100644
--- a/docs/configs/Commands-Auth-Roles.html
+++ b/docs/configs/Commands-Auth-Roles.html
@@ -351,7 +351,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Auth-Runtime-Disable.html b/docs/configs/Commands-Auth-Runtime-Disable.html
index 5bb30978..86405169 100644
--- a/docs/configs/Commands-Auth-Runtime-Disable.html
+++ b/docs/configs/Commands-Auth-Runtime-Disable.html
@@ -473,7 +473,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Color-Parse.html b/docs/configs/Commands-Color-Parse.html
index c8340236..f8e53669 100644
--- a/docs/configs/Commands-Color-Parse.html
+++ b/docs/configs/Commands-Color-Parse.html
@@ -351,7 +351,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Parse-Roles.html b/docs/configs/Commands-Parse-Roles.html
index 4c7f54b5..a8fde4f6 100644
--- a/docs/configs/Commands-Parse-Roles.html
+++ b/docs/configs/Commands-Parse-Roles.html
@@ -385,7 +385,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Parse.html b/docs/configs/Commands-Parse.html
index 96c4ef83..9bdd186c 100644
--- a/docs/configs/Commands-Parse.html
+++ b/docs/configs/Commands-Parse.html
@@ -341,7 +341,7 @@ see ./expcore/commands.lua for more details
generated by LDoc
diff --git a/docs/configs/Compilatron.html b/docs/configs/Compilatron.html
index 625b6785..af06d897 100644
--- a/docs/configs/Compilatron.html
+++ b/docs/configs/Compilatron.html
@@ -385,7 +385,7 @@
generated by LDoc
diff --git a/docs/configs/Death-Logger.html b/docs/configs/Death-Logger.html
index fafe5bfe..a3491bf8 100644
--- a/docs/configs/Death-Logger.html
+++ b/docs/configs/Death-Logger.html
@@ -507,7 +507,7 @@
generated by LDoc
diff --git a/docs/configs/Deconlog.html b/docs/configs/Deconlog.html
index d1d60a22..7e73fe15 100644
--- a/docs/configs/Deconlog.html
+++ b/docs/configs/Deconlog.html
@@ -475,7 +475,7 @@
generated by LDoc
diff --git a/docs/configs/Discord-Alerts.html b/docs/configs/Discord-Alerts.html
index 4189224e..0e763f09 100644
--- a/docs/configs/Discord-Alerts.html
+++ b/docs/configs/Discord-Alerts.html
@@ -268,7 +268,7 @@
generated by LDoc
diff --git a/docs/configs/File-Loader.html b/docs/configs/File-Loader.html
index 674f9763..7855fc87 100644
--- a/docs/configs/File-Loader.html
+++ b/docs/configs/File-Loader.html
@@ -271,7 +271,7 @@
generated by LDoc
diff --git a/docs/configs/Permission-Groups.html b/docs/configs/Permission-Groups.html
index 4c1586cd..36d3fe7a 100644
--- a/docs/configs/Permission-Groups.html
+++ b/docs/configs/Permission-Groups.html
@@ -326,7 +326,7 @@
generated by LDoc
diff --git a/docs/configs/Player-List.html b/docs/configs/Player-List.html
index 441842f2..30f5e46e 100644
--- a/docs/configs/Player-List.html
+++ b/docs/configs/Player-List.html
@@ -725,7 +725,7 @@
generated by LDoc
diff --git a/docs/configs/Pollution-Grading.html b/docs/configs/Pollution-Grading.html
index 69697034..b2326047 100644
--- a/docs/configs/Pollution-Grading.html
+++ b/docs/configs/Pollution-Grading.html
@@ -415,7 +415,7 @@
generated by LDoc
diff --git a/docs/configs/Popup-Messages.html b/docs/configs/Popup-Messages.html
index 7b5efa5c..0f1af775 100644
--- a/docs/configs/Popup-Messages.html
+++ b/docs/configs/Popup-Messages.html
@@ -445,7 +445,7 @@
generated by LDoc
diff --git a/docs/configs/Preset-Player-Colours.html b/docs/configs/Preset-Player-Colours.html
index 66e1210e..99d22cb0 100644
--- a/docs/configs/Preset-Player-Colours.html
+++ b/docs/configs/Preset-Player-Colours.html
@@ -355,7 +355,7 @@
generated by LDoc
diff --git a/docs/configs/Preset-Player-Quickbar.html b/docs/configs/Preset-Player-Quickbar.html
index 3ea8bb61..13d14e20 100644
--- a/docs/configs/Preset-Player-Quickbar.html
+++ b/docs/configs/Preset-Player-Quickbar.html
@@ -268,7 +268,7 @@
generated by LDoc
diff --git a/docs/configs/Repair.html b/docs/configs/Repair.html
index 55246310..0fc8a5bb 100644
--- a/docs/configs/Repair.html
+++ b/docs/configs/Repair.html
@@ -445,7 +445,7 @@
generated by LDoc
diff --git a/docs/configs/Rockets.html b/docs/configs/Rockets.html
index e523b465..4bcf97f1 100644
--- a/docs/configs/Rockets.html
+++ b/docs/configs/Rockets.html
@@ -865,7 +865,7 @@
generated by LDoc
diff --git a/docs/configs/Roles.html b/docs/configs/Roles.html
index 2e0e3a8a..39db89da 100644
--- a/docs/configs/Roles.html
+++ b/docs/configs/Roles.html
@@ -351,7 +351,7 @@
generated by LDoc
diff --git a/docs/configs/Science.html b/docs/configs/Science.html
index b515fbae..b2118166 100644
--- a/docs/configs/Science.html
+++ b/docs/configs/Science.html
@@ -385,7 +385,7 @@
generated by LDoc
diff --git a/docs/configs/Scorched-Earth.html b/docs/configs/Scorched-Earth.html
index 1ad0f7bb..a02ebb28 100644
--- a/docs/configs/Scorched-Earth.html
+++ b/docs/configs/Scorched-Earth.html
@@ -419,7 +419,7 @@
generated by LDoc
diff --git a/docs/configs/Spawn-Area.html b/docs/configs/Spawn-Area.html
index dfe2115a..809f6d45 100644
--- a/docs/configs/Spawn-Area.html
+++ b/docs/configs/Spawn-Area.html
@@ -1226,7 +1226,7 @@
generated by LDoc
diff --git a/docs/configs/Statistics.html b/docs/configs/Statistics.html
index c1004e20..d0d0f056 100644
--- a/docs/configs/Statistics.html
+++ b/docs/configs/Statistics.html
@@ -685,7 +685,7 @@
generated by LDoc
diff --git a/docs/configs/Tasks.html b/docs/configs/Tasks.html
index bc50abc6..174d633b 100644
--- a/docs/configs/Tasks.html
+++ b/docs/configs/Tasks.html
@@ -415,7 +415,7 @@
generated by LDoc
diff --git a/docs/configs/Warnings.html b/docs/configs/Warnings.html
index da3696c5..053085d6 100644
--- a/docs/configs/Warnings.html
+++ b/docs/configs/Warnings.html
@@ -386,7 +386,7 @@
generated by LDoc
diff --git a/docs/configs/Warps.html b/docs/configs/Warps.html
index 613767f3..fc43763a 100644
--- a/docs/configs/Warps.html
+++ b/docs/configs/Warps.html
@@ -775,7 +775,7 @@
generated by LDoc
diff --git a/docs/configs/inventory_clear.html b/docs/configs/inventory_clear.html
index 6bf1af59..9bbf2f90 100644
--- a/docs/configs/inventory_clear.html
+++ b/docs/configs/inventory_clear.html
@@ -268,7 +268,7 @@
generated by LDoc
diff --git a/docs/control/Jail.html b/docs/control/Jail.html
index 6392f6a2..6e2ffe4b 100644
--- a/docs/control/Jail.html
+++ b/docs/control/Jail.html
@@ -806,7 +806,7 @@
generated by LDoc
diff --git a/docs/control/Production.html b/docs/control/Production.html
index 8f6a6db1..86749654 100644
--- a/docs/control/Production.html
+++ b/docs/control/Production.html
@@ -1360,7 +1360,7 @@
generated by LDoc
diff --git a/docs/control/Protection.html b/docs/control/Protection.html
index 18f632ba..33a255e0 100644
--- a/docs/control/Protection.html
+++ b/docs/control/Protection.html
@@ -1032,7 +1032,7 @@
generated by LDoc
diff --git a/docs/control/Reports.html b/docs/control/Reports.html
index 55d458c9..940e08de 100644
--- a/docs/control/Reports.html
+++ b/docs/control/Reports.html
@@ -1173,7 +1173,7 @@
generated by LDoc
diff --git a/docs/control/Rockets.html b/docs/control/Rockets.html
index f3e9b775..bc4f1972 100644
--- a/docs/control/Rockets.html
+++ b/docs/control/Rockets.html
@@ -1015,7 +1015,7 @@
generated by LDoc
diff --git a/docs/control/Selection.html b/docs/control/Selection.html
index c03bdab1..dff9e45d 100644
--- a/docs/control/Selection.html
+++ b/docs/control/Selection.html
@@ -922,7 +922,7 @@
generated by LDoc
diff --git a/docs/control/Tasks.html b/docs/control/Tasks.html
index 6962302c..c49480e6 100644
--- a/docs/control/Tasks.html
+++ b/docs/control/Tasks.html
@@ -1016,7 +1016,7 @@ Tasks.update_task(task_id, 'We need more iron!', gam
generated by LDoc
diff --git a/docs/control/Warnings.html b/docs/control/Warnings.html
index f4a9b14b..f57c27fd 100644
--- a/docs/control/Warnings.html
+++ b/docs/control/Warnings.html
@@ -1556,7 +1556,7 @@
generated by LDoc
diff --git a/docs/control/Warps.html b/docs/control/Warps.html
index 825f57a4..7148df76 100644
--- a/docs/control/Warps.html
+++ b/docs/control/Warps.html
@@ -1538,7 +1538,7 @@ Warps.make_warp_tag(warp_id)
generated by LDoc
diff --git a/docs/core/Async.html b/docs/core/Async.html
index fec3f932..b0e2d872 100644
--- a/docs/core/Async.html
+++ b/docs/core/Async.html
@@ -629,7 +629,7 @@ Async.register(function(player, message)
generated by LDoc
diff --git a/docs/core/Commands.html b/docs/core/Commands.html
index b641bbde..0d68a436 100644
--- a/docs/core/Commands.html
+++ b/docs/core/Commands.html
@@ -2444,7 +2444,7 @@ nb: use error(error_message) within your callback to trigger do not trigger dire
generated by LDoc
diff --git a/docs/core/Common.html b/docs/core/Common.html
index b8b70fdf..bff64e2f 100644
--- a/docs/core/Common.html
+++ b/docs/core/Common.html
@@ -2919,7 +2919,7 @@ https://github.com/Refactorio/RedMew/blob/9184b2940f311d8c9c891e83429fc57ec7e0c4
generated by LDoc
diff --git a/docs/core/Datastore.html b/docs/core/Datastore.html
index dda70c82..999b7ba4 100644
--- a/docs/core/Datastore.html
+++ b/docs/core/Datastore.html
@@ -2980,7 +2980,7 @@ ExampleData:on_update(function(key, value)
generated by LDoc
diff --git a/docs/core/External.html b/docs/core/External.html
index ef97774f..e5b10adb 100644
--- a/docs/core/External.html
+++ b/docs/core/External.html
@@ -764,7 +764,7 @@
generated by LDoc
diff --git a/docs/core/Groups.html b/docs/core/Groups.html
index 524db0d0..60c3c50d 100644
--- a/docs/core/Groups.html
+++ b/docs/core/Groups.html
@@ -1459,7 +1459,7 @@
generated by LDoc
diff --git a/docs/core/Gui.html b/docs/core/Gui.html
index 4a9ba07e..5d59cd5b 100644
--- a/docs/core/Gui.html
+++ b/docs/core/Gui.html
@@ -4437,7 +4437,7 @@ Gui.left_toolbar_button('entity/inserter', generated by LDoc
diff --git a/docs/core/PlayerData.html b/docs/core/PlayerData.html
index b2a52341..a3cc9bc8 100644
--- a/docs/core/PlayerData.html
+++ b/docs/core/PlayerData.html
@@ -547,7 +547,7 @@
generated by LDoc
diff --git a/docs/core/Roles.html b/docs/core/Roles.html
index a267b62b..46d9e77c 100644
--- a/docs/core/Roles.html
+++ b/docs/core/Roles.html
@@ -3407,7 +3407,7 @@ nb: this is one way, failing false after already gaining the role will not revok
generated by LDoc
diff --git a/docs/data/Alt-View.html b/docs/data/Alt-View.html
index ac88368f..1890cdb1 100644
--- a/docs/data/Alt-View.html
+++ b/docs/data/Alt-View.html
@@ -351,7 +351,7 @@
generated by LDoc
diff --git a/docs/data/Bonus.html b/docs/data/Bonus.html
index 6f268e81..639d8a5d 100644
--- a/docs/data/Bonus.html
+++ b/docs/data/Bonus.html
@@ -503,7 +503,7 @@
generated by LDoc
diff --git a/docs/data/Greetings.html b/docs/data/Greetings.html
index 57c5bfbf..4cccc460 100644
--- a/docs/data/Greetings.html
+++ b/docs/data/Greetings.html
@@ -446,7 +446,7 @@
generated by LDoc
diff --git a/docs/data/Player-Colours.html b/docs/data/Player-Colours.html
index 052b57c3..d22e7ab3 100644
--- a/docs/data/Player-Colours.html
+++ b/docs/data/Player-Colours.html
@@ -407,7 +407,7 @@
generated by LDoc
diff --git a/docs/data/Quickbar.html b/docs/data/Quickbar.html
index 77cffcc2..3a820644 100644
--- a/docs/data/Quickbar.html
+++ b/docs/data/Quickbar.html
@@ -424,7 +424,7 @@
generated by LDoc
diff --git a/docs/data/Tag.html b/docs/data/Tag.html
index ad600488..dfd58689 100644
--- a/docs/data/Tag.html
+++ b/docs/data/Tag.html
@@ -556,7 +556,7 @@
generated by LDoc
diff --git a/docs/guis/Autofill.html b/docs/guis/Autofill.html
index 10524159..2bd3b36b 100644
--- a/docs/guis/Autofill.html
+++ b/docs/guis/Autofill.html
@@ -608,7 +608,7 @@
generated by LDoc
diff --git a/docs/guis/Player-List.html b/docs/guis/Player-List.html
index 57a72d56..e2ddcef4 100644
--- a/docs/guis/Player-List.html
+++ b/docs/guis/Player-List.html
@@ -722,7 +722,7 @@
generated by LDoc
diff --git a/docs/guis/Readme.html b/docs/guis/Readme.html
index 097717d9..213796e8 100644
--- a/docs/guis/Readme.html
+++ b/docs/guis/Readme.html
@@ -1014,7 +1014,7 @@
generated by LDoc
diff --git a/docs/guis/Rocket-Info.html b/docs/guis/Rocket-Info.html
index 3fd91bfd..6b1a5df1 100644
--- a/docs/guis/Rocket-Info.html
+++ b/docs/guis/Rocket-Info.html
@@ -722,7 +722,7 @@
generated by LDoc
diff --git a/docs/guis/Science-Info.html b/docs/guis/Science-Info.html
index 8faed8f0..9a27816d 100644
--- a/docs/guis/Science-Info.html
+++ b/docs/guis/Science-Info.html
@@ -601,7 +601,7 @@
generated by LDoc
diff --git a/docs/guis/Task-List.html b/docs/guis/Task-List.html
index e8876483..3219e0a1 100644
--- a/docs/guis/Task-List.html
+++ b/docs/guis/Task-List.html
@@ -1125,7 +1125,7 @@
generated by LDoc
diff --git a/docs/guis/Warps-List.html b/docs/guis/Warps-List.html
index 80f92547..fc195f61 100644
--- a/docs/guis/Warps-List.html
+++ b/docs/guis/Warps-List.html
@@ -1091,7 +1091,7 @@
generated by LDoc
diff --git a/docs/guis/server-ups.html b/docs/guis/server-ups.html
index 6093c058..e04b81dc 100644
--- a/docs/guis/server-ups.html
+++ b/docs/guis/server-ups.html
@@ -524,7 +524,7 @@
generated by LDoc
diff --git a/docs/index.html b/docs/index.html
index 75cbcdc8..01489126 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -622,7 +622,7 @@ Events.set_event_filter(defines.events.on_built_entity, {{filter = "name", name
generated by LDoc
diff --git a/docs/modules/control.html b/docs/modules/control.html
index c653c9e4..bd768fa2 100644
--- a/docs/modules/control.html
+++ b/docs/modules/control.html
@@ -271,7 +271,7 @@
generated by LDoc
diff --git a/docs/modules/modules.addons.station-auto-name.html b/docs/modules/modules.addons.station-auto-name.html
index 585e2ed1..c4163e5a 100644
--- a/docs/modules/modules.addons.station-auto-name.html
+++ b/docs/modules/modules.addons.station-auto-name.html
@@ -324,7 +324,7 @@ Events.set_event_filter(defines.events.on_built_entity, {{filter = "name", name
generated by LDoc
diff --git a/docs/modules/overrides.debug.html b/docs/modules/overrides.debug.html
index bb823bdc..60e1ee21 100644
--- a/docs/modules/overrides.debug.html
+++ b/docs/modules/overrides.debug.html
@@ -685,7 +685,7 @@
generated by LDoc
diff --git a/docs/modules/overrides.math.html b/docs/modules/overrides.math.html
index 716aff4b..797dfb52 100644
--- a/docs/modules/overrides.math.html
+++ b/docs/modules/overrides.math.html
@@ -384,7 +384,7 @@
generated by LDoc
diff --git a/docs/modules/overrides.table.html b/docs/modules/overrides.table.html
index 06da4a09..5a56dacc 100644
--- a/docs/modules/overrides.table.html
+++ b/docs/modules/overrides.table.html
@@ -2039,7 +2039,7 @@
generated by LDoc
diff --git a/docs/modules/utils.event.html b/docs/modules/utils.event.html
index 46540441..53354b54 100644
--- a/docs/modules/utils.event.html
+++ b/docs/modules/utils.event.html
@@ -1323,7 +1323,7 @@
generated by LDoc
diff --git a/docs/modules/utils.event_core.html b/docs/modules/utils.event_core.html
index 1aa0abfc..f801ec57 100644
--- a/docs/modules/utils.event_core.html
+++ b/docs/modules/utils.event_core.html
@@ -465,7 +465,7 @@
generated by LDoc
diff --git a/docs/modules/utils.task.html b/docs/modules/utils.task.html
index b84c0e24..e592144e 100644
--- a/docs/modules/utils.task.html
+++ b/docs/modules/utils.task.html
@@ -682,7 +682,7 @@
generated by LDoc
diff --git a/docs/topics/LICENSE.html b/docs/topics/LICENSE.html
index cf48ae39..0faeeef0 100644
--- a/docs/topics/LICENSE.html
+++ b/docs/topics/LICENSE.html
@@ -820,7 +820,7 @@ Public License instead of this License. But first, please read
generated by LDoc
diff --git a/docs/topics/README.md.html b/docs/topics/README.md.html
index ab518531..a36eadbc 100644
--- a/docs/topics/README.md.html
+++ b/docs/topics/README.md.html
@@ -380,7 +380,7 @@
generated by LDoc
From 6f8a9381b115bc688b5437077d145cc54c011ca9 Mon Sep 17 00:00:00 2001
From: Cooldude2606 <25043174+Cooldude2606@users.noreply.github.com>
Date: Sun, 23 Oct 2022 19:01:37 +0000
Subject: [PATCH 073/129] Automatic Doc Update
---
docs/addons/Advanced-Start.html | 2 +-
docs/addons/Chat-Popups.html | 2 +-
docs/addons/Chat-Reply.html | 2 +-
docs/addons/Compilatron.html | 2 +-
docs/addons/Damage-Popups.html | 2 +-
docs/addons/Death-Logger.html | 2 +-
docs/addons/Deconlog.html | 2 +-
docs/addons/Discord-Alerts.html | 2 +-
docs/addons/FAGC.html | 2 +-
docs/addons/Inventory-Clear.html | 2 +-
docs/addons/Pollution-Grading.html | 2 +-
docs/addons/Scorched-Earth.html | 2 +-
docs/addons/Spawn-Area.html | 2 +-
docs/addons/Tree-Decon.html | 2 +-
docs/addons/afk-kick.html | 2 +-
docs/addons/protection-jail.html | 2 +-
docs/addons/report-jail.html | 2 +-
docs/commands/Admin-Chat.html | 2 +-
docs/commands/Admin-Markers.html | 2 +-
docs/commands/Cheat-Mode.html | 2 +-
docs/commands/Clear-Inventory.html | 2 +-
docs/commands/Connect.html | 2 +-
docs/commands/Debug.html | 2 +-
docs/commands/Find.html | 2 +-
docs/commands/Help.html | 2 +-
docs/commands/Home.html | 2 +-
docs/commands/Interface.html | 2 +-
docs/commands/InventorySearch.html | 2 +-
docs/commands/Jail.html | 2 +-
docs/commands/Kill.html | 2 +-
docs/commands/LastLocation.html | 2 +-
docs/commands/Me.html | 2 +-
docs/commands/Protection.html | 2 +-
docs/commands/Rainbow.html | 2 +-
docs/commands/Repair.html | 2 +-
docs/commands/Reports.html | 2 +-
docs/commands/Roles.html | 2 +-
docs/commands/Spawn.html | 2 +-
docs/commands/Spectate.html | 2 +-
docs/commands/Teleport.html | 2 +-
docs/commands/Warnings.html | 2 +-
docs/configs/Advanced-Start.html | 2 +-
docs/configs/Autofill.html | 2 +-
docs/configs/Bonuses.html | 2 +-
docs/configs/Chat-Reply.html | 2 +-
docs/configs/Commands-Auth-Admin.html | 2 +-
docs/configs/Commands-Auth-Roles.html | 2 +-
docs/configs/Commands-Auth-Runtime-Disable.html | 2 +-
docs/configs/Commands-Color-Parse.html | 2 +-
docs/configs/Commands-Parse-Roles.html | 2 +-
docs/configs/Commands-Parse.html | 2 +-
docs/configs/Compilatron.html | 2 +-
docs/configs/Death-Logger.html | 2 +-
docs/configs/Deconlog.html | 2 +-
docs/configs/Discord-Alerts.html | 2 +-
docs/configs/File-Loader.html | 2 +-
docs/configs/Permission-Groups.html | 2 +-
docs/configs/Player-List.html | 2 +-
docs/configs/Pollution-Grading.html | 2 +-
docs/configs/Popup-Messages.html | 2 +-
docs/configs/Preset-Player-Colours.html | 2 +-
docs/configs/Preset-Player-Quickbar.html | 2 +-
docs/configs/Repair.html | 2 +-
docs/configs/Rockets.html | 2 +-
docs/configs/Roles.html | 2 +-
docs/configs/Science.html | 2 +-
docs/configs/Scorched-Earth.html | 2 +-
docs/configs/Spawn-Area.html | 2 +-
docs/configs/Statistics.html | 2 +-
docs/configs/Tasks.html | 2 +-
docs/configs/Warnings.html | 2 +-
docs/configs/Warps.html | 2 +-
docs/configs/inventory_clear.html | 2 +-
docs/control/Jail.html | 2 +-
docs/control/Production.html | 2 +-
docs/control/Protection.html | 2 +-
docs/control/Reports.html | 2 +-
docs/control/Rockets.html | 2 +-
docs/control/Selection.html | 2 +-
docs/control/Tasks.html | 2 +-
docs/control/Warnings.html | 2 +-
docs/control/Warps.html | 2 +-
docs/core/Async.html | 2 +-
docs/core/Commands.html | 2 +-
docs/core/Common.html | 2 +-
docs/core/Datastore.html | 2 +-
docs/core/External.html | 2 +-
docs/core/Groups.html | 2 +-
docs/core/Gui.html | 2 +-
docs/core/PlayerData.html | 2 +-
docs/core/Roles.html | 2 +-
docs/data/Alt-View.html | 2 +-
docs/data/Bonus.html | 2 +-
docs/data/Greetings.html | 2 +-
docs/data/Player-Colours.html | 2 +-
docs/data/Quickbar.html | 2 +-
docs/data/Tag.html | 2 +-
docs/guis/Autofill.html | 2 +-
docs/guis/Player-List.html | 2 +-
docs/guis/Readme.html | 2 +-
docs/guis/Rocket-Info.html | 2 +-
docs/guis/Science-Info.html | 2 +-
docs/guis/Task-List.html | 2 +-
docs/guis/Warps-List.html | 2 +-
docs/guis/server-ups.html | 2 +-
docs/index.html | 2 +-
docs/modules/control.html | 2 +-
.../modules.addons.station-auto-name.html | 2 +-
docs/modules/overrides.debug.html | 2 +-
docs/modules/overrides.math.html | 2 +-
docs/modules/overrides.table.html | 2 +-
docs/modules/utils.event.html | 2 +-
docs/modules/utils.event_core.html | 2 +-
docs/modules/utils.task.html | 2 +-
docs/topics/LICENSE.html | 2 +-
docs/topics/README.md.html | 17 +++++++++--------
116 files changed, 124 insertions(+), 123 deletions(-)
diff --git a/docs/addons/Advanced-Start.html b/docs/addons/Advanced-Start.html
index fb4a5373..9081ff42 100644
--- a/docs/addons/Advanced-Start.html
+++ b/docs/addons/Advanced-Start.html
@@ -351,7 +351,7 @@
generated by LDoc
diff --git a/docs/addons/Chat-Popups.html b/docs/addons/Chat-Popups.html
index 840fbfb2..100117dd 100644
--- a/docs/addons/Chat-Popups.html
+++ b/docs/addons/Chat-Popups.html
@@ -380,7 +380,7 @@
generated by LDoc
diff --git a/docs/addons/Chat-Reply.html b/docs/addons/Chat-Reply.html
index 4287e624..f90314c6 100644
--- a/docs/addons/Chat-Reply.html
+++ b/docs/addons/Chat-Reply.html
@@ -379,7 +379,7 @@
generated by LDoc
diff --git a/docs/addons/Compilatron.html b/docs/addons/Compilatron.html
index d97c1dc3..78737f2a 100644
--- a/docs/addons/Compilatron.html
+++ b/docs/addons/Compilatron.html
@@ -588,7 +588,7 @@
generated by LDoc
diff --git a/docs/addons/Damage-Popups.html b/docs/addons/Damage-Popups.html
index 315de197..8d11c838 100644
--- a/docs/addons/Damage-Popups.html
+++ b/docs/addons/Damage-Popups.html
@@ -380,7 +380,7 @@
generated by LDoc
diff --git a/docs/addons/Death-Logger.html b/docs/addons/Death-Logger.html
index 7014f338..9047eaca 100644
--- a/docs/addons/Death-Logger.html
+++ b/docs/addons/Death-Logger.html
@@ -407,7 +407,7 @@
generated by LDoc
diff --git a/docs/addons/Deconlog.html b/docs/addons/Deconlog.html
index 1b6969f9..53d2e17b 100644
--- a/docs/addons/Deconlog.html
+++ b/docs/addons/Deconlog.html
@@ -379,7 +379,7 @@
generated by LDoc
diff --git a/docs/addons/Discord-Alerts.html b/docs/addons/Discord-Alerts.html
index e8d84e07..a4127937 100644
--- a/docs/addons/Discord-Alerts.html
+++ b/docs/addons/Discord-Alerts.html
@@ -491,7 +491,7 @@
generated by LDoc
diff --git a/docs/addons/FAGC.html b/docs/addons/FAGC.html
index 9c7ccfb8..2fc193bb 100644
--- a/docs/addons/FAGC.html
+++ b/docs/addons/FAGC.html
@@ -323,7 +323,7 @@
generated by LDoc
diff --git a/docs/addons/Inventory-Clear.html b/docs/addons/Inventory-Clear.html
index 7d88dae0..6dd62372 100644
--- a/docs/addons/Inventory-Clear.html
+++ b/docs/addons/Inventory-Clear.html
@@ -379,7 +379,7 @@
generated by LDoc
diff --git a/docs/addons/Pollution-Grading.html b/docs/addons/Pollution-Grading.html
index 951626e2..e07c3e8c 100644
--- a/docs/addons/Pollution-Grading.html
+++ b/docs/addons/Pollution-Grading.html
@@ -351,7 +351,7 @@
generated by LDoc
diff --git a/docs/addons/Scorched-Earth.html b/docs/addons/Scorched-Earth.html
index 41e913bf..dfdc237e 100644
--- a/docs/addons/Scorched-Earth.html
+++ b/docs/addons/Scorched-Earth.html
@@ -407,7 +407,7 @@
generated by LDoc
diff --git a/docs/addons/Spawn-Area.html b/docs/addons/Spawn-Area.html
index 587d2bfc..b509e457 100644
--- a/docs/addons/Spawn-Area.html
+++ b/docs/addons/Spawn-Area.html
@@ -379,7 +379,7 @@
generated by LDoc
diff --git a/docs/addons/Tree-Decon.html b/docs/addons/Tree-Decon.html
index 1e207029..6eee7409 100644
--- a/docs/addons/Tree-Decon.html
+++ b/docs/addons/Tree-Decon.html
@@ -435,7 +435,7 @@
generated by LDoc
diff --git a/docs/addons/afk-kick.html b/docs/addons/afk-kick.html
index 9b794cc2..e82dba4e 100644
--- a/docs/addons/afk-kick.html
+++ b/docs/addons/afk-kick.html
@@ -407,7 +407,7 @@
generated by LDoc
diff --git a/docs/addons/protection-jail.html b/docs/addons/protection-jail.html
index 4c4bdd4e..9e89f419 100644
--- a/docs/addons/protection-jail.html
+++ b/docs/addons/protection-jail.html
@@ -435,7 +435,7 @@
generated by LDoc
diff --git a/docs/addons/report-jail.html b/docs/addons/report-jail.html
index e660e7e1..fe5720df 100644
--- a/docs/addons/report-jail.html
+++ b/docs/addons/report-jail.html
@@ -407,7 +407,7 @@
generated by LDoc
diff --git a/docs/commands/Admin-Chat.html b/docs/commands/Admin-Chat.html
index 4065422a..709c9efc 100644
--- a/docs/commands/Admin-Chat.html
+++ b/docs/commands/Admin-Chat.html
@@ -419,7 +419,7 @@
generated by LDoc
diff --git a/docs/commands/Admin-Markers.html b/docs/commands/Admin-Markers.html
index 1c0faa63..b3bbc654 100644
--- a/docs/commands/Admin-Markers.html
+++ b/docs/commands/Admin-Markers.html
@@ -424,7 +424,7 @@
generated by LDoc
diff --git a/docs/commands/Cheat-Mode.html b/docs/commands/Cheat-Mode.html
index 2bc63ba5..8e1286dc 100644
--- a/docs/commands/Cheat-Mode.html
+++ b/docs/commands/Cheat-Mode.html
@@ -392,7 +392,7 @@
generated by LDoc
diff --git a/docs/commands/Clear-Inventory.html b/docs/commands/Clear-Inventory.html
index 85814887..7e7b5959 100644
--- a/docs/commands/Clear-Inventory.html
+++ b/docs/commands/Clear-Inventory.html
@@ -419,7 +419,7 @@
generated by LDoc
diff --git a/docs/commands/Connect.html b/docs/commands/Connect.html
index dd5898aa..89ea6172 100644
--- a/docs/commands/Connect.html
+++ b/docs/commands/Connect.html
@@ -622,7 +622,7 @@
generated by LDoc
diff --git a/docs/commands/Debug.html b/docs/commands/Debug.html
index 9905558a..1a3708a8 100644
--- a/docs/commands/Debug.html
+++ b/docs/commands/Debug.html
@@ -396,7 +396,7 @@
generated by LDoc
diff --git a/docs/commands/Find.html b/docs/commands/Find.html
index 093eca12..f5f78465 100644
--- a/docs/commands/Find.html
+++ b/docs/commands/Find.html
@@ -391,7 +391,7 @@
generated by LDoc
diff --git a/docs/commands/Help.html b/docs/commands/Help.html
index 3471d054..7ef2d028 100644
--- a/docs/commands/Help.html
+++ b/docs/commands/Help.html
@@ -435,7 +435,7 @@
generated by LDoc
diff --git a/docs/commands/Home.html b/docs/commands/Home.html
index 9c17220f..20e69ff7 100644
--- a/docs/commands/Home.html
+++ b/docs/commands/Home.html
@@ -489,7 +489,7 @@
generated by LDoc
diff --git a/docs/commands/Interface.html b/docs/commands/Interface.html
index b5de34ff..3e3559e6 100644
--- a/docs/commands/Interface.html
+++ b/docs/commands/Interface.html
@@ -419,7 +419,7 @@
generated by LDoc
diff --git a/docs/commands/InventorySearch.html b/docs/commands/InventorySearch.html
index 523e70ed..61f97418 100644
--- a/docs/commands/InventorySearch.html
+++ b/docs/commands/InventorySearch.html
@@ -609,7 +609,7 @@
generated by LDoc
diff --git a/docs/commands/Jail.html b/docs/commands/Jail.html
index e399aacc..f3e8a226 100644
--- a/docs/commands/Jail.html
+++ b/docs/commands/Jail.html
@@ -518,7 +518,7 @@
generated by LDoc
diff --git a/docs/commands/Kill.html b/docs/commands/Kill.html
index f8e69500..7ef0b2c8 100644
--- a/docs/commands/Kill.html
+++ b/docs/commands/Kill.html
@@ -420,7 +420,7 @@
generated by LDoc
diff --git a/docs/commands/LastLocation.html b/docs/commands/LastLocation.html
index 543b3919..d9aac4fe 100644
--- a/docs/commands/LastLocation.html
+++ b/docs/commands/LastLocation.html
@@ -419,7 +419,7 @@
generated by LDoc
diff --git a/docs/commands/Me.html b/docs/commands/Me.html
index e087f09c..6f645b68 100644
--- a/docs/commands/Me.html
+++ b/docs/commands/Me.html
@@ -391,7 +391,7 @@
generated by LDoc
diff --git a/docs/commands/Protection.html b/docs/commands/Protection.html
index 8e5c4783..06b50104 100644
--- a/docs/commands/Protection.html
+++ b/docs/commands/Protection.html
@@ -567,7 +567,7 @@
generated by LDoc
diff --git a/docs/commands/Rainbow.html b/docs/commands/Rainbow.html
index e6157038..c10f23c0 100644
--- a/docs/commands/Rainbow.html
+++ b/docs/commands/Rainbow.html
@@ -419,7 +419,7 @@
generated by LDoc
diff --git a/docs/commands/Repair.html b/docs/commands/Repair.html
index daec8634..b511d359 100644
--- a/docs/commands/Repair.html
+++ b/docs/commands/Repair.html
@@ -352,7 +352,7 @@
generated by LDoc
diff --git a/docs/commands/Reports.html b/docs/commands/Reports.html
index ca9b3020..12eb8c09 100644
--- a/docs/commands/Reports.html
+++ b/docs/commands/Reports.html
@@ -616,7 +616,7 @@
generated by LDoc
diff --git a/docs/commands/Roles.html b/docs/commands/Roles.html
index 98788fd2..ce841f95 100644
--- a/docs/commands/Roles.html
+++ b/docs/commands/Roles.html
@@ -588,7 +588,7 @@
generated by LDoc
diff --git a/docs/commands/Spawn.html b/docs/commands/Spawn.html
index 2053e47b..a105e0b1 100644
--- a/docs/commands/Spawn.html
+++ b/docs/commands/Spawn.html
@@ -420,7 +420,7 @@
generated by LDoc
diff --git a/docs/commands/Spectate.html b/docs/commands/Spectate.html
index 5166401d..be052565 100644
--- a/docs/commands/Spectate.html
+++ b/docs/commands/Spectate.html
@@ -450,7 +450,7 @@
generated by LDoc
diff --git a/docs/commands/Teleport.html b/docs/commands/Teleport.html
index eb73b9c4..2a4775b2 100644
--- a/docs/commands/Teleport.html
+++ b/docs/commands/Teleport.html
@@ -515,7 +515,7 @@
generated by LDoc
diff --git a/docs/commands/Warnings.html b/docs/commands/Warnings.html
index 4fcb47ef..df804f14 100644
--- a/docs/commands/Warnings.html
+++ b/docs/commands/Warnings.html
@@ -600,7 +600,7 @@
generated by LDoc
diff --git a/docs/configs/Advanced-Start.html b/docs/configs/Advanced-Start.html
index 3bad9faf..b60652e2 100644
--- a/docs/configs/Advanced-Start.html
+++ b/docs/configs/Advanced-Start.html
@@ -537,7 +537,7 @@
generated by LDoc
diff --git a/docs/configs/Autofill.html b/docs/configs/Autofill.html
index babc334d..498ee8e5 100644
--- a/docs/configs/Autofill.html
+++ b/docs/configs/Autofill.html
@@ -268,7 +268,7 @@
generated by LDoc
diff --git a/docs/configs/Bonuses.html b/docs/configs/Bonuses.html
index 2e062871..4a058003 100644
--- a/docs/configs/Bonuses.html
+++ b/docs/configs/Bonuses.html
@@ -268,7 +268,7 @@
generated by LDoc
diff --git a/docs/configs/Chat-Reply.html b/docs/configs/Chat-Reply.html
index 3d089f08..7a72cb5a 100644
--- a/docs/configs/Chat-Reply.html
+++ b/docs/configs/Chat-Reply.html
@@ -516,7 +516,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Auth-Admin.html b/docs/configs/Commands-Auth-Admin.html
index 178fc624..a4075dc7 100644
--- a/docs/configs/Commands-Auth-Admin.html
+++ b/docs/configs/Commands-Auth-Admin.html
@@ -325,7 +325,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Auth-Roles.html b/docs/configs/Commands-Auth-Roles.html
index e200d497..4b95cd78 100644
--- a/docs/configs/Commands-Auth-Roles.html
+++ b/docs/configs/Commands-Auth-Roles.html
@@ -351,7 +351,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Auth-Runtime-Disable.html b/docs/configs/Commands-Auth-Runtime-Disable.html
index 86405169..8069bd43 100644
--- a/docs/configs/Commands-Auth-Runtime-Disable.html
+++ b/docs/configs/Commands-Auth-Runtime-Disable.html
@@ -473,7 +473,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Color-Parse.html b/docs/configs/Commands-Color-Parse.html
index f8e53669..1ce5e3df 100644
--- a/docs/configs/Commands-Color-Parse.html
+++ b/docs/configs/Commands-Color-Parse.html
@@ -351,7 +351,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Parse-Roles.html b/docs/configs/Commands-Parse-Roles.html
index a8fde4f6..c866f655 100644
--- a/docs/configs/Commands-Parse-Roles.html
+++ b/docs/configs/Commands-Parse-Roles.html
@@ -385,7 +385,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Parse.html b/docs/configs/Commands-Parse.html
index 9bdd186c..bf5ad3e6 100644
--- a/docs/configs/Commands-Parse.html
+++ b/docs/configs/Commands-Parse.html
@@ -341,7 +341,7 @@ see ./expcore/commands.lua for more details
generated by LDoc
diff --git a/docs/configs/Compilatron.html b/docs/configs/Compilatron.html
index af06d897..5c151d9c 100644
--- a/docs/configs/Compilatron.html
+++ b/docs/configs/Compilatron.html
@@ -385,7 +385,7 @@
generated by LDoc
diff --git a/docs/configs/Death-Logger.html b/docs/configs/Death-Logger.html
index a3491bf8..d67ab59f 100644
--- a/docs/configs/Death-Logger.html
+++ b/docs/configs/Death-Logger.html
@@ -507,7 +507,7 @@
generated by LDoc
diff --git a/docs/configs/Deconlog.html b/docs/configs/Deconlog.html
index 7e73fe15..a959b926 100644
--- a/docs/configs/Deconlog.html
+++ b/docs/configs/Deconlog.html
@@ -475,7 +475,7 @@
generated by LDoc
diff --git a/docs/configs/Discord-Alerts.html b/docs/configs/Discord-Alerts.html
index 0e763f09..a56698c2 100644
--- a/docs/configs/Discord-Alerts.html
+++ b/docs/configs/Discord-Alerts.html
@@ -268,7 +268,7 @@
generated by LDoc
diff --git a/docs/configs/File-Loader.html b/docs/configs/File-Loader.html
index 7855fc87..efbb88d2 100644
--- a/docs/configs/File-Loader.html
+++ b/docs/configs/File-Loader.html
@@ -271,7 +271,7 @@
generated by LDoc
diff --git a/docs/configs/Permission-Groups.html b/docs/configs/Permission-Groups.html
index 36d3fe7a..9d380719 100644
--- a/docs/configs/Permission-Groups.html
+++ b/docs/configs/Permission-Groups.html
@@ -326,7 +326,7 @@
generated by LDoc
diff --git a/docs/configs/Player-List.html b/docs/configs/Player-List.html
index 30f5e46e..b8393982 100644
--- a/docs/configs/Player-List.html
+++ b/docs/configs/Player-List.html
@@ -725,7 +725,7 @@
generated by LDoc
diff --git a/docs/configs/Pollution-Grading.html b/docs/configs/Pollution-Grading.html
index b2326047..cde7b812 100644
--- a/docs/configs/Pollution-Grading.html
+++ b/docs/configs/Pollution-Grading.html
@@ -415,7 +415,7 @@
generated by LDoc
diff --git a/docs/configs/Popup-Messages.html b/docs/configs/Popup-Messages.html
index 0f1af775..942d7ad6 100644
--- a/docs/configs/Popup-Messages.html
+++ b/docs/configs/Popup-Messages.html
@@ -445,7 +445,7 @@
generated by LDoc
diff --git a/docs/configs/Preset-Player-Colours.html b/docs/configs/Preset-Player-Colours.html
index 99d22cb0..4b995630 100644
--- a/docs/configs/Preset-Player-Colours.html
+++ b/docs/configs/Preset-Player-Colours.html
@@ -355,7 +355,7 @@
generated by LDoc
diff --git a/docs/configs/Preset-Player-Quickbar.html b/docs/configs/Preset-Player-Quickbar.html
index 13d14e20..9c6ebe2d 100644
--- a/docs/configs/Preset-Player-Quickbar.html
+++ b/docs/configs/Preset-Player-Quickbar.html
@@ -268,7 +268,7 @@
generated by LDoc
diff --git a/docs/configs/Repair.html b/docs/configs/Repair.html
index 0fc8a5bb..7c3c5a6b 100644
--- a/docs/configs/Repair.html
+++ b/docs/configs/Repair.html
@@ -445,7 +445,7 @@
generated by LDoc
diff --git a/docs/configs/Rockets.html b/docs/configs/Rockets.html
index 4bcf97f1..7560dea4 100644
--- a/docs/configs/Rockets.html
+++ b/docs/configs/Rockets.html
@@ -865,7 +865,7 @@
generated by LDoc
diff --git a/docs/configs/Roles.html b/docs/configs/Roles.html
index 39db89da..c9e62c94 100644
--- a/docs/configs/Roles.html
+++ b/docs/configs/Roles.html
@@ -351,7 +351,7 @@
generated by LDoc
diff --git a/docs/configs/Science.html b/docs/configs/Science.html
index b2118166..35ad3af1 100644
--- a/docs/configs/Science.html
+++ b/docs/configs/Science.html
@@ -385,7 +385,7 @@
generated by LDoc
diff --git a/docs/configs/Scorched-Earth.html b/docs/configs/Scorched-Earth.html
index a02ebb28..b2704003 100644
--- a/docs/configs/Scorched-Earth.html
+++ b/docs/configs/Scorched-Earth.html
@@ -419,7 +419,7 @@
generated by LDoc
diff --git a/docs/configs/Spawn-Area.html b/docs/configs/Spawn-Area.html
index 809f6d45..145ed0ea 100644
--- a/docs/configs/Spawn-Area.html
+++ b/docs/configs/Spawn-Area.html
@@ -1226,7 +1226,7 @@
generated by LDoc
diff --git a/docs/configs/Statistics.html b/docs/configs/Statistics.html
index d0d0f056..a5bdb0ef 100644
--- a/docs/configs/Statistics.html
+++ b/docs/configs/Statistics.html
@@ -685,7 +685,7 @@
generated by LDoc
diff --git a/docs/configs/Tasks.html b/docs/configs/Tasks.html
index 174d633b..46603a64 100644
--- a/docs/configs/Tasks.html
+++ b/docs/configs/Tasks.html
@@ -415,7 +415,7 @@
generated by LDoc
diff --git a/docs/configs/Warnings.html b/docs/configs/Warnings.html
index 053085d6..78637310 100644
--- a/docs/configs/Warnings.html
+++ b/docs/configs/Warnings.html
@@ -386,7 +386,7 @@
generated by LDoc
diff --git a/docs/configs/Warps.html b/docs/configs/Warps.html
index fc43763a..a5138904 100644
--- a/docs/configs/Warps.html
+++ b/docs/configs/Warps.html
@@ -775,7 +775,7 @@
generated by LDoc
diff --git a/docs/configs/inventory_clear.html b/docs/configs/inventory_clear.html
index 9bbf2f90..729937c1 100644
--- a/docs/configs/inventory_clear.html
+++ b/docs/configs/inventory_clear.html
@@ -268,7 +268,7 @@
generated by LDoc
diff --git a/docs/control/Jail.html b/docs/control/Jail.html
index 6e2ffe4b..50e4293f 100644
--- a/docs/control/Jail.html
+++ b/docs/control/Jail.html
@@ -806,7 +806,7 @@
generated by LDoc
diff --git a/docs/control/Production.html b/docs/control/Production.html
index 86749654..5fb6be79 100644
--- a/docs/control/Production.html
+++ b/docs/control/Production.html
@@ -1360,7 +1360,7 @@
generated by LDoc
diff --git a/docs/control/Protection.html b/docs/control/Protection.html
index 33a255e0..55841802 100644
--- a/docs/control/Protection.html
+++ b/docs/control/Protection.html
@@ -1032,7 +1032,7 @@
generated by LDoc
diff --git a/docs/control/Reports.html b/docs/control/Reports.html
index 940e08de..ade2e462 100644
--- a/docs/control/Reports.html
+++ b/docs/control/Reports.html
@@ -1173,7 +1173,7 @@
generated by LDoc
diff --git a/docs/control/Rockets.html b/docs/control/Rockets.html
index bc4f1972..3ecc71a6 100644
--- a/docs/control/Rockets.html
+++ b/docs/control/Rockets.html
@@ -1015,7 +1015,7 @@
generated by LDoc
diff --git a/docs/control/Selection.html b/docs/control/Selection.html
index dff9e45d..84cfe0ca 100644
--- a/docs/control/Selection.html
+++ b/docs/control/Selection.html
@@ -922,7 +922,7 @@
generated by LDoc
diff --git a/docs/control/Tasks.html b/docs/control/Tasks.html
index c49480e6..8e325deb 100644
--- a/docs/control/Tasks.html
+++ b/docs/control/Tasks.html
@@ -1016,7 +1016,7 @@ Tasks.update_task(task_id, 'We need more iron!', gam
generated by LDoc
diff --git a/docs/control/Warnings.html b/docs/control/Warnings.html
index f57c27fd..9499e232 100644
--- a/docs/control/Warnings.html
+++ b/docs/control/Warnings.html
@@ -1556,7 +1556,7 @@
generated by LDoc
diff --git a/docs/control/Warps.html b/docs/control/Warps.html
index 7148df76..77704b43 100644
--- a/docs/control/Warps.html
+++ b/docs/control/Warps.html
@@ -1538,7 +1538,7 @@ Warps.make_warp_tag(warp_id)
generated by LDoc
diff --git a/docs/core/Async.html b/docs/core/Async.html
index b0e2d872..c1766c2f 100644
--- a/docs/core/Async.html
+++ b/docs/core/Async.html
@@ -629,7 +629,7 @@ Async.register(function(player, message)
generated by LDoc
diff --git a/docs/core/Commands.html b/docs/core/Commands.html
index 0d68a436..1a57e46f 100644
--- a/docs/core/Commands.html
+++ b/docs/core/Commands.html
@@ -2444,7 +2444,7 @@ nb: use error(error_message) within your callback to trigger do not trigger dire
generated by LDoc
diff --git a/docs/core/Common.html b/docs/core/Common.html
index bff64e2f..906cc524 100644
--- a/docs/core/Common.html
+++ b/docs/core/Common.html
@@ -2919,7 +2919,7 @@ https://github.com/Refactorio/RedMew/blob/9184b2940f311d8c9c891e83429fc57ec7e0c4
generated by LDoc
diff --git a/docs/core/Datastore.html b/docs/core/Datastore.html
index 999b7ba4..d8780040 100644
--- a/docs/core/Datastore.html
+++ b/docs/core/Datastore.html
@@ -2980,7 +2980,7 @@ ExampleData:on_update(function(key, value)
generated by LDoc
diff --git a/docs/core/External.html b/docs/core/External.html
index e5b10adb..6ca7bf0f 100644
--- a/docs/core/External.html
+++ b/docs/core/External.html
@@ -764,7 +764,7 @@
generated by LDoc
diff --git a/docs/core/Groups.html b/docs/core/Groups.html
index 60c3c50d..395ecf69 100644
--- a/docs/core/Groups.html
+++ b/docs/core/Groups.html
@@ -1459,7 +1459,7 @@
generated by LDoc
diff --git a/docs/core/Gui.html b/docs/core/Gui.html
index 5d59cd5b..79c99405 100644
--- a/docs/core/Gui.html
+++ b/docs/core/Gui.html
@@ -4437,7 +4437,7 @@ Gui.left_toolbar_button('entity/inserter', generated by LDoc
diff --git a/docs/core/PlayerData.html b/docs/core/PlayerData.html
index a3cc9bc8..5137e4ca 100644
--- a/docs/core/PlayerData.html
+++ b/docs/core/PlayerData.html
@@ -547,7 +547,7 @@
generated by LDoc
diff --git a/docs/core/Roles.html b/docs/core/Roles.html
index 46d9e77c..a79226b6 100644
--- a/docs/core/Roles.html
+++ b/docs/core/Roles.html
@@ -3407,7 +3407,7 @@ nb: this is one way, failing false after already gaining the role will not revok
generated by LDoc
diff --git a/docs/data/Alt-View.html b/docs/data/Alt-View.html
index 1890cdb1..5fffa609 100644
--- a/docs/data/Alt-View.html
+++ b/docs/data/Alt-View.html
@@ -351,7 +351,7 @@
generated by LDoc
diff --git a/docs/data/Bonus.html b/docs/data/Bonus.html
index 639d8a5d..38a65c29 100644
--- a/docs/data/Bonus.html
+++ b/docs/data/Bonus.html
@@ -503,7 +503,7 @@
generated by LDoc
diff --git a/docs/data/Greetings.html b/docs/data/Greetings.html
index 4cccc460..f495efc7 100644
--- a/docs/data/Greetings.html
+++ b/docs/data/Greetings.html
@@ -446,7 +446,7 @@
generated by LDoc
diff --git a/docs/data/Player-Colours.html b/docs/data/Player-Colours.html
index d22e7ab3..8e44a68c 100644
--- a/docs/data/Player-Colours.html
+++ b/docs/data/Player-Colours.html
@@ -407,7 +407,7 @@
generated by LDoc
diff --git a/docs/data/Quickbar.html b/docs/data/Quickbar.html
index 3a820644..92ff99da 100644
--- a/docs/data/Quickbar.html
+++ b/docs/data/Quickbar.html
@@ -424,7 +424,7 @@
generated by LDoc
diff --git a/docs/data/Tag.html b/docs/data/Tag.html
index dfd58689..667d7d09 100644
--- a/docs/data/Tag.html
+++ b/docs/data/Tag.html
@@ -556,7 +556,7 @@
generated by LDoc
diff --git a/docs/guis/Autofill.html b/docs/guis/Autofill.html
index 2bd3b36b..35f6c456 100644
--- a/docs/guis/Autofill.html
+++ b/docs/guis/Autofill.html
@@ -608,7 +608,7 @@
generated by LDoc
diff --git a/docs/guis/Player-List.html b/docs/guis/Player-List.html
index e2ddcef4..7b7d87b2 100644
--- a/docs/guis/Player-List.html
+++ b/docs/guis/Player-List.html
@@ -722,7 +722,7 @@
generated by LDoc
diff --git a/docs/guis/Readme.html b/docs/guis/Readme.html
index 213796e8..4a9b6277 100644
--- a/docs/guis/Readme.html
+++ b/docs/guis/Readme.html
@@ -1014,7 +1014,7 @@
generated by LDoc
diff --git a/docs/guis/Rocket-Info.html b/docs/guis/Rocket-Info.html
index 6b1a5df1..2d9d085c 100644
--- a/docs/guis/Rocket-Info.html
+++ b/docs/guis/Rocket-Info.html
@@ -722,7 +722,7 @@
generated by LDoc
diff --git a/docs/guis/Science-Info.html b/docs/guis/Science-Info.html
index 9a27816d..9f44d043 100644
--- a/docs/guis/Science-Info.html
+++ b/docs/guis/Science-Info.html
@@ -601,7 +601,7 @@
generated by LDoc
diff --git a/docs/guis/Task-List.html b/docs/guis/Task-List.html
index 3219e0a1..ce8ec50a 100644
--- a/docs/guis/Task-List.html
+++ b/docs/guis/Task-List.html
@@ -1125,7 +1125,7 @@
generated by LDoc
diff --git a/docs/guis/Warps-List.html b/docs/guis/Warps-List.html
index fc195f61..65b50b01 100644
--- a/docs/guis/Warps-List.html
+++ b/docs/guis/Warps-List.html
@@ -1091,7 +1091,7 @@
generated by LDoc
diff --git a/docs/guis/server-ups.html b/docs/guis/server-ups.html
index e04b81dc..1681bfd8 100644
--- a/docs/guis/server-ups.html
+++ b/docs/guis/server-ups.html
@@ -524,7 +524,7 @@
generated by LDoc
diff --git a/docs/index.html b/docs/index.html
index 01489126..fc63e5ca 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -622,7 +622,7 @@ Events.set_event_filter(defines.events.on_built_entity, {{filter = "name", name
generated by LDoc
diff --git a/docs/modules/control.html b/docs/modules/control.html
index bd768fa2..04bb4585 100644
--- a/docs/modules/control.html
+++ b/docs/modules/control.html
@@ -271,7 +271,7 @@
generated by LDoc
diff --git a/docs/modules/modules.addons.station-auto-name.html b/docs/modules/modules.addons.station-auto-name.html
index c4163e5a..b60a4fc7 100644
--- a/docs/modules/modules.addons.station-auto-name.html
+++ b/docs/modules/modules.addons.station-auto-name.html
@@ -324,7 +324,7 @@ Events.set_event_filter(defines.events.on_built_entity, {{filter = "name", name
generated by LDoc
diff --git a/docs/modules/overrides.debug.html b/docs/modules/overrides.debug.html
index 60e1ee21..5ede674e 100644
--- a/docs/modules/overrides.debug.html
+++ b/docs/modules/overrides.debug.html
@@ -685,7 +685,7 @@
generated by LDoc
diff --git a/docs/modules/overrides.math.html b/docs/modules/overrides.math.html
index 797dfb52..65d6fec9 100644
--- a/docs/modules/overrides.math.html
+++ b/docs/modules/overrides.math.html
@@ -384,7 +384,7 @@
generated by LDoc
diff --git a/docs/modules/overrides.table.html b/docs/modules/overrides.table.html
index 5a56dacc..46da4e32 100644
--- a/docs/modules/overrides.table.html
+++ b/docs/modules/overrides.table.html
@@ -2039,7 +2039,7 @@
generated by LDoc
diff --git a/docs/modules/utils.event.html b/docs/modules/utils.event.html
index 53354b54..6e71ca84 100644
--- a/docs/modules/utils.event.html
+++ b/docs/modules/utils.event.html
@@ -1323,7 +1323,7 @@
generated by LDoc
diff --git a/docs/modules/utils.event_core.html b/docs/modules/utils.event_core.html
index f801ec57..08badf4c 100644
--- a/docs/modules/utils.event_core.html
+++ b/docs/modules/utils.event_core.html
@@ -465,7 +465,7 @@
generated by LDoc
diff --git a/docs/modules/utils.task.html b/docs/modules/utils.task.html
index e592144e..c3a41e9c 100644
--- a/docs/modules/utils.task.html
+++ b/docs/modules/utils.task.html
@@ -682,7 +682,7 @@
generated by LDoc
diff --git a/docs/topics/LICENSE.html b/docs/topics/LICENSE.html
index 0faeeef0..3dafd4c2 100644
--- a/docs/topics/LICENSE.html
+++ b/docs/topics/LICENSE.html
@@ -820,7 +820,7 @@ Public License instead of this License. But first, please read
generated by LDoc
diff --git a/docs/topics/README.md.html b/docs/topics/README.md.html
index a36eadbc..ec26cde0 100644
--- a/docs/topics/README.md.html
+++ b/docs/topics/README.md.html
@@ -259,20 +259,20 @@
ExpGaming Scenario Repository
## Explosive Gaming
-
Explosive Gaming (often ExpGaming) is a server hosting community with a strong focus on [Factorio](factorio) and games with similar themes. We are best known for our weekly reset Factorio server with a vanilla+ scenario. Although our servers tend to attract the more experienced players, our servers are open to everyone. You can find us through our [website], [discord], or the public server list with the name ExpGaming.
+
Explosive Gaming (often ExpGaming) is a server hosting community with a strong focus on [Factorio][factorio] and games with similar themes. We are best known for our weekly reset Factorio server with a vanilla+ scenario. Although our servers tend to attract the more experienced players, our servers are open to everyone. You can find us through our [website], [discord], or the public server list with the name ExpGaming.
## Use and Installation
-
1) Download our [git repository](stable-dl) for the stable release. For the latest features you can download our [dev branch](experimental-dl). See [releases](#releases) for other major releases.
+
1) Download our [git repository][stable-dl] for the stable release. For the latest features you can download our [dev branch][experimental-dl]. See [releases](#releases) for other major releases.
2) Extract the downloaded zip file into your Factorio scenario directory:
* Windows: `%appdata%\Factorio\scenarios`
* Linux: `~/.factorio/scenarios`
3) Within the scenario you can find `./config/_file_loader.lua` which contains a list of all the modules which will be loaded by the scenario. Comment out (or remove) features you do not want. Be aware modules may load other modules as dependencies even when removed from the list.
4) More advanced users can adjust other configs files within `./config` but please be aware some files will require a basic understanding of lua.
5) Once you have made your config changes: open Factorio, select either single or multiplayer, select (host) new game, and finally select our scenario which will be called `scenario-master` or `scenario-dev` under user scenarios.
-
6) You will now be asked to generate your map and the scenario will load all selected modules. If any module does not load as expected please check `factorio-current.log` in your Factorio directory for errors and report them to our [issues page](issues).
+
6) You will now be asked to generate your map and the scenario will load all selected modules. If any module does not load as expected please check `factorio-current.log` in your Factorio directory for errors and report them to our [issues page][issues].
## Contributing
All are welcome to make bug reports, feature requests, and pull requests for our scenario. We do not require you to have any lua or coding knowledge to make bug reports and feature requests. If you have any questions ask us in our [discord].
For developers wanting to add features please follow these guidelines:
-
* All code is documented using ldoc, the end result can be found [here](docs).
+
* All code is documented using ldoc, the end result can be found [here][docs].
* Changes should be made on your own fork and merged into `dev` through a pull request.
* Pull requests are automatically linted and documentation checked.
* Pull requests are manually reviewed to maintain code and language quality.
@@ -300,7 +300,7 @@
| [2.0][s2.0] | Localization and clean up | [0.15][f0.15] |
| [1.0][s1.0] | Modulation | [0.15][f0.15] |
| [0.1][s0.1] | First Tracked Version | [0.14][f0.14] |
-
\* Scenario patch releases have been omitted and can be found [here](https://github.com/explosivegaming/scenario/releases).
+
\* Scenario patch releases have been omitted and can be found [here][releases].
\*\* Factorio versions show the version they were made for, often the minimum requirement to run the scenario.
From b94f008061f79a64043731bc53825c5569d2c7cd Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Mon, 24 Oct 2022 12:57:34 +0900
Subject: [PATCH 074/129] Update data.cfg
---
locale/zh-TW/data.cfg | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/locale/zh-TW/data.cfg b/locale/zh-TW/data.cfg
index 4eed67f7..1e8b1b10 100644
--- a/locale/zh-TW/data.cfg
+++ b/locale/zh-TW/data.cfg
@@ -14,12 +14,12 @@ Warnings-value-tooltip=你所有收到的警告
Colour=顏色
Colour-tooltip=你的人物顏色
Colour-value-tooltip=使用 /color 來更換你的人物顏色
-JoinMessage=Join Message
-JoinMessage-tooltip=The message displayed when you join
-JoinMessage-value-tooltip=Change by using /join-message
-QuickbarFilters=Quickbar Filters
-QuickbarFilters-tooltip=The filters on your quickbar
-QuickbarFilters-value-tooltip=Change by using /save-quickbar
+JoinMessage=加入信息
+JoinMessage-tooltip=你加入時所顯示的信息
+JoinMessage-value-tooltip=使用 /join-message 來更換加入信息
+QuickbarFilters=快捷欄
+QuickbarFilters-tooltip=快捷欄的選項
+QuickbarFilters-value-tooltip=使用 /save-quickbar 來更換快捷欄的選項
UsesAlt=Alt View
UsesAlt-tooltip=Whether you use alt view when you play
UsesAlt-value-tooltip=Change by pressing __CONTROL__show-info__
From 714598edeb1c1221a64b453c757e20d60c347009 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Mon, 24 Oct 2022 13:05:52 +0900
Subject: [PATCH 075/129] Update data.cfg
---
locale/zh-TW/data.cfg | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/locale/zh-TW/data.cfg b/locale/zh-TW/data.cfg
index 1e8b1b10..68f1d14c 100644
--- a/locale/zh-TW/data.cfg
+++ b/locale/zh-TW/data.cfg
@@ -20,12 +20,12 @@ JoinMessage-value-tooltip=使用 /join-message 來更換加入信息
QuickbarFilters=快捷欄
QuickbarFilters-tooltip=快捷欄的選項
QuickbarFilters-value-tooltip=使用 /save-quickbar 來更換快捷欄的選項
-UsesAlt=Alt View
-UsesAlt-tooltip=Whether you use alt view when you play
-UsesAlt-value-tooltip=Change by pressing __CONTROL__show-info__
-UsesServerUps=Server UPS
-UsesServerUps-tooltip=Whether the current server UPS is shown
-UsesServerUps-value-tooltip=Change by using /server-ups
+UsesAlt=細節模式
+UsesAlt-tooltip=你加入時是否使用細節模式
+UsesAlt-value-tooltip=按下 __CONTROL__show-info__ 來更改
+UsesServerUps=伺服更新數 (UPS)
+UsesServerUps-tooltip=現在是否顯示 伺服更新數 (UPS)
+UsesServerUps-value-tooltip=使用 /server-ups 來更換顯示
Tag=Player Tag
Tag-tooltip=The tag shown after your name
Tag-value-tooltip=Change by using /tag
From f5e06e76849f2506080b41f70b10e745ef6538b4 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Mon, 24 Oct 2022 13:09:53 +0900
Subject: [PATCH 076/129] Update data.cfg
---
locale/zh-TW/data.cfg | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/locale/zh-TW/data.cfg b/locale/zh-TW/data.cfg
index 68f1d14c..406c319f 100644
--- a/locale/zh-TW/data.cfg
+++ b/locale/zh-TW/data.cfg
@@ -26,12 +26,12 @@ UsesAlt-value-tooltip=按下 __CONTROL__show-info__ 來更改
UsesServerUps=伺服更新數 (UPS)
UsesServerUps-tooltip=現在是否顯示 伺服更新數 (UPS)
UsesServerUps-value-tooltip=使用 /server-ups 來更換顯示
-Tag=Player Tag
-Tag-tooltip=The tag shown after your name
-Tag-value-tooltip=Change by using /tag
-TagColor=Player Tag color
-TagColor-tooltip=The color of the tag shown after your name
-TagColor-value-tooltip=Change by using /tag-color
+Tag=你的人物標籤
+Tag-tooltip=你的人物標籤
+Tag-value-tooltip=使用 /tag 來更換你的人物標籤
+TagColor=人物標籤顏色
+TagColor-tooltip=你的人物標籤顏色
+TagColor-value-tooltip=使用 /tag-color 來更換你的人物標籤顏色
Bonus=Player Bonus
Bonus-tooltip=The bonus given to your character
Bonus-value-tooltip=Change by using /bonus
From c675fa7220f34317bcacdbd5b41b39dccb54c53a Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Mon, 24 Oct 2022 13:21:46 +0900
Subject: [PATCH 077/129] Update expcore.cfg
---
locale/zh-TW/expcore.cfg | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/locale/zh-TW/expcore.cfg b/locale/zh-TW/expcore.cfg
index bdc4907d..621b16c5 100644
--- a/locale/zh-TW/expcore.cfg
+++ b/locale/zh-TW/expcore.cfg
@@ -6,19 +6,19 @@ simple-format-tagged=__1__ __2__
simple-format-div=__1__:__2__
[expcore-commands]
-unauthorized=Unauthorized, Access is denied due to invalid credentials
-reject-string-options=Invalid Option, Must be one of: __1__
-reject-string-max-length=Invalid Length, Max: __1__
-reject-number=Invalid Number.
-reject-number-range=Invalid Range, Min (inclusive): __1__, Max (inclusive): __2__
-reject-player=Invalid Player Name, __1__ ,try using tab key to auto-complete the name
-reject-player-online=Player is offline.
-reject-player-alive=Player is dead.
-reject-force=Invalid Force Name.
-reject-surface=Invalid Surface Name.
-reject-color=Invalid Color Name.
-invalid-inputs=Invalid Input, /__1__ __2__
-invalid-param=Invalid Param "__1__"; __2__
+unauthorized=你沒有權限運行該項目
+reject-string-options=無效的選項. 要在: __1__
+reject-string-max-length=無效的長度, 最長: __1__
+reject-number=無效的數值.
+reject-number-range=無效的範圍. 最少 (包括): __1__, 最大 (包括): __2__
+reject-player=無效的用戶名稱, __1__ , 可以用 TAB 鍵來自動完成
+reject-player-online=用戶不在線.
+reject-player-alive=用戶已死亡.
+reject-force=無效的勢力.
+reject-surface=無效的表面.
+reject-color=無效的顏色.
+invalid-inputs=無效的輸入, /__1__ __2__
+invalid-param=無效的參數 "__1__"; __2__
command-help=__1__ - __2__
command-ran=Command Complete
command-fail=Command failed to run: __1__
From b205743e34bac4080f2f5dc83e7663ceedb35fda Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Mon, 24 Oct 2022 13:27:36 +0900
Subject: [PATCH 078/129] Update expcore.cfg
---
locale/zh-TW/expcore.cfg | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/locale/zh-TW/expcore.cfg b/locale/zh-TW/expcore.cfg
index 621b16c5..292a92a4 100644
--- a/locale/zh-TW/expcore.cfg
+++ b/locale/zh-TW/expcore.cfg
@@ -20,17 +20,17 @@ reject-color=無效的顏色.
invalid-inputs=無效的輸入, /__1__ __2__
invalid-param=無效的參數 "__1__"; __2__
command-help=__1__ - __2__
-command-ran=Command Complete
-command-fail=Command failed to run: __1__
+command-ran=指令運行完成
+command-fail=指令運行失敗 failed to run: __1__
command-error-log-format=[ERROR] command/__1__ :: __2__
[expcore-roles]
error-log-format-flag=[ERROR] roleFlag/__1__ :: __2__
error-log-format-assign=[ERROR] rolePromote/__1__ :: __2__
-game-message-assign=__1__ has been assigned to __2__ by __3__
-game-message-unassign=__1__ has been unassigned from __2__ by __3__
-reject-role=Invalid Role Name.
-reject-player-role=Player has a higher role.
+game-message-assign=__1__ 已被 __3__ 指派到身分組 __2__
+game-message-unassign=__1__ 已被 __3__ 取消指派到身分組 __2__
+reject-role=無效的身分組.
+reject-player-role=用戶已有更高的身分組.
[gui_util]
button_tooltip=Shows/hides the toolbar.
From 2c971eb0a228be1fc38262a13f0939664a865fc4 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Mon, 24 Oct 2022 13:34:35 +0900
Subject: [PATCH 079/129] Update expcore.cfg
---
locale/zh-TW/expcore.cfg | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/locale/zh-TW/expcore.cfg b/locale/zh-TW/expcore.cfg
index 292a92a4..204494cd 100644
--- a/locale/zh-TW/expcore.cfg
+++ b/locale/zh-TW/expcore.cfg
@@ -33,10 +33,10 @@ reject-role=無效的身分組.
reject-player-role=用戶已有更高的身分組.
[gui_util]
-button_tooltip=Shows/hides the toolbar.
+button_tooltip=是否顯示工具欄.
[expcore-gui]
-left-button-tooltip=Hide all open windows.
+left-button-tooltip=關閉所有打開的視窗.
[expcore-data]
set-preference=You data saving preference has been set to __1__. Existing data will not be effected until you rejoin.
@@ -44,10 +44,10 @@ get-preference=You data saving preference is __1__. Use /set-preference to chang
get-data=Your player data has been writen to file, location: factorio/script_output/expgaming_player_data.json
data-failed=Your player data has failed to load. Any changes to your data will not be saved.
data-restore=Your player data has been restored and changes will now save when you leave.
-preference=Saving Preference
-preference-tooltip=Which categories will be saved when you leave the game
-preference-value-tooltip=Change by using /set-preference
-preference-All=All data will be saved
-preference-Statistics=Only statistics, settings, and required data will be saved
-preference-Settings=Only settings and required data will be saved
-preference-Required=Only required data will be saved
\ No newline at end of file
+preference=儲存喜好
+preference-tooltip=那種資料將在退出時保存
+preference-value-tooltip=使用 /set-preference 來更換儲存喜好
+preference-All=所有資料都會被儲存
+preference-Statistics=只有數據, 設定和資料會被儲存
+preference-Settings=只有設定和資料會被儲存
+preference-Required=只有需要的資料會被儲存
\ No newline at end of file
From 467cbd84d93e029f48af3bcb14778dd5fffa3022 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Mon, 24 Oct 2022 13:39:55 +0900
Subject: [PATCH 080/129] Update expcore.cfg
---
locale/zh-TW/expcore.cfg | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/locale/zh-TW/expcore.cfg b/locale/zh-TW/expcore.cfg
index 204494cd..0f8e0705 100644
--- a/locale/zh-TW/expcore.cfg
+++ b/locale/zh-TW/expcore.cfg
@@ -39,11 +39,11 @@ button_tooltip=是否顯示工具欄.
left-button-tooltip=關閉所有打開的視窗.
[expcore-data]
-set-preference=You data saving preference has been set to __1__. Existing data will not be effected until you rejoin.
-get-preference=You data saving preference is __1__. Use /set-preference to change this. Use /save-data to get a local copy of your data.
-get-data=Your player data has been writen to file, location: factorio/script_output/expgaming_player_data.json
-data-failed=Your player data has failed to load. Any changes to your data will not be saved.
-data-restore=Your player data has been restored and changes will now save when you leave.
+set-preference=你的喜好已設定為 __1__. 在你重新加入前將不會有任何改動.
+get-preference=你的喜好為 __1__. 使用 /set-preference 來更改. 使用 /save-data 來獲得一份資料副本.
+get-data=你的個人資料已寫入: factorio/script_output/expgaming_player_data.json
+data-failed=無法載入你的個人資料. 任何改動將不會保存.
+data-restore=已載入你的個人資料. 改動將會被保存.
preference=儲存喜好
preference-tooltip=那種資料將在退出時保存
preference-value-tooltip=使用 /set-preference 來更換儲存喜好
From 43c6f6e22ff7f082ef89fcd81c626e188bb30855 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Mon, 24 Oct 2022 13:46:50 +0900
Subject: [PATCH 081/129] Update data.cfg
---
locale/zh-TW/data.cfg | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/locale/zh-TW/data.cfg b/locale/zh-TW/data.cfg
index 406c319f..d365d80b 100644
--- a/locale/zh-TW/data.cfg
+++ b/locale/zh-TW/data.cfg
@@ -32,23 +32,23 @@ Tag-value-tooltip=使用 /tag 來更換你的人物標籤
TagColor=人物標籤顏色
TagColor-tooltip=你的人物標籤顏色
TagColor-value-tooltip=使用 /tag-color 來更換你的人物標籤顏色
-Bonus=Player Bonus
-Bonus-tooltip=The bonus given to your character
-Bonus-value-tooltip=Change by using /bonus
+Bonus=人物附加屬性
+Bonus-tooltip=你的人物附加屬性
+Bonus-value-tooltip=使用 /bonus 來更改
[exp-statistics]
-MapsPlayed=Maps Played
-MapsPlayed-tooltip=The number of unique maps you have played on
-JoinCount=Join Count
-JoinCount-tooltip=The number of times you have joined our servers
-Playtime=Playtime
-Playtime-tooltip=The amount of time you have spent on our servers
-AfkTime=AFK Time
-AfkTime-tooltip=The amount of time you have been AFK on our servers
-ChatMessages=Messages
-ChatMessages-tooltip=The number of messages you have sent in chat
-CommandsUsed=Commands
-CommandsUsed-tooltip=The number of commands you have used
+MapsPlayed=地圖遊玩次數
+MapsPlayed-tooltip=你在本伺服器遊玩過的地圖數
+JoinCount=登入次數
+JoinCount-tooltip=你在本伺服器遊玩的次數
+Playtime=遊玩時間
+Playtime-tooltip=你在本伺服器遊玩的時間
+AfkTime=掛機時間
+AfkTime-tooltip=你在本伺服器掛機的時間
+ChatMessages=傳送信息次數
+ChatMessages-tooltip=你在本伺服器發送信息的次數
+CommandsUsed=使用指令次數
+CommandsUsed-tooltip=你在本伺服器使用指令的次數
RocketsLaunched=Rockets Launched
RocketsLaunched-tooltip=The number of rockets launched while you were online
ResearchCompleted=Research Completed
From 40638266db4d3a31a7c323162cb14b45c4b523e5 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Mon, 24 Oct 2022 13:53:51 +0900
Subject: [PATCH 082/129] Update data.cfg
---
locale/zh-TW/data.cfg | 44 +++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/locale/zh-TW/data.cfg b/locale/zh-TW/data.cfg
index d365d80b..5444660c 100644
--- a/locale/zh-TW/data.cfg
+++ b/locale/zh-TW/data.cfg
@@ -49,29 +49,29 @@ ChatMessages=傳送信息次數
ChatMessages-tooltip=你在本伺服器發送信息的次數
CommandsUsed=使用指令次數
CommandsUsed-tooltip=你在本伺服器使用指令的次數
-RocketsLaunched=Rockets Launched
-RocketsLaunched-tooltip=The number of rockets launched while you were online
-ResearchCompleted=Research Completed
-ResearchCompleted-tooltip=The number of research projects completed while you were online
-MachinesBuilt=Machines Built
-MachinesBuilt-tooltip=The number of machines you have built
-MachinesRemoved=Machines Removed
-MachinesRemoved-tooltip=The number of machines you have removed
-TilesBuilt=Tiles Placed
-TilesBuilt-tooltip=The number of tiles you have placed
-TilesRemoved=Tiles Removed
-TilesRemoved-tooltip=The number of tiles you have removed
-TreesDestroyed=Trees Destroyed
-TreesDestroyed-tooltip=The number of trees you have destroyed
-OreMined=Ore Mined
-OreMined-tooltip=The amount of ore you have mined
+RocketsLaunched=火箭發射次數
+RocketsLaunched-tooltip=你在本伺服器在線時所發射過火箭的次數
+ResearchCompleted=研究次數
+ResearchCompleted-tooltip=你在本伺服器在線時完成研究的次數
+MachinesBuilt=機器建造次數
+MachinesBuilt-tooltip=你在本伺服器建造過機器的次數
+MachinesRemoved=機器拆除次數
+MachinesRemoved-tooltip=你在本伺服器拆除過機器的次數
+TilesBuilt=地磚建造次數
+TilesBuilt-tooltip=你在本伺服器建造過地磚的次數
+TilesRemoved=地磚拆除次數
+TilesRemoved-tooltip=你在本伺服器拆除過地磚的次數
+TreesDestroyed=樹木拆除次數
+TreesDestroyed-tooltip=你在本伺服器拆除過樹木的次數
+OreMined=挖礦次數
+OreMined-tooltip=你在本伺服器挖掘礦的次數
ItemsCrafted=Items Crafted
ItemsCrafted-tooltip=The number of items you have crafted
ItemsPickedUp=Items Picked Up
ItemsPickedUp-tooltip=The number of items you have picked up
-Kills=Kills
+Kills=撃殺數
Kills-tooltip=The number of biters and biter bases you have squished
-Deaths=Deaths
+Deaths=死亡次數
Deaths-tooltip=The number of times you have died
DamageDealt=Damage Dealt
DamageDealt-tooltip=The amount of damage you have dealt to other forces
@@ -79,9 +79,9 @@ DistanceTravelled=Distance Travelled
DistanceTravelled-tooltip=The total distance in tiles that you have travelled
CapsulesUsed=Capsules Used
CapsulesUsed-tooltip=The number of capsules you have used
-EntityRepaired=Machines Repaired
-EntityRepaired-tooltip=The number of machines which you have repaired
+EntityRepaired=機器維修次數
+EntityRepaired-tooltip=你在本伺服器維修過機器的次數
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
\ No newline at end of file
+MapTagsMade=地圖標籤數量
+MapTagsMade-tooltip=你在本伺服器放過的地圖標籤數量
\ No newline at end of file
From 9301e2747b589313e7e10b7d2346839f809bcafc Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Mon, 24 Oct 2022 13:55:44 +0900
Subject: [PATCH 083/129] Update data.cfg
---
locale/zh-TW/data.cfg | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/locale/zh-TW/data.cfg b/locale/zh-TW/data.cfg
index 5444660c..816b1aaa 100644
--- a/locale/zh-TW/data.cfg
+++ b/locale/zh-TW/data.cfg
@@ -70,11 +70,11 @@ ItemsCrafted-tooltip=The number of items you have crafted
ItemsPickedUp=Items Picked Up
ItemsPickedUp-tooltip=The number of items you have picked up
Kills=撃殺數
-Kills-tooltip=The number of biters and biter bases you have squished
+Kills-tooltip=你在本伺服器殺過的敵人數量
Deaths=死亡次數
-Deaths-tooltip=The number of times you have died
-DamageDealt=Damage Dealt
-DamageDealt-tooltip=The amount of damage you have dealt to other forces
+Deaths-tooltip=你在本伺服器死過的數量
+DamageDealt=傷害量
+DamageDealt-tooltip=你在本伺服器對敵人所造成的傷害量
DistanceTravelled=Distance Travelled
DistanceTravelled-tooltip=The total distance in tiles that you have travelled
CapsulesUsed=Capsules Used
From 4d2a06ec491cd2397e31880f9eae8c3ee3009330 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Mon, 24 Oct 2022 13:58:01 +0900
Subject: [PATCH 084/129] Update data.cfg
---
locale/zh-TW/data.cfg | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/locale/zh-TW/data.cfg b/locale/zh-TW/data.cfg
index 816b1aaa..e4fa6b58 100644
--- a/locale/zh-TW/data.cfg
+++ b/locale/zh-TW/data.cfg
@@ -75,13 +75,13 @@ Deaths=死亡次數
Deaths-tooltip=你在本伺服器死過的數量
DamageDealt=傷害量
DamageDealt-tooltip=你在本伺服器對敵人所造成的傷害量
-DistanceTravelled=Distance Travelled
-DistanceTravelled-tooltip=The total distance in tiles that you have travelled
-CapsulesUsed=Capsules Used
-CapsulesUsed-tooltip=The number of capsules you have used
+DistanceTravelled=移動距離
+DistanceTravelled-tooltip=你在本伺服器的總移動距離
+CapsulesUsed=膠囊使用次數
+CapsulesUsed-tooltip=你在本伺服器使用過膠囊的次數
EntityRepaired=機器維修次數
EntityRepaired-tooltip=你在本伺服器維修過機器的次數
-DeconstructionPlannerUsed=Decon Planner Used
-DeconstructionPlannerUsed-tooltip=The number of times you have used the deconstruction planner
+DeconstructionPlannerUsed=拆除規劃器使用次數
+DeconstructionPlannerUsed-tooltip=你在本伺服器使用過拆除規劃器的次數
MapTagsMade=地圖標籤數量
MapTagsMade-tooltip=你在本伺服器放過的地圖標籤數量
\ No newline at end of file
From d4ffd59854c6b2b4277ddae6411f12ddad1bba4f Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Mon, 24 Oct 2022 13:58:54 +0900
Subject: [PATCH 085/129] Update data.cfg
---
locale/zh-TW/data.cfg | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/locale/zh-TW/data.cfg b/locale/zh-TW/data.cfg
index e4fa6b58..36bcdce5 100644
--- a/locale/zh-TW/data.cfg
+++ b/locale/zh-TW/data.cfg
@@ -65,10 +65,10 @@ TreesDestroyed=樹木拆除次數
TreesDestroyed-tooltip=你在本伺服器拆除過樹木的次數
OreMined=挖礦次數
OreMined-tooltip=你在本伺服器挖掘礦的次數
-ItemsCrafted=Items Crafted
-ItemsCrafted-tooltip=The number of items you have crafted
-ItemsPickedUp=Items Picked Up
-ItemsPickedUp-tooltip=The number of items you have picked up
+ItemsCrafted=物品合成數
+ItemsCrafted-tooltip=你在本伺服器合成過物品的次數
+ItemsPickedUp=物品拾起數
+ItemsPickedUp-tooltip=你在本伺服器起過物品的次數
Kills=撃殺數
Kills-tooltip=你在本伺服器殺過的敵人數量
Deaths=死亡次數
From 8a1c487fc34394776be21fda1e18c23b380c8d47 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Mon, 24 Oct 2022 14:05:36 +0900
Subject: [PATCH 086/129] Update gui.cfg
---
locale/zh-TW/gui.cfg | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/locale/zh-TW/gui.cfg b/locale/zh-TW/gui.cfg
index 03089079..f9e815af 100644
--- a/locale/zh-TW/gui.cfg
+++ b/locale/zh-TW/gui.cfg
@@ -1,16 +1,16 @@
[player-list]
-main-tooltip=Player List
-open-action-bar=Options
-close-action-bar=Close Options
-reason-confirm=Confirm Reason
-reason-entry=Enter Reason
-goto-player=Goto player
+main-tooltip=用戶名單
+open-action-bar=選項
+close-action-bar=關閉選項
+reason-confirm=確認原因
+reason-entry=輸入原因
+goto-player=傳送到用戶
bring-player=Bring player
-report-player=Report player
-warn-player=Warn player
-jail-player=Jail player
+report-player=舉報用戶
+warn-player=警告用戶
+jail-player=監禁用戶
kick-player=Kick player
-ban-player=Ban player
+ban-player=封禁用戶
afk-time=__1__% of total map time\nLast moved __2__ ago
open-map=__1__ __2__\n__3__\nClick to open map
From 5231a061cd54a903f52729f9dd598cb195fdd666 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Mon, 24 Oct 2022 19:52:58 +0900
Subject: [PATCH 087/129] Update gui.cfg
---
locale/en/gui.cfg | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/locale/en/gui.cfg b/locale/en/gui.cfg
index 03089079..311c19b5 100644
--- a/locale/en/gui.cfg
+++ b/locale/en/gui.cfg
@@ -162,13 +162,13 @@ servers-tooltip=Links to our other servers and sites
servers-general=This is only one of our servers for factorio, we host many of others as well. Below you can find details about all the servers that we host as well as links to our external services such as discord or github.
servers-factorio=Factorio Servers
servers-1=S1 Public
-servers-d1=This is our 48 hour reset experimental server.
-servers-2=S2 Weekly
-servers-d2=This is our weekly reset stable server.
+servers-d1=This is our 48 hour reset server.
+servers-2=S2 Off
+servers-d2=This server is closed.
servers-3=S3 Weekly
-servers-d3=This is our weekly reset experimental server.
+servers-d3=This is our weekly reset server.
servers-4=S4 Monthly
-servers-d4=This is our monthly reset stable server.
+servers-d4=This is our monthly reset server.
servers-5=S5 Modded
servers-d5=This is our modded server, see discord for details.
servers-6=S6 Donator
From 7e82a42663b738f7c74d50fd54a52b96b7094340 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Mon, 24 Oct 2022 19:53:21 +0900
Subject: [PATCH 088/129] Update gui.cfg
---
locale/zh-TW/gui.cfg | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/locale/zh-TW/gui.cfg b/locale/zh-TW/gui.cfg
index f9e815af..7be71e18 100644
--- a/locale/zh-TW/gui.cfg
+++ b/locale/zh-TW/gui.cfg
@@ -162,13 +162,13 @@ servers-tooltip=Links to our other servers and sites
servers-general=This is only one of our servers for factorio, we host many of others as well. Below you can find details about all the servers that we host as well as links to our external services such as discord or github.
servers-factorio=Factorio Servers
servers-1=S1 Public
-servers-d1=This is our 48 hour reset experimental server.
-servers-2=S2 Weekly
-servers-d2=This is our weekly reset stable server.
+servers-d1=This is our 48 hour reset server.
+servers-2=S2 Off
+servers-d2=This server is closed.
servers-3=S3 Weekly
-servers-d3=This is our weekly reset experimental server.
+servers-d3=This is our weekly reset server.
servers-4=S4 Monthly
-servers-d4=This is our monthly reset stable server.
+servers-d4=This is our monthly reset server.
servers-5=S5 Modded
servers-d5=This is our modded server, see discord for details.
servers-6=S6 Donator
From 70b2ff9dd3dc003f5b8153f3cb7f833bb729c08f Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Mon, 24 Oct 2022 20:04:59 +0900
Subject: [PATCH 089/129] Update gui.cfg
---
locale/zh-TW/gui.cfg | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/locale/zh-TW/gui.cfg b/locale/zh-TW/gui.cfg
index 7be71e18..04718760 100644
--- a/locale/zh-TW/gui.cfg
+++ b/locale/zh-TW/gui.cfg
@@ -161,27 +161,27 @@ servers-tab=Servers
servers-tooltip=Links to our other servers and sites
servers-general=This is only one of our servers for factorio, we host many of others as well. Below you can find details about all the servers that we host as well as links to our external services such as discord or github.
servers-factorio=Factorio Servers
-servers-1=S1 Public
-servers-d1=This is our 48 hour reset server.
-servers-2=S2 Off
-servers-d2=This server is closed.
-servers-3=S3 Weekly
-servers-d3=This is our weekly reset server.
-servers-4=S4 Monthly
-servers-d4=This is our monthly reset server.
-servers-5=S5 Modded
-servers-d5=This is our modded server, see discord for details.
+servers-1=S1 公共
+servers-d1=這個伺服器每 兩日 (48小時) 重設.
+servers-2=S2 -
+servers-d2=這個伺服器沒在營運.
+servers-3=S3 周
+servers-d3=這個伺服器每 七日 (168小時) 重設.
+servers-4=S4 月
+servers-d4=這個伺服器每 二十八日 (672小時) 重設.
+servers-5=S5 模組
+servers-d5=這個伺服器運行模組, 可在 Discord 中得到更多資訊.
servers-6=S6 Donator
servers-d6=This is our donator only server, online when requested.
-servers-7=S7 Event
-servers-d7=This is our event server, we try to run events at least once per week.
+servers-7=S7 項目
+servers-d7=這個伺服器只在有項目期間運行.
servers-8=S8 T̷-̶s̶-̴:̷
servers-d8=N̵o̴ ̶o̷-̶e̵ ̴k̸n̷-̶w̵s̸ ̴w̷h̷a̶-̶ ̷h̴a̴p̷p̴e̷n̷s̸ ̷o̶n̴ ̷t̶h̴-̶s̶ ̷s̷e̶r̸v̸e̴r̷,̶ ̸i̸t̴ ̷m̶-̸g̴h̶t̷ ̸n̸-̶t̵ ̷e̴v̸e̸n̶t̷ ̵-̷x̴i̵s̶t̸.̸
-servers-connect-Offline=Server is currently offline
-servers-connect-Current=This is your current server
-servers-connect-Version=Server is on a different version: __1__
-servers-connect-Password=Server requires a password
-servers-connect-Modded=Server requires mods to be downloaded
+servers-connect-Offline=該伺服器目前沒有在運行
+servers-connect-Current=你目前所在的伺服器
+servers-connect-Version=該伺服器運行不同的遊戲版本: __1__
+servers-connect-Password=該伺服器需要密碼
+servers-connect-Modded=該伺服器需要下載模組
servers-connect-Online=Server is online
servers-external=External Links
servers-open-in-browser=Open in your browser
From 2e714b97f91a67d0937f36336138ed457ee88094 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Mon, 24 Oct 2022 20:25:17 +0900
Subject: [PATCH 090/129] Update gui.cfg
---
locale/zh-TW/gui.cfg | 46 ++++++++++++++++++++++----------------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/locale/zh-TW/gui.cfg b/locale/zh-TW/gui.cfg
index 04718760..37f3c2e1 100644
--- a/locale/zh-TW/gui.cfg
+++ b/locale/zh-TW/gui.cfg
@@ -154,13 +154,13 @@ rules-12=When using trains, use the same size other players have used, many play
rules-13=Trains are Left Hand Drive (LHD) only, this means trains drive on the left side of the tracks.
rules-14=Do not beg for roles, advertise other servers, or link to harmful sites.
rules-15=Use common sense, report rule breakers, and Administrators have the final word.
-commands-tab=Commands
+commands-tab=指令
commands-tooltip=Commands which you are able to use
commands-general=We have lots of custom commands which you are able to use. Below you can find a list of all the commands that you are allowed to use and what they do. If you need more information or want to search for a command you can use our /search-help command.
-servers-tab=Servers
+servers-tab=伺服器
servers-tooltip=Links to our other servers and sites
servers-general=This is only one of our servers for factorio, we host many of others as well. Below you can find details about all the servers that we host as well as links to our external services such as discord or github.
-servers-factorio=Factorio Servers
+servers-factorio=異星工廠伺服器
servers-1=S1 公共
servers-d1=這個伺服器每 兩日 (48小時) 重設.
servers-2=S2 -
@@ -172,7 +172,7 @@ servers-d4=這個伺服器每 二十八日 (672小時) 重設.
servers-5=S5 模組
servers-d5=這個伺服器運行模組, 可在 Discord 中得到更多資訊.
servers-6=S6 Donator
-servers-d6=This is our donator only server, online when requested.
+servers-d6=這個伺服器為支持者運行, 可在 Discord 中得到更多資訊.
servers-7=S7 項目
servers-d7=這個伺服器只在有項目期間運行.
servers-8=S8 T̷-̶s̶-̴:̷
@@ -182,28 +182,28 @@ servers-connect-Current=你目前所在的伺服器
servers-connect-Version=該伺服器運行不同的遊戲版本: __1__
servers-connect-Password=該伺服器需要密碼
servers-connect-Modded=該伺服器需要下載模組
-servers-connect-Online=Server is online
-servers-external=External Links
-servers-open-in-browser=Open in your browser
-backers-tab=Backers
+servers-connect-Online=該伺服器在線
+servers-external=外部連結
+servers-open-in-browser=可在你的瀏覽器中打開
+backers-tab=支持者
backers-tooltip=People who have helped make our server
backers-general=We would like to thank all our staff and backers who have helped our community grow. Our staff have helped to keep our servers safe from trolls and a fun place to play. Our backers have helped us to cover our running costs and provide a great community for us all to enjoy together.
-backers-management=Administrators
-backers-board=Board Members and Senior Backers
-backers-staff=Staff Members
-backers-backers=Sponsors and Supporters
-backers-active=Active Players
-data-tab=Data
-data-tooltip=All of your stored player data
+backers-management=系統管理員
+backers-board=議員
+backers-staff=職員
+backers-backers=支持者
+backers-active=活躍玩家
+data-tab=資料
+data-tooltip=所有已存資料
data-general=Our servers will save your player data so that we can sync it between servers. All of your data can be found below, if you wish to save a copy locally then use /save-data. If you want to change what data is saved then use /set-preference.
-data-settings=Settings
-data-statistics=Statistics
-data-required=Required
-data-misc=Miscellaneous
+data-settings=設定
+data-statistics=數據
+data-required=需要
+data-misc=雜項
data-format=__1____2__
[tree-decon]
-main-tooltip=Toggle fast tree decon
-enabled=enabled
-disabled=disabled
-toggle-msg=Fast decon has been __1__
\ No newline at end of file
+main-tooltip=樹木快速拆除選項
+enabled=啟用
+disabled=停用
+toggle-msg=樹木快速拆除已 __1__
\ No newline at end of file
From 53eb228e5bd5b5c0f90d4e8496b0a0c94c5d4aaa Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Mon, 24 Oct 2022 22:37:50 +0900
Subject: [PATCH 091/129] Update gui.cfg
---
locale/zh-TW/gui.cfg | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/locale/zh-TW/gui.cfg b/locale/zh-TW/gui.cfg
index 37f3c2e1..dd3c80c8 100644
--- a/locale/zh-TW/gui.cfg
+++ b/locale/zh-TW/gui.cfg
@@ -186,8 +186,8 @@ servers-connect-Online=該伺服器在線
servers-external=外部連結
servers-open-in-browser=可在你的瀏覽器中打開
backers-tab=支持者
-backers-tooltip=People who have helped make our server
-backers-general=We would like to thank all our staff and backers who have helped our community grow. Our staff have helped to keep our servers safe from trolls and a fun place to play. Our backers have helped us to cover our running costs and provide a great community for us all to enjoy together.
+backers-tooltip=支持者
+backers-general=他們為伺服器運行提供了不少幫助.
backers-management=系統管理員
backers-board=議員
backers-staff=職員
@@ -195,7 +195,7 @@ backers-backers=支持者
backers-active=活躍玩家
data-tab=資料
data-tooltip=所有已存資料
-data-general=Our servers will save your player data so that we can sync it between servers. All of your data can be found below, if you wish to save a copy locally then use /save-data. If you want to change what data is saved then use /set-preference.
+data-general=已存資料會在各個服務器中自動Our servers will save your player data so that we can sync it between servers. All of your data can be found below, if you wish to save a copy locally then use /save-data. If you want to change what data is saved then use /set-preference.
data-settings=設定
data-statistics=數據
data-required=需要
From cddd7dd3d62c90ac01374e40df8dd72532a7d770 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Mon, 24 Oct 2022 23:03:29 +0900
Subject: [PATCH 092/129] Update gui.cfg
---
locale/zh-TW/gui.cfg | 48 ++++++++++++++++++++++----------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/locale/zh-TW/gui.cfg b/locale/zh-TW/gui.cfg
index dd3c80c8..f2cea746 100644
--- a/locale/zh-TW/gui.cfg
+++ b/locale/zh-TW/gui.cfg
@@ -5,27 +5,27 @@ close-action-bar=關閉選項
reason-confirm=確認原因
reason-entry=輸入原因
goto-player=傳送到用戶
-bring-player=Bring player
+bring-player=傳送用戶到自己
report-player=舉報用戶
warn-player=警告用戶
jail-player=監禁用戶
-kick-player=Kick player
+kick-player=踢用戶
ban-player=封禁用戶
-afk-time=__1__% of total map time\nLast moved __2__ ago
-open-map=__1__ __2__\n__3__\nClick to open map
+afk-time=__1__% 地圖時間\n上次移動: __2__
+open-map=__1__ __2__\n__3__\n按下打開地圖
[rocket-info]
-main-tooltip=Rocket Info
-launch-tooltip=Launch rocket
-launch-tooltip-disabled=Launch rocket (not ready)
-toggle-rocket-tooltip=Disable auto launch
-toggle-rocket-tooltip-disabled=Enable auto launch
-toggle-section-tooltip=Expand Section
-toggle-section-collapse-tooltip=Collapse Section
-section-caption-stats=Statistics
-section-tooltip-stats=Statistics about how rockets are launched
-section-caption-milestones=Milestones
-section-tooltip-milestones=The times when milestones were met
+main-tooltip=火箭資訊
+launch-tooltip=發射火箭
+launch-tooltip-disabled=發射火箭 (未準備)
+toggle-rocket-tooltip=取消自動發射
+toggle-rocket-tooltip-disabled=啟用自動發射
+toggle-section-tooltip=擴張欄
+toggle-section-collapse-tooltip=收縮欄
+section-caption-stats=數據
+section-tooltip-stats=火箭發射數據
+section-caption-milestones=里程碑
+section-tooltip-milestones=里程碑達成次數
section-caption-progress=Build Progress
section-tooltip-progress=The progress for your rocket silos
progress-no-silos=You have no rocket silos
@@ -88,10 +88,10 @@ create-footer-header=Create task
edit-footer-header=Edit task
view-footer-header=Task details
[autofill]
-main-tooltip=Autofill settings
+main-tooltip=自動填入設定
toggle-section-caption=__1__ __2__
-toggle-section-tooltip=Expand Section
-toggle-section-collapse-tooltip=Collapse Section
+toggle-section-tooltip=擴張欄
+toggle-section-collapse-tooltip=收縮欄
toggle-entity-tooltip=Toggle the autofill of __1__
toggle-tooltip=Toggle the autofill of __1__ into __2__ slots
amount-tooltip=Amount of items to insert into the __1__ slots
@@ -113,8 +113,8 @@ too-close-to-water=Cannot create warp; too close to water, please move __1__ til
too-close-to-entities=Cannot create warp; too close to other entities, please move __1__ tiles away from the entities or remove them
last-edit=Last edited by __1__ at __2__\nClick to view on map
add-tooltip=Add new warp
-confirm-tooltip=Save changes
-cancel-tooltip=Discard changes
+confirm-tooltip=儲存更改
+cancel-tooltip=放棄更改
edit-tooltip=Currently being edited by: __1__
edit-tooltip-none=Currently being edited by: Nobody
remove-tooltip=Remove warp
@@ -130,9 +130,9 @@ goto-disabled=You are not on a warp point, walk to a warp point
goto-edit=Edit warp icon
[readme]
-main-tooltip=Infomation
-welcome-tab=Welcome
-welcome-tooltip=Welcome to Explosive Gaming
+main-tooltip=資訊
+welcome-tab=歡迎
+welcome-tooltip=歡迎來到 Explosive Gaming
welcome-general=Welcome to Explosive Gaming; we host many factorio servers. While you are here, we ask you to follow our rules. You can find these in the tab above. You can also find our custom commands and links to our other servers. This map has been online for __2__.\nPlease note that our servers reset periodically, the next reset is: __1__
welcome-roles=We run a custom role system to help protect the work of others. As a result you may not be able to use your deconstruction planner yet or drop item on the groud. Roles also give you access to some custom features such as adding tasks to our task list or making new warp points.\nYou have been assigned the roles: __1__
welcome-chat=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key (which is located under the “ESC key”) - If you would like to change the key, go to your Controls tab in options.\nThe setting you need to change is “Toggle chat (and Lua console)” you currently have it set to "__CONTROL__toggle-console__"
@@ -195,7 +195,7 @@ backers-backers=支持者
backers-active=活躍玩家
data-tab=資料
data-tooltip=所有已存資料
-data-general=已存資料會在各個服務器中自動Our servers will save your player data so that we can sync it between servers. All of your data can be found below, if you wish to save a copy locally then use /save-data. If you want to change what data is saved then use /set-preference.
+data-general=資料會自動存到各個服務器中. 你也可以用 /save-data 存一份副本. 也可用 /set-preference 來更改喜好.
data-settings=設定
data-statistics=數據
data-required=需要
From 9f8c3092d870c186aea682e6f991a41691a96da2 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Mon, 24 Oct 2022 23:55:36 +0900
Subject: [PATCH 093/129] Update gui.cfg
---
locale/zh-TW/gui.cfg | 46 ++++++++++++++++++++++----------------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/locale/zh-TW/gui.cfg b/locale/zh-TW/gui.cfg
index f2cea746..8ce50032 100644
--- a/locale/zh-TW/gui.cfg
+++ b/locale/zh-TW/gui.cfg
@@ -26,33 +26,33 @@ section-caption-stats=數據
section-tooltip-stats=火箭發射數據
section-caption-milestones=里程碑
section-tooltip-milestones=里程碑達成次數
-section-caption-progress=Build Progress
-section-tooltip-progress=The progress for your rocket silos
-progress-no-silos=You have no rocket silos
-data-caption-first-launch=First Launch
-data-tooltip-first-launch=The time of the first launch
-data-caption-last-launch=Last Launch
-data-tooltip-last-launch=The time of the last launch
-data-caption-fastest-launch=Fastest Launch
-data-tooltip-fastest-launch=The time taken for the fastest launch
-data-caption-total-rockets=Total Launched
-data-tooltip-total-rockets=Total number of rockets launched by your force
-value-tooltip-total-rockets=__1__% of all rockets on this map
-data-caption-avg-launch=Average Time
-data-tooltip-avg-launch=The average amount of time taken to launch a rocket
-data-caption-avg-launch-n=Average Time __1__
-data-tooltip-avg-launch-n=The average amount of time taken to launch the last __1__ rockets
-data-caption-milestone-n=Milestone __1__
-data-tooltip-milestone-n=Time taken to each __1__ rockets
+section-caption-progress=建造程度
+section-tooltip-progress=火箭建造程度
+progress-no-silos=你沒有火箭發射井
+data-caption-first-launch=首次發射
+data-tooltip-first-launch=首次發射時間
+data-caption-last-launch=最後發射
+data-tooltip-last-launch=最後發射時間
+data-caption-fastest-launch=最快發射
+data-tooltip-fastest-launch=最快發射時間
+data-caption-total-rockets=總發射次數
+data-tooltip-total-rockets=我方總發射次數
+value-tooltip-total-rockets=__1__% 的火箭發射都在本地圖上.
+data-caption-avg-launch=平均時間
+data-tooltip-avg-launch=火箭發射平均時間
+data-caption-avg-launch-n=平均時間 __1__
+data-tooltip-avg-launch-n=__1__ 次火箭發射的平均時間
+data-caption-milestone-n=里程碑 __1__
+data-tooltip-milestone-n=__1__ 次火箭發射的時間
data-caption-milestone-next=N/A
-data-tooltip-milestone-next=Not yet achieved
+data-tooltip-milestone-next=未達成
progress-x-pos=X __1__
progress-y-pos=Y __1__
-progress-label-tooltip=View on map
-progress-launched=Launched
+progress-label-tooltip=在地圖上看
+progress-launched=已發射
progress-caption=__1__%
-progress-tooltip=This silo has launched __1__ rockets
-launch-failed=Failed to launch rocket, please wait a few seconds and try again.
+progress-tooltip=該火箭發射井發射了 __1__ 次
+launch-failed=火箭發射失敗, 請過一會再試.
[science-info]
main-caption=Science Packs
From 7dcd7271700ccddda90702e23aad09ecc0e6b0cd Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Tue, 25 Oct 2022 00:04:05 +0900
Subject: [PATCH 094/129] Update gui.cfg
---
locale/zh-TW/gui.cfg | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/locale/zh-TW/gui.cfg b/locale/zh-TW/gui.cfg
index 8ce50032..9c392df7 100644
--- a/locale/zh-TW/gui.cfg
+++ b/locale/zh-TW/gui.cfg
@@ -50,21 +50,21 @@ progress-x-pos=X __1__
progress-y-pos=Y __1__
progress-label-tooltip=在地圖上看
progress-launched=已發射
-progress-caption=__1__%
+progress-caption=__1__ %
progress-tooltip=該火箭發射井發射了 __1__ 次
launch-failed=火箭發射失敗, 請過一會再試.
[science-info]
-main-caption=Science Packs
-main-tooltip=Science Info
-eta-caption=ETA:
-eta-tooltip=The estimated time left for the current research
+main-caption=研究瓶
+main-tooltip=研究資訊
+eta-caption=預計時間:
+eta-tooltip=餘下研究所需時間
eta-time=T- __1__
-unit=__1__spm
-pos-tooltip=Total made: __1__
-neg-tooltip=Total used: __1__
-net-tooltip=Total net: __1__
-no-packs=You have not made any science packs yet
+unit=__1__ 瓶分鐘
+pos-tooltip=製造: __1__
+neg-tooltip=使用: __1__
+net-tooltip=淨: __1__
+no-packs=你未有製造任何研究瓶
[task-list]
main-caption=Task List [img=info]
From 1d5ec105e4ce9856b5d3aa3bba78cd50d102a8f3 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Tue, 25 Oct 2022 00:12:00 +0900
Subject: [PATCH 095/129] Create addons.cfg
---
locale/zh-CN/addons.cfg | 85 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 85 insertions(+)
create mode 100644 locale/zh-CN/addons.cfg
diff --git a/locale/zh-CN/addons.cfg b/locale/zh-CN/addons.cfg
new file mode 100644
index 00000000..f1bff801
--- /dev/null
+++ b/locale/zh-CN/addons.cfg
@@ -0,0 +1,85 @@
+[chat-popup]
+message=__1__: __2__
+ping=__1__在信息到提到了你.
+
+[damage-popup]
+player-health=__1__
+player-damage=__1__
+
+[links]
+discord=https://discord.explosivegaming.nl
+website=https://www.explosivegaming.nl
+status=https://status.explosivegaming.nl
+github=https://github.com/explosivegaming/scenario
+patreon=https://www.patreon.com/ExpGaming
+
+[info]
+players-online=現在有 __1__ 人上線
+total-map-time=本地圖時間為 __1__
+discord=加入社群: https://discord.explosivegaming.nl
+website=訪問網站: https://www.explosivegaming.nl
+status=伺服器狀態: https://status.explosivegaming.nl
+github=增加功能或回報錯誤: https://github.com/explosivegaming/scenario
+patreon=支持我們: https://www.patreon.com/ExpGaming
+custom-commands=自制指令如 /tag 和 /me, 可用 /chelp 查看更多.
+read-readme=左上可查看更多
+softmod=這裹用了自設情境
+redmew=;-;
+lhd=列車必須是左上右下!
+
+[warnings]
+received=你從 __1__ 中收到了警告. 你現在有 __2__ 個警告. __3__
+pre-kick=這是最後警告
+kick=你已因有太多警告而被請離
+pre-pre-ban=你有可能會被封禁
+pre-ban=這是最後警告
+ban=你已因有太多警告而被封禁; 可以到 __1__ 申訴.
+script-warning=這是系統發出的自動警告 (__1__/__2__)
+script-warning-removed=系統發出的自動警告已失效 (__1__/__2__)
+script-warning-limit=__1__ 已收到系統發出的自動警告
+
+[chat-bot]
+reply=[Chat Bot] __1__
+disallow=你沒有權限使用這個指令
+players-online=現在有 __1__ 人上線
+players=本地圖現在有 __1__ 人上線
+not-real-dev=Cooldude2606 只是本場境的開發者
+softmod=這裹用了自設情境
+blame=責怪 __1__ 吧
+afk=看看 __1__, 他已掛機: __2__
+current-evolution=現在進化度為 __1__
+magic=Fear the admin magic (ノ゚∀゚)ノ⌒・*:.。. .。.:*・゜゚・*☆
+aids=≖ ‿ ≖ Fear the aids of a public server ≖ ‿ ≖
+riot=(admins) ┬┴┬┴┤ᵒ_ᵒ)├┬┴┬┴ ‹ ‹\(´ω` )/››‹‹\ ( ´)/››‹‹\ ( ´ω`)/›› (rest of server)
+loops=不要架設迴旋處
+lenny=( ͡° ͜ʖ ͡°)
+hodor=Hodor
+get-popcorn-1=Heating the oil and waiting for the popping sound...
+get-popcorn-2=__1__ your popcorn is finished. Lean backwards and watch the drama unfold.
+get-snaps-1=Pouring the glasses and finding the correct song book...
+get-snaps-2=Singing a song...🎤🎶
+get-snaps-3=schkål, my friends!
+get-cocktail-1= 🍸 Inintiating mind reading unit... 🍸
+get-cocktail-2= 🍸 Mixing favourite ingredients of __1__ 🍸
+get-cocktail-3=🍸 __1__ your cocktail is done.🍸
+make-coffee-1= ☕ Boiling the water and grinding the coffee beans... ☕
+make-coffee-2= ☕ __1__ we ran out of coffe beans! Have some tea instead. ☕
+order-pizza-1= 🍕 Finding nearest pizza supplier... 🍕
+order-pizza-2= 🍕 Figuring out the favourite pizza of __1__ 🍕
+order-pizza-3= 🍕 __1__ your pizza is here! 🍕
+make-tea-1= ☕ Boiling the water... ☕
+make-tea-2= ☕ __1__ your tea is done! ☕
+get-mead-1= Filling the drinking horn
+get-mead-2= Skål!
+get-beer-1= 🍺 Pouring A Glass 🍺
+get-beer-2= 🍻 Chears Mate 🍻
+verify=Please return to our discord and type r!verify __1__
+
+[afk-kick]
+message=因沒有活躍玩家而被請離
+
+[report-jail]
+jail=__1__ 因被多次舉報而被送監. 請等管理員.
+
+[protection-jail]
+jail=__1__ 因被多次拆除受保護物體而被送監. 請等管理員.
From d577639dfec239150584d2e44ca5f558f04bc1af Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Tue, 25 Oct 2022 00:12:04 +0900
Subject: [PATCH 096/129] Create commands.cfg
---
locale/zh-CN/commands.cfg | 112 ++++++++++++++++++++++++++++++++++++++
1 file changed, 112 insertions(+)
create mode 100644 locale/zh-CN/commands.cfg
diff --git a/locale/zh-CN/commands.cfg b/locale/zh-CN/commands.cfg
new file mode 100644
index 00000000..19788810
--- /dev/null
+++ b/locale/zh-CN/commands.cfg
@@ -0,0 +1,112 @@
+[expcom-kill]
+already-dead=你已經死了.
+
+[expcom-admin-chat]
+format=[管理員] __1__: __2__
+
+[expcom-tp]
+no-position-found=沒找到空間傳送.
+to-self=沒辦法傳送到自己
+
+[expcom-chelp]
+title=幫助 "__1__":
+footer=[__1__ 結果: 頁 __2__ / __3__]
+format=/__1__ __2__ - __3__ __4__
+alias=別名: __1__
+out-of-range=沒有 __1__ 頁.
+
+[expcom-roles]
+higher-role=你所安排的身份組比你目前的還要高.
+list=所有身份組: __1__
+list-player=__1__ 有: __2__
+list-element=__1__, __2__
+
+[expcom-jail]
+give=__1__ 已被 __2__ 因為 __3__ 送監.
+remove=__1__ 已被 __2__.
+already-jailed=__1__ 已被送監.
+not-jailed=__1__ 目前不在監獄.
+
+[expcom-report]
+player-immune=該用戶不能被舉報.
+self-report=你不能舉報你自己.
+non-admin=__1__ 因 __2__ 而被舉報.
+admin=__1__ 因 __3__ 而被 __2__ 舉報.
+already-reported=你只可舉報其他用戶一次.
+not-reported=該用戶沒被舉報.
+player-count-title=該用戶有以下舉報:
+player-report-title=__1__ 有以下舉報:
+list=__1__: __2__
+removed=__1__ 的舉報各.
+
+[expcom-warnings]
+received=__1__ 因為 __3__ 而被 __2__ 發出了一個警告.
+player=__1__ 有 __2__ 個警告和 __3__/__4__ 自動警告.
+player-detail=__1__ 因 __2__ 而被警告
+list-title=該用戶警告如下:
+list=__1__: __2__ (__3__/__4__)
+cleared=__1__ 的警告己被 __2__ 清除.
+
+[expcom-spawn]
+unavailable=現在沒辦法傳送到出生點.
+
+[expcom-repair]
+result=共 __1__ 個建築恢復其中 __2__ 把 HP 回滿.
+
+[expcom-bonus]
+set=你的附加比例現在為 __1__.
+wip=本指令是暫時的, 將來可能會被更換.
+
+[expcom-ratio]
+notSelecting=請選擇項目.
+item-in=你每秒需要 __1__ 來做 [item=__2__].
+fluid-in=你每秒需要 __1__ 來做 [fluid=__2__].
+item-out=結果: __1__ [item=__2__] 每秒.
+fluid-out=結果: __1__ [fluid=__2__] 每秒.
+machines=你需要 __1__ 部同速機器.
+
+[expcom-home]
+no-home=你還沒設回程傳送點.
+no-return=你還沒用回程.
+home-set=你的回程傳送點為 x: __1__ y: __2__
+return-set=你的去程傳送點為 x: __1__ y: __2__
+home-get=你的回程傳送點在 x: __1__ y: __2__
+
+[expcom-server-ups]
+no-ext=沒找到外置數據, 沒法顯示.
+
+[expcom-connect]
+too-many-matching=該伺服器名稱有多過一個結果: __1__
+wrong-version=該伺服器版本不同: __1__
+same-server=你已連接該伺服器: __1__
+offline=該伺服器不在線: __1__
+none-matching=沒找到伺服器.
+
+[expcom-lastlocation]
+response=__1__ 最後出現在 [gps=__2__,__3__]
+
+[expcom-protection]
+entered-entity-selection=建築保護, 選擇一個建築來保護, 按住 shift 來選擇則可取消.
+entered-area-selection=地區保護, 選擇一個地區來保護, 按住 shift 來選擇則可取消.
+protected-entities=__1__ 個建築現已受保護.
+unprotected-entities=__1__ 個建築現不受保護.
+already-protected=本地區已受保護.
+protected-area=本地區現已受保護.
+unprotected-area=本地區現不受保護.
+repeat-offence=__1__ 在 [gps=__3__,__4__] 拆除了 __2__
+
+[expcom-spectate]
+follow-self=你不能追蹤自己.
+
+[expcom-admin-marker]
+exit=你已離開管理員地圖標記模式, 所有新地圖標記將不受保護.
+enter=你已進入管理員地圖標記模式, 所有新地圖標記將受保護.
+place=你放了一個管理員地圖標記.
+edit=你修改了一個管理員地圖標記.
+revert=你沒辦法修改管理員地圖標記.
+
+[expcom-inv-search]
+reject-item=沒找到 __1__; 可試用富文本.
+results-heading=以下用戶有 [item=__1__]:
+results-item=__1__) __2__ 有 __3__ 個. (__4__)
+results-none=沒用戶有 [item=__1__]
From 3dd3a0a91a78fe00486baeed38e07c77cdd1e5b8 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Tue, 25 Oct 2022 00:12:06 +0900
Subject: [PATCH 097/129] Create config.cfg
---
locale/zh-CN/config.cfg | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 locale/zh-CN/config.cfg
diff --git a/locale/zh-CN/config.cfg b/locale/zh-CN/config.cfg
new file mode 100644
index 00000000..38eb2554
--- /dev/null
+++ b/locale/zh-CN/config.cfg
@@ -0,0 +1,3 @@
+[command-auth]
+admin-only=本指令只限管理員使用!
+command-disabled=本指令已被停用!
\ No newline at end of file
From 109b35cb4d19fffd25cc041f8677c880bb354712 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Tue, 25 Oct 2022 00:12:10 +0900
Subject: [PATCH 098/129] Create data.cfg
---
locale/zh-CN/data.cfg | 87 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 87 insertions(+)
create mode 100644 locale/zh-CN/data.cfg
diff --git a/locale/zh-CN/data.cfg b/locale/zh-CN/data.cfg
new file mode 100644
index 00000000..36bcdce5
--- /dev/null
+++ b/locale/zh-CN/data.cfg
@@ -0,0 +1,87 @@
+[join-message]
+greet=[color=0,1,0] 歡迎來到 EXP 的伺服器! 若果你喜歡本伺服器可加入 DISCORD: __1__ [/color]
+message-set=你的加入信息已更新
+message-cleared=你的加入信息已清除
+
+[quickbar]
+saved=你的工具列已儲存
+
+[exp-required]
+Warnings=警告
+Warnings-tooltip=你所有收到的警告
+Warnings-value-tooltip=你所有收到的警告
+[exp-settings]
+Colour=顏色
+Colour-tooltip=你的人物顏色
+Colour-value-tooltip=使用 /color 來更換你的人物顏色
+JoinMessage=加入信息
+JoinMessage-tooltip=你加入時所顯示的信息
+JoinMessage-value-tooltip=使用 /join-message 來更換加入信息
+QuickbarFilters=快捷欄
+QuickbarFilters-tooltip=快捷欄的選項
+QuickbarFilters-value-tooltip=使用 /save-quickbar 來更換快捷欄的選項
+UsesAlt=細節模式
+UsesAlt-tooltip=你加入時是否使用細節模式
+UsesAlt-value-tooltip=按下 __CONTROL__show-info__ 來更改
+UsesServerUps=伺服更新數 (UPS)
+UsesServerUps-tooltip=現在是否顯示 伺服更新數 (UPS)
+UsesServerUps-value-tooltip=使用 /server-ups 來更換顯示
+Tag=你的人物標籤
+Tag-tooltip=你的人物標籤
+Tag-value-tooltip=使用 /tag 來更換你的人物標籤
+TagColor=人物標籤顏色
+TagColor-tooltip=你的人物標籤顏色
+TagColor-value-tooltip=使用 /tag-color 來更換你的人物標籤顏色
+Bonus=人物附加屬性
+Bonus-tooltip=你的人物附加屬性
+Bonus-value-tooltip=使用 /bonus 來更改
+
+[exp-statistics]
+MapsPlayed=地圖遊玩次數
+MapsPlayed-tooltip=你在本伺服器遊玩過的地圖數
+JoinCount=登入次數
+JoinCount-tooltip=你在本伺服器遊玩的次數
+Playtime=遊玩時間
+Playtime-tooltip=你在本伺服器遊玩的時間
+AfkTime=掛機時間
+AfkTime-tooltip=你在本伺服器掛機的時間
+ChatMessages=傳送信息次數
+ChatMessages-tooltip=你在本伺服器發送信息的次數
+CommandsUsed=使用指令次數
+CommandsUsed-tooltip=你在本伺服器使用指令的次數
+RocketsLaunched=火箭發射次數
+RocketsLaunched-tooltip=你在本伺服器在線時所發射過火箭的次數
+ResearchCompleted=研究次數
+ResearchCompleted-tooltip=你在本伺服器在線時完成研究的次數
+MachinesBuilt=機器建造次數
+MachinesBuilt-tooltip=你在本伺服器建造過機器的次數
+MachinesRemoved=機器拆除次數
+MachinesRemoved-tooltip=你在本伺服器拆除過機器的次數
+TilesBuilt=地磚建造次數
+TilesBuilt-tooltip=你在本伺服器建造過地磚的次數
+TilesRemoved=地磚拆除次數
+TilesRemoved-tooltip=你在本伺服器拆除過地磚的次數
+TreesDestroyed=樹木拆除次數
+TreesDestroyed-tooltip=你在本伺服器拆除過樹木的次數
+OreMined=挖礦次數
+OreMined-tooltip=你在本伺服器挖掘礦的次數
+ItemsCrafted=物品合成數
+ItemsCrafted-tooltip=你在本伺服器合成過物品的次數
+ItemsPickedUp=物品拾起數
+ItemsPickedUp-tooltip=你在本伺服器起過物品的次數
+Kills=撃殺數
+Kills-tooltip=你在本伺服器殺過的敵人數量
+Deaths=死亡次數
+Deaths-tooltip=你在本伺服器死過的數量
+DamageDealt=傷害量
+DamageDealt-tooltip=你在本伺服器對敵人所造成的傷害量
+DistanceTravelled=移動距離
+DistanceTravelled-tooltip=你在本伺服器的總移動距離
+CapsulesUsed=膠囊使用次數
+CapsulesUsed-tooltip=你在本伺服器使用過膠囊的次數
+EntityRepaired=機器維修次數
+EntityRepaired-tooltip=你在本伺服器維修過機器的次數
+DeconstructionPlannerUsed=拆除規劃器使用次數
+DeconstructionPlannerUsed-tooltip=你在本伺服器使用過拆除規劃器的次數
+MapTagsMade=地圖標籤數量
+MapTagsMade-tooltip=你在本伺服器放過的地圖標籤數量
\ No newline at end of file
From 87be5ebc16fdb7c3e2c38ff9605243480d19b264 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Tue, 25 Oct 2022 00:12:12 +0900
Subject: [PATCH 099/129] Create expcore.cfg
---
locale/zh-CN/expcore.cfg | 53 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
create mode 100644 locale/zh-CN/expcore.cfg
diff --git a/locale/zh-CN/expcore.cfg b/locale/zh-CN/expcore.cfg
new file mode 100644
index 00000000..0f8e0705
--- /dev/null
+++ b/locale/zh-CN/expcore.cfg
@@ -0,0 +1,53 @@
+time-symbol-days-short=__1__d
+color-tag=[color=__1__]__2__[/color]
+
+[time-format]
+simple-format-tagged=__1__ __2__
+simple-format-div=__1__:__2__
+
+[expcore-commands]
+unauthorized=你沒有權限運行該項目
+reject-string-options=無效的選項. 要在: __1__
+reject-string-max-length=無效的長度, 最長: __1__
+reject-number=無效的數值.
+reject-number-range=無效的範圍. 最少 (包括): __1__, 最大 (包括): __2__
+reject-player=無效的用戶名稱, __1__ , 可以用 TAB 鍵來自動完成
+reject-player-online=用戶不在線.
+reject-player-alive=用戶已死亡.
+reject-force=無效的勢力.
+reject-surface=無效的表面.
+reject-color=無效的顏色.
+invalid-inputs=無效的輸入, /__1__ __2__
+invalid-param=無效的參數 "__1__"; __2__
+command-help=__1__ - __2__
+command-ran=指令運行完成
+command-fail=指令運行失敗 failed to run: __1__
+command-error-log-format=[ERROR] command/__1__ :: __2__
+
+[expcore-roles]
+error-log-format-flag=[ERROR] roleFlag/__1__ :: __2__
+error-log-format-assign=[ERROR] rolePromote/__1__ :: __2__
+game-message-assign=__1__ 已被 __3__ 指派到身分組 __2__
+game-message-unassign=__1__ 已被 __3__ 取消指派到身分組 __2__
+reject-role=無效的身分組.
+reject-player-role=用戶已有更高的身分組.
+
+[gui_util]
+button_tooltip=是否顯示工具欄.
+
+[expcore-gui]
+left-button-tooltip=關閉所有打開的視窗.
+
+[expcore-data]
+set-preference=你的喜好已設定為 __1__. 在你重新加入前將不會有任何改動.
+get-preference=你的喜好為 __1__. 使用 /set-preference 來更改. 使用 /save-data 來獲得一份資料副本.
+get-data=你的個人資料已寫入: factorio/script_output/expgaming_player_data.json
+data-failed=無法載入你的個人資料. 任何改動將不會保存.
+data-restore=已載入你的個人資料. 改動將會被保存.
+preference=儲存喜好
+preference-tooltip=那種資料將在退出時保存
+preference-value-tooltip=使用 /set-preference 來更換儲存喜好
+preference-All=所有資料都會被儲存
+preference-Statistics=只有數據, 設定和資料會被儲存
+preference-Settings=只有設定和資料會被儲存
+preference-Required=只有需要的資料會被儲存
\ No newline at end of file
From a4fe3872f61daaf3581fe6f65518415610c35ac9 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Tue, 25 Oct 2022 00:12:15 +0900
Subject: [PATCH 100/129] Create gui.cfg
---
locale/zh-CN/gui.cfg | 209 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 209 insertions(+)
create mode 100644 locale/zh-CN/gui.cfg
diff --git a/locale/zh-CN/gui.cfg b/locale/zh-CN/gui.cfg
new file mode 100644
index 00000000..9c392df7
--- /dev/null
+++ b/locale/zh-CN/gui.cfg
@@ -0,0 +1,209 @@
+[player-list]
+main-tooltip=用戶名單
+open-action-bar=選項
+close-action-bar=關閉選項
+reason-confirm=確認原因
+reason-entry=輸入原因
+goto-player=傳送到用戶
+bring-player=傳送用戶到自己
+report-player=舉報用戶
+warn-player=警告用戶
+jail-player=監禁用戶
+kick-player=踢用戶
+ban-player=封禁用戶
+afk-time=__1__% 地圖時間\n上次移動: __2__
+open-map=__1__ __2__\n__3__\n按下打開地圖
+
+[rocket-info]
+main-tooltip=火箭資訊
+launch-tooltip=發射火箭
+launch-tooltip-disabled=發射火箭 (未準備)
+toggle-rocket-tooltip=取消自動發射
+toggle-rocket-tooltip-disabled=啟用自動發射
+toggle-section-tooltip=擴張欄
+toggle-section-collapse-tooltip=收縮欄
+section-caption-stats=數據
+section-tooltip-stats=火箭發射數據
+section-caption-milestones=里程碑
+section-tooltip-milestones=里程碑達成次數
+section-caption-progress=建造程度
+section-tooltip-progress=火箭建造程度
+progress-no-silos=你沒有火箭發射井
+data-caption-first-launch=首次發射
+data-tooltip-first-launch=首次發射時間
+data-caption-last-launch=最後發射
+data-tooltip-last-launch=最後發射時間
+data-caption-fastest-launch=最快發射
+data-tooltip-fastest-launch=最快發射時間
+data-caption-total-rockets=總發射次數
+data-tooltip-total-rockets=我方總發射次數
+value-tooltip-total-rockets=__1__% 的火箭發射都在本地圖上.
+data-caption-avg-launch=平均時間
+data-tooltip-avg-launch=火箭發射平均時間
+data-caption-avg-launch-n=平均時間 __1__
+data-tooltip-avg-launch-n=__1__ 次火箭發射的平均時間
+data-caption-milestone-n=里程碑 __1__
+data-tooltip-milestone-n=__1__ 次火箭發射的時間
+data-caption-milestone-next=N/A
+data-tooltip-milestone-next=未達成
+progress-x-pos=X __1__
+progress-y-pos=Y __1__
+progress-label-tooltip=在地圖上看
+progress-launched=已發射
+progress-caption=__1__ %
+progress-tooltip=該火箭發射井發射了 __1__ 次
+launch-failed=火箭發射失敗, 請過一會再試.
+
+[science-info]
+main-caption=研究瓶
+main-tooltip=研究資訊
+eta-caption=預計時間:
+eta-tooltip=餘下研究所需時間
+eta-time=T- __1__
+unit=__1__ 瓶分鐘
+pos-tooltip=製造: __1__
+neg-tooltip=使用: __1__
+net-tooltip=淨: __1__
+no-packs=你未有製造任何研究瓶
+
+[task-list]
+main-caption=Task List [img=info]
+main-tooltip=Task List
+sub-tooltip=Tasks that remain to be done\n- You can use richtext to include images [img=utility/not_enough_repair_packs_icon] or [color=blue]color[/color] your tasks.
+no-tasks=No tasks found!
+no-tasks-tooltip=Click on the plus button to the top right of this window to add a new task!
+last-edit=Last edited by __1__ at __2__
+add-tooltip=Add new task
+confirm=Confirm
+confirm-tooltip=Save task (minimum of 5 characters long)
+discard=Discard
+discard-tooltip=Discard task/changes
+delete=Delete
+delete-tooltip=Delete task
+close-tooltip=Close task details
+edit=Edit task
+edit-tooltip=Currently being edited by: __1__
+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=自動填入設定
+toggle-section-caption=__1__ __2__
+toggle-section-tooltip=擴張欄
+toggle-section-collapse-tooltip=收縮欄
+toggle-entity-tooltip=Toggle the autofill of __1__
+toggle-tooltip=Toggle the autofill of __1__ into __2__ slots
+amount-tooltip=Amount of items to insert into the __1__ slots
+invalid=Autofill set to maximum amount: __1__ __2__ for __3__
+inserted=Inserted __1__ __2__ into __3__
+
+[warp-list]
+main-caption=Warp List [img=info]
+main-tooltip=Warp List; Must be within __1__ tiles to use
+sub-tooltip=Warps can only be used every __1__ seconds and when within __2__ tiles\n__3__\n__4__\n__5__\n__6__\n__7__\n__8__
+sub-tooltip-current= - __1__ This is your current warp point;
+sub-tooltip-connected= - __1__ You can travel to this warp point;
+sub-tooltip-different= - __1__ This warp is on a different network;
+sub-tooltip-cooldown= - __1__ You are currently on cooldown;
+sub-tooltip-not_available= - __1__ You are not in range of a warp point;
+sub-tooltip-bypass= - __1__ Your role allows you to travel here;
+too-close=Cannot create warp; too close to existing warp point: __1__
+too-close-to-water=Cannot create warp; too close to water, please move __1__ tiles away from the water body or landfill it
+too-close-to-entities=Cannot create warp; too close to other entities, please move __1__ tiles away from the entities or remove them
+last-edit=Last edited by __1__ at __2__\nClick to view on map
+add-tooltip=Add new warp
+confirm-tooltip=儲存更改
+cancel-tooltip=放棄更改
+edit-tooltip=Currently being edited by: __1__
+edit-tooltip-none=Currently being edited by: Nobody
+remove-tooltip=Remove warp
+timer-tooltip=Please wait __1__ seconds before you can warp
+timer-tooltip-zero=After each warp you will need to wait __1__ seconds before you can warp again
+goto-tooltip=Go to x __1__ y __2__
+goto-bypass=Go to x __1__ y __2__, bypass mode
+goto-bypass-different-network=Go to x __1__ y __2__, bypass mode different network
+goto-same-warp=You are already on this warp
+goto-different-network=This warp is on a different network, use power poles to connect it
+goto-cooldown=You are on cooldown, wait for your cooldown to recharge
+goto-disabled=You are not on a warp point, walk to a warp point
+goto-edit=Edit warp icon
+
+[readme]
+main-tooltip=資訊
+welcome-tab=歡迎
+welcome-tooltip=歡迎來到 Explosive Gaming
+welcome-general=Welcome to Explosive Gaming; we host many factorio servers. While you are here, we ask you to follow our rules. You can find these in the tab above. You can also find our custom commands and links to our other servers. This map has been online for __2__.\nPlease note that our servers reset periodically, the next reset is: __1__
+welcome-roles=We run a custom role system to help protect the work of others. As a result you may not be able to use your deconstruction planner yet or drop item on the groud. Roles also give you access to some custom features such as adding tasks to our task list or making new warp points.\nYou have been assigned the roles: __1__
+welcome-chat=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key (which is located under the “ESC key”) - If you would like to change the key, go to your Controls tab in options.\nThe setting you need to change is “Toggle chat (and Lua console)” you currently have it set to "__CONTROL__toggle-console__"
+rules-tab=Rules
+rules-tooltip=Rules for our server
+rules-general=By playing on our servers you accept the rules below. If you are supected of breaking a rule then you will be questioned by one of our moderators. If required you will be banned from our servers, appeals can be made by contacting an Administrator on our discord.
+rules-1=Hacking / cheating / abusing bugs will not be tolerated.
+rules-2=Any bugs or exploits found should be reported to our staff members.
+rules-3=Be respectful to other players in chat, this includes any other forms of communication.
+rules-4=Taking all items from a belt or logistics network is forbidden: sharing resources is mandatory.
+rules-5=Spamming of chat, bots, unlimited chests, or concrete is not allowed.
+rules-6=Before removing major parts of the factory tell other players why you are removing it.
+rules-7=Do not cause unnecessary lag by placing/removing tiles with bots or using active provider chests, if think some thing might cause lag please ask staff first.
+rules-8=Do not walk in random directions with no reason, this is to reduce map download times.
+rules-9=Do not use speakers on global or with alerts without prior permission, no one wants to hear your music at full volume without knowing where the off switch is.
+rules-10=Do not rotate belts, deactivate belts with wires, or cause production to stop without good reason, this goes for inserters and spliters as well.
+rules-11=Do not make train roundabouts. Other loops such as RoRo stations are allowed.
+rules-12=When using trains, use the same size other players have used, many players use 1-2-1, 2-4-2, or 3-8-3, meaning 1 engine 2 cargo 1 engine.
+rules-13=Trains are Left Hand Drive (LHD) only, this means trains drive on the left side of the tracks.
+rules-14=Do not beg for roles, advertise other servers, or link to harmful sites.
+rules-15=Use common sense, report rule breakers, and Administrators have the final word.
+commands-tab=指令
+commands-tooltip=Commands which you are able to use
+commands-general=We have lots of custom commands which you are able to use. Below you can find a list of all the commands that you are allowed to use and what they do. If you need more information or want to search for a command you can use our /search-help command.
+servers-tab=伺服器
+servers-tooltip=Links to our other servers and sites
+servers-general=This is only one of our servers for factorio, we host many of others as well. Below you can find details about all the servers that we host as well as links to our external services such as discord or github.
+servers-factorio=異星工廠伺服器
+servers-1=S1 公共
+servers-d1=這個伺服器每 兩日 (48小時) 重設.
+servers-2=S2 -
+servers-d2=這個伺服器沒在營運.
+servers-3=S3 周
+servers-d3=這個伺服器每 七日 (168小時) 重設.
+servers-4=S4 月
+servers-d4=這個伺服器每 二十八日 (672小時) 重設.
+servers-5=S5 模組
+servers-d5=這個伺服器運行模組, 可在 Discord 中得到更多資訊.
+servers-6=S6 Donator
+servers-d6=這個伺服器為支持者運行, 可在 Discord 中得到更多資訊.
+servers-7=S7 項目
+servers-d7=這個伺服器只在有項目期間運行.
+servers-8=S8 T̷-̶s̶-̴:̷
+servers-d8=N̵o̴ ̶o̷-̶e̵ ̴k̸n̷-̶w̵s̸ ̴w̷h̷a̶-̶ ̷h̴a̴p̷p̴e̷n̷s̸ ̷o̶n̴ ̷t̶h̴-̶s̶ ̷s̷e̶r̸v̸e̴r̷,̶ ̸i̸t̴ ̷m̶-̸g̴h̶t̷ ̸n̸-̶t̵ ̷e̴v̸e̸n̶t̷ ̵-̷x̴i̵s̶t̸.̸
+servers-connect-Offline=該伺服器目前沒有在運行
+servers-connect-Current=你目前所在的伺服器
+servers-connect-Version=該伺服器運行不同的遊戲版本: __1__
+servers-connect-Password=該伺服器需要密碼
+servers-connect-Modded=該伺服器需要下載模組
+servers-connect-Online=該伺服器在線
+servers-external=外部連結
+servers-open-in-browser=可在你的瀏覽器中打開
+backers-tab=支持者
+backers-tooltip=支持者
+backers-general=他們為伺服器運行提供了不少幫助.
+backers-management=系統管理員
+backers-board=議員
+backers-staff=職員
+backers-backers=支持者
+backers-active=活躍玩家
+data-tab=資料
+data-tooltip=所有已存資料
+data-general=資料會自動存到各個服務器中. 你也可以用 /save-data 存一份副本. 也可用 /set-preference 來更改喜好.
+data-settings=設定
+data-statistics=數據
+data-required=需要
+data-misc=雜項
+data-format=__1____2__
+
+[tree-decon]
+main-tooltip=樹木快速拆除選項
+enabled=啟用
+disabled=停用
+toggle-msg=樹木快速拆除已 __1__
\ No newline at end of file
From 4cbb432b6973136d1d875834b96e3b7ec63f1026 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Tue, 25 Oct 2022 00:17:49 +0900
Subject: [PATCH 101/129] Update gui.cfg
---
locale/zh-TW/gui.cfg | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/locale/zh-TW/gui.cfg b/locale/zh-TW/gui.cfg
index 9c392df7..0f807397 100644
--- a/locale/zh-TW/gui.cfg
+++ b/locale/zh-TW/gui.cfg
@@ -67,26 +67,26 @@ net-tooltip=淨: __1__
no-packs=你未有製造任何研究瓶
[task-list]
-main-caption=Task List [img=info]
-main-tooltip=Task List
+main-caption=工作流程 [img=info]
+main-tooltip=工作流程
sub-tooltip=Tasks that remain to be done\n- You can use richtext to include images [img=utility/not_enough_repair_packs_icon] or [color=blue]color[/color] your tasks.
-no-tasks=No tasks found!
-no-tasks-tooltip=Click on the plus button to the top right of this window to add a new task!
-last-edit=Last edited by __1__ at __2__
-add-tooltip=Add new task
-confirm=Confirm
-confirm-tooltip=Save task (minimum of 5 characters long)
-discard=Discard
-discard-tooltip=Discard task/changes
-delete=Delete
-delete-tooltip=Delete task
-close-tooltip=Close task details
-edit=Edit task
-edit-tooltip=Currently being edited by: __1__
-edit-tooltip-none=Currently being edited by: Nobody
-create-footer-header=Create task
-edit-footer-header=Edit task
-view-footer-header=Task details
+no-tasks=沒有工作流程
+no-tasks-tooltip=按加號加入工作流程
+last-edit=最後由 __1__ 在 __2__ 修改
+add-tooltip=加入工作流程
+confirm=確認
+confirm-tooltip=儲存工作流程 (最少要5個字長)
+discard=放棄
+discard-tooltip=放棄更改動
+delete=刪除
+delete-tooltip=刪除工作流程
+close-tooltip=關閉工作流程
+edit=修改工作流程
+edit-tooltip=現被 __1__ 修改中
+edit-tooltip-none=現沒有被人修改
+create-footer-header=加入工作流程
+edit-footer-header=修改工作流程
+view-footer-header=工作流程細節
[autofill]
main-tooltip=自動填入設定
toggle-section-caption=__1__ __2__
From 1f5b4325e7f34e963eb13e27c2982a6688a54276 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Tue, 25 Oct 2022 00:19:11 +0900
Subject: [PATCH 102/129] Update gui.cfg
---
locale/zh-TW/gui.cfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/locale/zh-TW/gui.cfg b/locale/zh-TW/gui.cfg
index 0f807397..472b94dc 100644
--- a/locale/zh-TW/gui.cfg
+++ b/locale/zh-TW/gui.cfg
@@ -69,7 +69,7 @@ no-packs=你未有製造任何研究瓶
[task-list]
main-caption=工作流程 [img=info]
main-tooltip=工作流程
-sub-tooltip=Tasks that remain to be done\n- You can use richtext to include images [img=utility/not_enough_repair_packs_icon] or [color=blue]color[/color] your tasks.
+sub-tooltip=需要完成的工作流程\n- 你可以用富文本來加上圖片 [img=utility/not_enough_repair_packs_icon] 或 [color=blue] 顏色[/color].
no-tasks=沒有工作流程
no-tasks-tooltip=按加號加入工作流程
last-edit=最後由 __1__ 在 __2__ 修改
From ea02b6f905b4fc6e74e3e7a7a9b49723f7ca1fb6 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Tue, 25 Oct 2022 00:22:00 +0900
Subject: [PATCH 103/129] Update gui.cfg
---
locale/zh-TW/gui.cfg | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/locale/zh-TW/gui.cfg b/locale/zh-TW/gui.cfg
index 472b94dc..cf63a0e4 100644
--- a/locale/zh-TW/gui.cfg
+++ b/locale/zh-TW/gui.cfg
@@ -92,11 +92,11 @@ main-tooltip=自動填入設定
toggle-section-caption=__1__ __2__
toggle-section-tooltip=擴張欄
toggle-section-collapse-tooltip=收縮欄
-toggle-entity-tooltip=Toggle the autofill of __1__
-toggle-tooltip=Toggle the autofill of __1__ into __2__ slots
-amount-tooltip=Amount of items to insert into the __1__ slots
-invalid=Autofill set to maximum amount: __1__ __2__ for __3__
-inserted=Inserted __1__ __2__ into __3__
+toggle-entity-tooltip=自動填入設定 - __1__
+toggle-tooltip=自動填入設定 - __2__ 的 __1__
+amount-tooltip=自動填入 __1__ 的數量
+invalid=自動填入最大值 __1__ __2__ 給 __3__
+inserted=自動填入 __1__ __2__ 到 __3__
[warp-list]
main-caption=Warp List [img=info]
From 93cca468b892a5cd211fb81b06d985efd408544e Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Tue, 25 Oct 2022 00:33:41 +0900
Subject: [PATCH 104/129] Update gui.cfg
---
locale/zh-TW/gui.cfg | 50 ++++++++++++++++++++++----------------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/locale/zh-TW/gui.cfg b/locale/zh-TW/gui.cfg
index cf63a0e4..68358adf 100644
--- a/locale/zh-TW/gui.cfg
+++ b/locale/zh-TW/gui.cfg
@@ -99,35 +99,35 @@ invalid=自動填入最大值 __1__ __2__ 給 __3__
inserted=自動填入 __1__ __2__ 到 __3__
[warp-list]
-main-caption=Warp List [img=info]
-main-tooltip=Warp List; Must be within __1__ tiles to use
-sub-tooltip=Warps can only be used every __1__ seconds and when within __2__ tiles\n__3__\n__4__\n__5__\n__6__\n__7__\n__8__
-sub-tooltip-current= - __1__ This is your current warp point;
-sub-tooltip-connected= - __1__ You can travel to this warp point;
-sub-tooltip-different= - __1__ This warp is on a different network;
-sub-tooltip-cooldown= - __1__ You are currently on cooldown;
-sub-tooltip-not_available= - __1__ You are not in range of a warp point;
-sub-tooltip-bypass= - __1__ Your role allows you to travel here;
-too-close=Cannot create warp; too close to existing warp point: __1__
-too-close-to-water=Cannot create warp; too close to water, please move __1__ tiles away from the water body or landfill it
-too-close-to-entities=Cannot create warp; too close to other entities, please move __1__ tiles away from the entities or remove them
-last-edit=Last edited by __1__ at __2__\nClick to view on map
-add-tooltip=Add new warp
+main-caption=傳送陣清單 [img=info]
+main-tooltip=傳送陣清單; 需在 __1__ 格之內使用
+sub-tooltip=傳送陣在 __1__ 秒內只能使用一次. 亦需在 __2__ 格之內使用\n__3__\n__4__\n__5__\n__6__\n__7__\n__8__
+sub-tooltip-current= - __1__ 你目前的傳送陣;
+sub-tooltip-connected= - __1__ 你可以到本傳送陣;
+sub-tooltip-different= - __1__ 該傳送陣未連接;
+sub-tooltip-cooldown= - __1__ 傳送冷卻中;
+sub-tooltip-not_available= - __1__ 你不在傳送陣範圍;
+sub-tooltip-bypass= - __1__ 你可以傳送到這裏;
+too-close=無法新建傳送陣; 太接近 __1__ 了
+too-close-to-water=無法新建傳送陣; 太接近水源了, 請移動 __1__ 格又或者填平該地方
+too-close-to-entities=無法新建傳送陣; 太接近其他東西, 請移動 __1__ 格又或者拆除該東西
+last-edit=最後由 __1__ 在 __2__ 更改\n按這在地圖上看
+add-tooltip=新建傳送陣
confirm-tooltip=儲存更改
cancel-tooltip=放棄更改
-edit-tooltip=Currently being edited by: __1__
-edit-tooltip-none=Currently being edited by: Nobody
-remove-tooltip=Remove warp
-timer-tooltip=Please wait __1__ seconds before you can warp
-timer-tooltip-zero=After each warp you will need to wait __1__ seconds before you can warp again
-goto-tooltip=Go to x __1__ y __2__
-goto-bypass=Go to x __1__ y __2__, bypass mode
-goto-bypass-different-network=Go to x __1__ y __2__, bypass mode different network
-goto-same-warp=You are already on this warp
-goto-different-network=This warp is on a different network, use power poles to connect it
+edit-tooltip=現被 __1__ 修改中
+edit-tooltip-none=現沒有被人修改
+remove-tooltip=拆除傳送陣
+timer-tooltip=請等 __1__ 秒才再次傳送
+timer-tooltip-zero=你要等 __1__ 秒才可以再次傳送
+goto-tooltip=到 X __1__ Y __2__
+goto-bypass=到 X __1__ Y __2__, 繞行模式
+goto-bypass-different-network=到 X __1__ Y __2__, 繞行模式 (不同網絡)
+goto-same-warp=你已在該傳送陣
+goto-different-network=該傳送陣未連接, 你可使用電纜連接
goto-cooldown=You are on cooldown, wait for your cooldown to recharge
goto-disabled=You are not on a warp point, walk to a warp point
-goto-edit=Edit warp icon
+goto-edit=修改傳送陣圖案
[readme]
main-tooltip=資訊
From 79f4a0379271a6746d492630ca89dde066f7f671 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Tue, 25 Oct 2022 00:35:27 +0900
Subject: [PATCH 105/129] Update gui.cfg
---
locale/zh-TW/gui.cfg | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/locale/zh-TW/gui.cfg b/locale/zh-TW/gui.cfg
index 68358adf..596ef45b 100644
--- a/locale/zh-TW/gui.cfg
+++ b/locale/zh-TW/gui.cfg
@@ -125,15 +125,15 @@ goto-bypass=到 X __1__ Y __2__, 繞行模式
goto-bypass-different-network=到 X __1__ Y __2__, 繞行模式 (不同網絡)
goto-same-warp=你已在該傳送陣
goto-different-network=該傳送陣未連接, 你可使用電纜連接
-goto-cooldown=You are on cooldown, wait for your cooldown to recharge
-goto-disabled=You are not on a warp point, walk to a warp point
+goto-cooldown=傳送冷卻中, 請等候冷卻
+goto-disabled=你不在傳送陣, 請移至任意傳送陣
goto-edit=修改傳送陣圖案
[readme]
main-tooltip=資訊
welcome-tab=歡迎
welcome-tooltip=歡迎來到 Explosive Gaming
-welcome-general=Welcome to Explosive Gaming; we host many factorio servers. While you are here, we ask you to follow our rules. You can find these in the tab above. You can also find our custom commands and links to our other servers. This map has been online for __2__.\nPlease note that our servers reset periodically, the next reset is: __1__
+welcome-general=歡迎來到 Explosive Gaming; we host many factorio servers. While you are here, we ask you to follow our rules. You can find these in the tab above. You can also find our custom commands and links to our other servers. This map has been online for __2__.\nPlease note that our servers reset periodically, the next reset is: __1__
welcome-roles=We run a custom role system to help protect the work of others. As a result you may not be able to use your deconstruction planner yet or drop item on the groud. Roles also give you access to some custom features such as adding tasks to our task list or making new warp points.\nYou have been assigned the roles: __1__
welcome-chat=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key (which is located under the “ESC key”) - If you would like to change the key, go to your Controls tab in options.\nThe setting you need to change is “Toggle chat (and Lua console)” you currently have it set to "__CONTROL__toggle-console__"
rules-tab=Rules
From 25afd6ac30dabaf62f7aca3018f4cfa9f610b82b Mon Sep 17 00:00:00 2001
From: PHIDIAS <10016767+PHIDIAS0303@users.noreply.github.com>
Date: Tue, 25 Oct 2022 01:00:04 +0900
Subject: [PATCH 106/129] .
---
locale/zh-TW/gui.cfg | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/locale/zh-TW/gui.cfg b/locale/zh-TW/gui.cfg
index 596ef45b..25e5af4b 100644
--- a/locale/zh-TW/gui.cfg
+++ b/locale/zh-TW/gui.cfg
@@ -136,8 +136,8 @@ welcome-tooltip=歡迎來到 Explosive Gaming
welcome-general=歡迎來到 Explosive Gaming; we host many factorio servers. While you are here, we ask you to follow our rules. You can find these in the tab above. You can also find our custom commands and links to our other servers. This map has been online for __2__.\nPlease note that our servers reset periodically, the next reset is: __1__
welcome-roles=We run a custom role system to help protect the work of others. As a result you may not be able to use your deconstruction planner yet or drop item on the groud. Roles also give you access to some custom features such as adding tasks to our task list or making new warp points.\nYou have been assigned the roles: __1__
welcome-chat=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key (which is located under the “ESC key”) - If you would like to change the key, go to your Controls tab in options.\nThe setting you need to change is “Toggle chat (and Lua console)” you currently have it set to "__CONTROL__toggle-console__"
-rules-tab=Rules
-rules-tooltip=Rules for our server
+rules-tab=規則
+rules-tooltip=伺服器規則
rules-general=By playing on our servers you accept the rules below. If you are supected of breaking a rule then you will be questioned by one of our moderators. If required you will be banned from our servers, appeals can be made by contacting an Administrator on our discord.
rules-1=Hacking / cheating / abusing bugs will not be tolerated.
rules-2=Any bugs or exploits found should be reported to our staff members.
@@ -155,10 +155,10 @@ rules-13=Trains are Left Hand Drive (LHD) only, this means trains drive on the l
rules-14=Do not beg for roles, advertise other servers, or link to harmful sites.
rules-15=Use common sense, report rule breakers, and Administrators have the final word.
commands-tab=指令
-commands-tooltip=Commands which you are able to use
+commands-tooltip=你可用的指令
commands-general=We have lots of custom commands which you are able to use. Below you can find a list of all the commands that you are allowed to use and what they do. If you need more information or want to search for a command you can use our /search-help command.
servers-tab=伺服器
-servers-tooltip=Links to our other servers and sites
+servers-tooltip=到其他伺服器及網站的連結
servers-general=This is only one of our servers for factorio, we host many of others as well. Below you can find details about all the servers that we host as well as links to our external services such as discord or github.
servers-factorio=異星工廠伺服器
servers-1=S1 公共
From 2f588cc59d11e6708c28148a127cac6f9ac100ee Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Tue, 25 Oct 2022 01:12:42 +0900
Subject: [PATCH 107/129] .
---
locale/zh-TW/gui.cfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/locale/zh-TW/gui.cfg b/locale/zh-TW/gui.cfg
index 25e5af4b..2f385e6d 100644
--- a/locale/zh-TW/gui.cfg
+++ b/locale/zh-TW/gui.cfg
@@ -156,7 +156,7 @@ rules-14=Do not beg for roles, advertise other servers, or link to harmful sites
rules-15=Use common sense, report rule breakers, and Administrators have the final word.
commands-tab=指令
commands-tooltip=你可用的指令
-commands-general=We have lots of custom commands which you are able to use. Below you can find a list of all the commands that you are allowed to use and what they do. If you need more information or want to search for a command you can use our /search-help command.
+commands-general=這裏有自訂的指令. 你可以在下邊找到你可用的指令及其功能介紹. 你可以用 /search-help 來取得更多資訊.
servers-tab=伺服器
servers-tooltip=到其他伺服器及網站的連結
servers-general=This is only one of our servers for factorio, we host many of others as well. Below you can find details about all the servers that we host as well as links to our external services such as discord or github.
From 71310758e29a8cba8af8d47cb9ce5cf7d81e0d0c Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Tue, 25 Oct 2022 01:25:09 +0900
Subject: [PATCH 108/129] .
---
locale/zh-TW/gui.cfg | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/locale/zh-TW/gui.cfg b/locale/zh-TW/gui.cfg
index 2f385e6d..c431a73e 100644
--- a/locale/zh-TW/gui.cfg
+++ b/locale/zh-TW/gui.cfg
@@ -134,8 +134,8 @@ main-tooltip=資訊
welcome-tab=歡迎
welcome-tooltip=歡迎來到 Explosive Gaming
welcome-general=歡迎來到 Explosive Gaming; we host many factorio servers. While you are here, we ask you to follow our rules. You can find these in the tab above. You can also find our custom commands and links to our other servers. This map has been online for __2__.\nPlease note that our servers reset periodically, the next reset is: __1__
-welcome-roles=We run a custom role system to help protect the work of others. As a result you may not be able to use your deconstruction planner yet or drop item on the groud. Roles also give you access to some custom features such as adding tasks to our task list or making new warp points.\nYou have been assigned the roles: __1__
-welcome-chat=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key (which is located under the “ESC key”) - If you would like to change the key, go to your Controls tab in options.\nThe setting you need to change is “Toggle chat (and Lua console)” you currently have it set to "__CONTROL__toggle-console__"
+welcome-roles=我們有自訂的身份組來保護其他用戶. 所以你有機會不能使用拆除規劃器或掉東西. 身份組給予你各種權限\n你有以下身份組: __1__
+welcome-chat=你可以使用 「重音符/抑音符」 鍵 (ESC 鍵 下方) - 你也可以在選項中修改按鍵.\n你目前設定為 「__CONTROL__toggle-console__」
rules-tab=規則
rules-tooltip=伺服器規則
rules-general=By playing on our servers you accept the rules below. If you are supected of breaking a rule then you will be questioned by one of our moderators. If required you will be banned from our servers, appeals can be made by contacting an Administrator on our discord.
@@ -151,15 +151,15 @@ rules-9=Do not use speakers on global or with alerts without prior permission, n
rules-10=Do not rotate belts, deactivate belts with wires, or cause production to stop without good reason, this goes for inserters and spliters as well.
rules-11=Do not make train roundabouts. Other loops such as RoRo stations are allowed.
rules-12=When using trains, use the same size other players have used, many players use 1-2-1, 2-4-2, or 3-8-3, meaning 1 engine 2 cargo 1 engine.
-rules-13=Trains are Left Hand Drive (LHD) only, this means trains drive on the left side of the tracks.
-rules-14=Do not beg for roles, advertise other servers, or link to harmful sites.
-rules-15=Use common sense, report rule breakers, and Administrators have the final word.
+rules-13=火車必須是左上右下 (LHD).
+rules-14=禁止要求身份組, 發廣告, 發惡意連結.
+rules-15=使用常識, 舉報違規人員, 管理只有最終決定權.
commands-tab=指令
commands-tooltip=你可用的指令
commands-general=這裏有自訂的指令. 你可以在下邊找到你可用的指令及其功能介紹. 你可以用 /search-help 來取得更多資訊.
servers-tab=伺服器
servers-tooltip=到其他伺服器及網站的連結
-servers-general=This is only one of our servers for factorio, we host many of others as well. Below you can find details about all the servers that we host as well as links to our external services such as discord or github.
+servers-general=這是其中一個伺服器. 你可以在下方找到其他同樣是由我們運行的伺服器資料.
servers-factorio=異星工廠伺服器
servers-1=S1 公共
servers-d1=這個伺服器每 兩日 (48小時) 重設.
From e15786b66d3aa40e6723cbdede90d694d98e4db5 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Tue, 25 Oct 2022 01:30:20 +0900
Subject: [PATCH 109/129] .
---
locale/zh-TW/gui.cfg | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/locale/zh-TW/gui.cfg b/locale/zh-TW/gui.cfg
index c431a73e..da4d2b59 100644
--- a/locale/zh-TW/gui.cfg
+++ b/locale/zh-TW/gui.cfg
@@ -138,7 +138,7 @@ welcome-roles=我們有自訂的身份組來保護其他用戶. 所以你有機
welcome-chat=你可以使用 「重音符/抑音符」 鍵 (ESC 鍵 下方) - 你也可以在選項中修改按鍵.\n你目前設定為 「__CONTROL__toggle-console__」
rules-tab=規則
rules-tooltip=伺服器規則
-rules-general=By playing on our servers you accept the rules below. If you are supected of breaking a rule then you will be questioned by one of our moderators. If required you will be banned from our servers, appeals can be made by contacting an Administrator on our discord.
+rules-general=你在本伺服器遊玩即等同同意以下規則. 管理員有機會就相關事項提問. 你可能會因為違反規則而被封禁, 你可以在 Discord 中提出反對.
rules-1=Hacking / cheating / abusing bugs will not be tolerated.
rules-2=Any bugs or exploits found should be reported to our staff members.
rules-3=Be respectful to other players in chat, this includes any other forms of communication.
@@ -153,7 +153,7 @@ rules-11=Do not make train roundabouts. Other loops such as RoRo stations are al
rules-12=When using trains, use the same size other players have used, many players use 1-2-1, 2-4-2, or 3-8-3, meaning 1 engine 2 cargo 1 engine.
rules-13=火車必須是左上右下 (LHD).
rules-14=禁止要求身份組, 發廣告, 發惡意連結.
-rules-15=使用常識, 舉報違規人員, 管理只有最終決定權.
+rules-15=使用常識, 舉報違規人員, 管理員只有最終決定權.
commands-tab=指令
commands-tooltip=你可用的指令
commands-general=這裏有自訂的指令. 你可以在下邊找到你可用的指令及其功能介紹. 你可以用 /search-help 來取得更多資訊.
From 795f1cf50607c4b6a2b3fbf6088a3554f47f79a7 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Tue, 25 Oct 2022 01:37:36 +0900
Subject: [PATCH 110/129] .
---
locale/zh-CN/gui.cfg | 130 +++++++++++++++++++++----------------------
1 file changed, 65 insertions(+), 65 deletions(-)
diff --git a/locale/zh-CN/gui.cfg b/locale/zh-CN/gui.cfg
index 9c392df7..da4d2b59 100644
--- a/locale/zh-CN/gui.cfg
+++ b/locale/zh-CN/gui.cfg
@@ -67,78 +67,78 @@ net-tooltip=淨: __1__
no-packs=你未有製造任何研究瓶
[task-list]
-main-caption=Task List [img=info]
-main-tooltip=Task List
-sub-tooltip=Tasks that remain to be done\n- You can use richtext to include images [img=utility/not_enough_repair_packs_icon] or [color=blue]color[/color] your tasks.
-no-tasks=No tasks found!
-no-tasks-tooltip=Click on the plus button to the top right of this window to add a new task!
-last-edit=Last edited by __1__ at __2__
-add-tooltip=Add new task
-confirm=Confirm
-confirm-tooltip=Save task (minimum of 5 characters long)
-discard=Discard
-discard-tooltip=Discard task/changes
-delete=Delete
-delete-tooltip=Delete task
-close-tooltip=Close task details
-edit=Edit task
-edit-tooltip=Currently being edited by: __1__
-edit-tooltip-none=Currently being edited by: Nobody
-create-footer-header=Create task
-edit-footer-header=Edit task
-view-footer-header=Task details
+main-caption=工作流程 [img=info]
+main-tooltip=工作流程
+sub-tooltip=需要完成的工作流程\n- 你可以用富文本來加上圖片 [img=utility/not_enough_repair_packs_icon] 或 [color=blue] 顏色[/color].
+no-tasks=沒有工作流程
+no-tasks-tooltip=按加號加入工作流程
+last-edit=最後由 __1__ 在 __2__ 修改
+add-tooltip=加入工作流程
+confirm=確認
+confirm-tooltip=儲存工作流程 (最少要5個字長)
+discard=放棄
+discard-tooltip=放棄更改動
+delete=刪除
+delete-tooltip=刪除工作流程
+close-tooltip=關閉工作流程
+edit=修改工作流程
+edit-tooltip=現被 __1__ 修改中
+edit-tooltip-none=現沒有被人修改
+create-footer-header=加入工作流程
+edit-footer-header=修改工作流程
+view-footer-header=工作流程細節
[autofill]
main-tooltip=自動填入設定
toggle-section-caption=__1__ __2__
toggle-section-tooltip=擴張欄
toggle-section-collapse-tooltip=收縮欄
-toggle-entity-tooltip=Toggle the autofill of __1__
-toggle-tooltip=Toggle the autofill of __1__ into __2__ slots
-amount-tooltip=Amount of items to insert into the __1__ slots
-invalid=Autofill set to maximum amount: __1__ __2__ for __3__
-inserted=Inserted __1__ __2__ into __3__
+toggle-entity-tooltip=自動填入設定 - __1__
+toggle-tooltip=自動填入設定 - __2__ 的 __1__
+amount-tooltip=自動填入 __1__ 的數量
+invalid=自動填入最大值 __1__ __2__ 給 __3__
+inserted=自動填入 __1__ __2__ 到 __3__
[warp-list]
-main-caption=Warp List [img=info]
-main-tooltip=Warp List; Must be within __1__ tiles to use
-sub-tooltip=Warps can only be used every __1__ seconds and when within __2__ tiles\n__3__\n__4__\n__5__\n__6__\n__7__\n__8__
-sub-tooltip-current= - __1__ This is your current warp point;
-sub-tooltip-connected= - __1__ You can travel to this warp point;
-sub-tooltip-different= - __1__ This warp is on a different network;
-sub-tooltip-cooldown= - __1__ You are currently on cooldown;
-sub-tooltip-not_available= - __1__ You are not in range of a warp point;
-sub-tooltip-bypass= - __1__ Your role allows you to travel here;
-too-close=Cannot create warp; too close to existing warp point: __1__
-too-close-to-water=Cannot create warp; too close to water, please move __1__ tiles away from the water body or landfill it
-too-close-to-entities=Cannot create warp; too close to other entities, please move __1__ tiles away from the entities or remove them
-last-edit=Last edited by __1__ at __2__\nClick to view on map
-add-tooltip=Add new warp
+main-caption=傳送陣清單 [img=info]
+main-tooltip=傳送陣清單; 需在 __1__ 格之內使用
+sub-tooltip=傳送陣在 __1__ 秒內只能使用一次. 亦需在 __2__ 格之內使用\n__3__\n__4__\n__5__\n__6__\n__7__\n__8__
+sub-tooltip-current= - __1__ 你目前的傳送陣;
+sub-tooltip-connected= - __1__ 你可以到本傳送陣;
+sub-tooltip-different= - __1__ 該傳送陣未連接;
+sub-tooltip-cooldown= - __1__ 傳送冷卻中;
+sub-tooltip-not_available= - __1__ 你不在傳送陣範圍;
+sub-tooltip-bypass= - __1__ 你可以傳送到這裏;
+too-close=無法新建傳送陣; 太接近 __1__ 了
+too-close-to-water=無法新建傳送陣; 太接近水源了, 請移動 __1__ 格又或者填平該地方
+too-close-to-entities=無法新建傳送陣; 太接近其他東西, 請移動 __1__ 格又或者拆除該東西
+last-edit=最後由 __1__ 在 __2__ 更改\n按這在地圖上看
+add-tooltip=新建傳送陣
confirm-tooltip=儲存更改
cancel-tooltip=放棄更改
-edit-tooltip=Currently being edited by: __1__
-edit-tooltip-none=Currently being edited by: Nobody
-remove-tooltip=Remove warp
-timer-tooltip=Please wait __1__ seconds before you can warp
-timer-tooltip-zero=After each warp you will need to wait __1__ seconds before you can warp again
-goto-tooltip=Go to x __1__ y __2__
-goto-bypass=Go to x __1__ y __2__, bypass mode
-goto-bypass-different-network=Go to x __1__ y __2__, bypass mode different network
-goto-same-warp=You are already on this warp
-goto-different-network=This warp is on a different network, use power poles to connect it
-goto-cooldown=You are on cooldown, wait for your cooldown to recharge
-goto-disabled=You are not on a warp point, walk to a warp point
-goto-edit=Edit warp icon
+edit-tooltip=現被 __1__ 修改中
+edit-tooltip-none=現沒有被人修改
+remove-tooltip=拆除傳送陣
+timer-tooltip=請等 __1__ 秒才再次傳送
+timer-tooltip-zero=你要等 __1__ 秒才可以再次傳送
+goto-tooltip=到 X __1__ Y __2__
+goto-bypass=到 X __1__ Y __2__, 繞行模式
+goto-bypass-different-network=到 X __1__ Y __2__, 繞行模式 (不同網絡)
+goto-same-warp=你已在該傳送陣
+goto-different-network=該傳送陣未連接, 你可使用電纜連接
+goto-cooldown=傳送冷卻中, 請等候冷卻
+goto-disabled=你不在傳送陣, 請移至任意傳送陣
+goto-edit=修改傳送陣圖案
[readme]
main-tooltip=資訊
welcome-tab=歡迎
welcome-tooltip=歡迎來到 Explosive Gaming
-welcome-general=Welcome to Explosive Gaming; we host many factorio servers. While you are here, we ask you to follow our rules. You can find these in the tab above. You can also find our custom commands and links to our other servers. This map has been online for __2__.\nPlease note that our servers reset periodically, the next reset is: __1__
-welcome-roles=We run a custom role system to help protect the work of others. As a result you may not be able to use your deconstruction planner yet or drop item on the groud. Roles also give you access to some custom features such as adding tasks to our task list or making new warp points.\nYou have been assigned the roles: __1__
-welcome-chat=Chatting can be difficult for new players because it’s different than other games! It’s very simple, the button you need to press is the “GRAVE/TILDE” key (which is located under the “ESC key”) - If you would like to change the key, go to your Controls tab in options.\nThe setting you need to change is “Toggle chat (and Lua console)” you currently have it set to "__CONTROL__toggle-console__"
-rules-tab=Rules
-rules-tooltip=Rules for our server
-rules-general=By playing on our servers you accept the rules below. If you are supected of breaking a rule then you will be questioned by one of our moderators. If required you will be banned from our servers, appeals can be made by contacting an Administrator on our discord.
+welcome-general=歡迎來到 Explosive Gaming; we host many factorio servers. While you are here, we ask you to follow our rules. You can find these in the tab above. You can also find our custom commands and links to our other servers. This map has been online for __2__.\nPlease note that our servers reset periodically, the next reset is: __1__
+welcome-roles=我們有自訂的身份組來保護其他用戶. 所以你有機會不能使用拆除規劃器或掉東西. 身份組給予你各種權限\n你有以下身份組: __1__
+welcome-chat=你可以使用 「重音符/抑音符」 鍵 (ESC 鍵 下方) - 你也可以在選項中修改按鍵.\n你目前設定為 「__CONTROL__toggle-console__」
+rules-tab=規則
+rules-tooltip=伺服器規則
+rules-general=你在本伺服器遊玩即等同同意以下規則. 管理員有機會就相關事項提問. 你可能會因為違反規則而被封禁, 你可以在 Discord 中提出反對.
rules-1=Hacking / cheating / abusing bugs will not be tolerated.
rules-2=Any bugs or exploits found should be reported to our staff members.
rules-3=Be respectful to other players in chat, this includes any other forms of communication.
@@ -151,15 +151,15 @@ rules-9=Do not use speakers on global or with alerts without prior permission, n
rules-10=Do not rotate belts, deactivate belts with wires, or cause production to stop without good reason, this goes for inserters and spliters as well.
rules-11=Do not make train roundabouts. Other loops such as RoRo stations are allowed.
rules-12=When using trains, use the same size other players have used, many players use 1-2-1, 2-4-2, or 3-8-3, meaning 1 engine 2 cargo 1 engine.
-rules-13=Trains are Left Hand Drive (LHD) only, this means trains drive on the left side of the tracks.
-rules-14=Do not beg for roles, advertise other servers, or link to harmful sites.
-rules-15=Use common sense, report rule breakers, and Administrators have the final word.
+rules-13=火車必須是左上右下 (LHD).
+rules-14=禁止要求身份組, 發廣告, 發惡意連結.
+rules-15=使用常識, 舉報違規人員, 管理員只有最終決定權.
commands-tab=指令
-commands-tooltip=Commands which you are able to use
-commands-general=We have lots of custom commands which you are able to use. Below you can find a list of all the commands that you are allowed to use and what they do. If you need more information or want to search for a command you can use our /search-help command.
+commands-tooltip=你可用的指令
+commands-general=這裏有自訂的指令. 你可以在下邊找到你可用的指令及其功能介紹. 你可以用 /search-help 來取得更多資訊.
servers-tab=伺服器
-servers-tooltip=Links to our other servers and sites
-servers-general=This is only one of our servers for factorio, we host many of others as well. Below you can find details about all the servers that we host as well as links to our external services such as discord or github.
+servers-tooltip=到其他伺服器及網站的連結
+servers-general=這是其中一個伺服器. 你可以在下方找到其他同樣是由我們運行的伺服器資料.
servers-factorio=異星工廠伺服器
servers-1=S1 公共
servers-d1=這個伺服器每 兩日 (48小時) 重設.
From dfcf88217067e652c3d128d44c7bb8982dba7296 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Tue, 25 Oct 2022 01:50:07 +0900
Subject: [PATCH 111/129]
---
locale/zh-TW/gui.cfg | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/locale/zh-TW/gui.cfg b/locale/zh-TW/gui.cfg
index da4d2b59..38c85b3c 100644
--- a/locale/zh-TW/gui.cfg
+++ b/locale/zh-TW/gui.cfg
@@ -139,7 +139,7 @@ welcome-chat=你可以使用 「重音符/抑音符」 鍵 (ESC 鍵 下方) -
rules-tab=規則
rules-tooltip=伺服器規則
rules-general=你在本伺服器遊玩即等同同意以下規則. 管理員有機會就相關事項提問. 你可能會因為違反規則而被封禁, 你可以在 Discord 中提出反對.
-rules-1=Hacking / cheating / abusing bugs will not be tolerated.
+rules-1=開掛或濫用漏洞將不會被容忍.
rules-2=Any bugs or exploits found should be reported to our staff members.
rules-3=Be respectful to other players in chat, this includes any other forms of communication.
rules-4=Taking all items from a belt or logistics network is forbidden: sharing resources is mandatory.
@@ -149,8 +149,8 @@ rules-7=Do not cause unnecessary lag by placing/removing tiles with bots or usin
rules-8=Do not walk in random directions with no reason, this is to reduce map download times.
rules-9=Do not use speakers on global or with alerts without prior permission, no one wants to hear your music at full volume without knowing where the off switch is.
rules-10=Do not rotate belts, deactivate belts with wires, or cause production to stop without good reason, this goes for inserters and spliters as well.
-rules-11=Do not make train roundabouts. Other loops such as RoRo stations are allowed.
-rules-12=When using trains, use the same size other players have used, many players use 1-2-1, 2-4-2, or 3-8-3, meaning 1 engine 2 cargo 1 engine.
+rules-11=請不要用迴旋處. 火車站尾返程則是例外.
+rules-12=請跟其他人使用相同的火車組成. 常用的有 1-2-1, 2-4-2, 或 3-8-3, 即 1個 動車組 拖 2個 貨車組 再拖 不同方向的 1個 動車組.
rules-13=火車必須是左上右下 (LHD).
rules-14=禁止要求身份組, 發廣告, 發惡意連結.
rules-15=使用常識, 舉報違規人員, 管理員只有最終決定權.
From 5fd81591d4a29ffcccbb9face9e9fcb725d8691b Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Tue, 25 Oct 2022 01:56:08 +0900
Subject: [PATCH 112/129] .
---
locale/zh-TW/gui.cfg | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/locale/zh-TW/gui.cfg b/locale/zh-TW/gui.cfg
index 38c85b3c..038aac79 100644
--- a/locale/zh-TW/gui.cfg
+++ b/locale/zh-TW/gui.cfg
@@ -140,11 +140,11 @@ rules-tab=規則
rules-tooltip=伺服器規則
rules-general=你在本伺服器遊玩即等同同意以下規則. 管理員有機會就相關事項提問. 你可能會因為違反規則而被封禁, 你可以在 Discord 中提出反對.
rules-1=開掛或濫用漏洞將不會被容忍.
-rules-2=Any bugs or exploits found should be reported to our staff members.
-rules-3=Be respectful to other players in chat, this includes any other forms of communication.
-rules-4=Taking all items from a belt or logistics network is forbidden: sharing resources is mandatory.
-rules-5=Spamming of chat, bots, unlimited chests, or concrete is not allowed.
-rules-6=Before removing major parts of the factory tell other players why you are removing it.
+rules-2=當你找到漏洞可以通知職員.
+rules-3=請在聊天室中尊重其他人.
+rules-4=請不要把所有物品全部取走.
+rules-5=請不要濫發信息, 大量鋪設地磚, 或不為箱子設置上限, 浪費資源.
+rules-6=當你想大量拆除原有設施前請通知其他用戶.
rules-7=Do not cause unnecessary lag by placing/removing tiles with bots or using active provider chests, if think some thing might cause lag please ask staff first.
rules-8=Do not walk in random directions with no reason, this is to reduce map download times.
rules-9=Do not use speakers on global or with alerts without prior permission, no one wants to hear your music at full volume without knowing where the off switch is.
From 6df99143cb8f2d918d14d0dc46dbc4d3781faf07 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Tue, 25 Oct 2022 02:04:48 +0900
Subject: [PATCH 113/129] .
---
locale/zh-TW/gui.cfg | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/locale/zh-TW/gui.cfg b/locale/zh-TW/gui.cfg
index 038aac79..fe8ad072 100644
--- a/locale/zh-TW/gui.cfg
+++ b/locale/zh-TW/gui.cfg
@@ -133,7 +133,7 @@ goto-edit=修改傳送陣圖案
main-tooltip=資訊
welcome-tab=歡迎
welcome-tooltip=歡迎來到 Explosive Gaming
-welcome-general=歡迎來到 Explosive Gaming; we host many factorio servers. While you are here, we ask you to follow our rules. You can find these in the tab above. You can also find our custom commands and links to our other servers. This map has been online for __2__.\nPlease note that our servers reset periodically, the next reset is: __1__
+welcome-general=歡迎來到 Explosive Gaming; 你在這裏的時候要遵守規. 你可以在左上方的介面找到更多資訊. 地圖時間 __2__.\n下次地圖重設: __1__
welcome-roles=我們有自訂的身份組來保護其他用戶. 所以你有機會不能使用拆除規劃器或掉東西. 身份組給予你各種權限\n你有以下身份組: __1__
welcome-chat=你可以使用 「重音符/抑音符」 鍵 (ESC 鍵 下方) - 你也可以在選項中修改按鍵.\n你目前設定為 「__CONTROL__toggle-console__」
rules-tab=規則
@@ -145,10 +145,10 @@ rules-3=請在聊天室中尊重其他人.
rules-4=請不要把所有物品全部取走.
rules-5=請不要濫發信息, 大量鋪設地磚, 或不為箱子設置上限, 浪費資源.
rules-6=當你想大量拆除原有設施前請通知其他用戶.
-rules-7=Do not cause unnecessary lag by placing/removing tiles with bots or using active provider chests, if think some thing might cause lag please ask staff first.
-rules-8=Do not walk in random directions with no reason, this is to reduce map download times.
-rules-9=Do not use speakers on global or with alerts without prior permission, no one wants to hear your music at full volume without knowing where the off switch is.
-rules-10=Do not rotate belts, deactivate belts with wires, or cause production to stop without good reason, this goes for inserters and spliters as well.
+rules-7=請不要無故使用機器人來大量鋪設或拆除地磚, 濫用主動出貨箱.
+rules-8=請不要隨意移動來開大量地圖, 這有助減少地圖下載時間.
+rules-9=請不要無故使用全圖喇叭.
+rules-10=請不要無故轉動傳送帶方向, 停用傳送帶, 或停止生產.
rules-11=請不要用迴旋處. 火車站尾返程則是例外.
rules-12=請跟其他人使用相同的火車組成. 常用的有 1-2-1, 2-4-2, 或 3-8-3, 即 1個 動車組 拖 2個 貨車組 再拖 不同方向的 1個 動車組.
rules-13=火車必須是左上右下 (LHD).
From 4fe22bd0af26b4964803dda213796cffc959469f Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Tue, 25 Oct 2022 02:05:01 +0900
Subject: [PATCH 114/129] .
---
locale/zh-CN/gui.cfg | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/locale/zh-CN/gui.cfg b/locale/zh-CN/gui.cfg
index da4d2b59..fe8ad072 100644
--- a/locale/zh-CN/gui.cfg
+++ b/locale/zh-CN/gui.cfg
@@ -133,24 +133,24 @@ goto-edit=修改傳送陣圖案
main-tooltip=資訊
welcome-tab=歡迎
welcome-tooltip=歡迎來到 Explosive Gaming
-welcome-general=歡迎來到 Explosive Gaming; we host many factorio servers. While you are here, we ask you to follow our rules. You can find these in the tab above. You can also find our custom commands and links to our other servers. This map has been online for __2__.\nPlease note that our servers reset periodically, the next reset is: __1__
+welcome-general=歡迎來到 Explosive Gaming; 你在這裏的時候要遵守規. 你可以在左上方的介面找到更多資訊. 地圖時間 __2__.\n下次地圖重設: __1__
welcome-roles=我們有自訂的身份組來保護其他用戶. 所以你有機會不能使用拆除規劃器或掉東西. 身份組給予你各種權限\n你有以下身份組: __1__
welcome-chat=你可以使用 「重音符/抑音符」 鍵 (ESC 鍵 下方) - 你也可以在選項中修改按鍵.\n你目前設定為 「__CONTROL__toggle-console__」
rules-tab=規則
rules-tooltip=伺服器規則
rules-general=你在本伺服器遊玩即等同同意以下規則. 管理員有機會就相關事項提問. 你可能會因為違反規則而被封禁, 你可以在 Discord 中提出反對.
-rules-1=Hacking / cheating / abusing bugs will not be tolerated.
-rules-2=Any bugs or exploits found should be reported to our staff members.
-rules-3=Be respectful to other players in chat, this includes any other forms of communication.
-rules-4=Taking all items from a belt or logistics network is forbidden: sharing resources is mandatory.
-rules-5=Spamming of chat, bots, unlimited chests, or concrete is not allowed.
-rules-6=Before removing major parts of the factory tell other players why you are removing it.
-rules-7=Do not cause unnecessary lag by placing/removing tiles with bots or using active provider chests, if think some thing might cause lag please ask staff first.
-rules-8=Do not walk in random directions with no reason, this is to reduce map download times.
-rules-9=Do not use speakers on global or with alerts without prior permission, no one wants to hear your music at full volume without knowing where the off switch is.
-rules-10=Do not rotate belts, deactivate belts with wires, or cause production to stop without good reason, this goes for inserters and spliters as well.
-rules-11=Do not make train roundabouts. Other loops such as RoRo stations are allowed.
-rules-12=When using trains, use the same size other players have used, many players use 1-2-1, 2-4-2, or 3-8-3, meaning 1 engine 2 cargo 1 engine.
+rules-1=開掛或濫用漏洞將不會被容忍.
+rules-2=當你找到漏洞可以通知職員.
+rules-3=請在聊天室中尊重其他人.
+rules-4=請不要把所有物品全部取走.
+rules-5=請不要濫發信息, 大量鋪設地磚, 或不為箱子設置上限, 浪費資源.
+rules-6=當你想大量拆除原有設施前請通知其他用戶.
+rules-7=請不要無故使用機器人來大量鋪設或拆除地磚, 濫用主動出貨箱.
+rules-8=請不要隨意移動來開大量地圖, 這有助減少地圖下載時間.
+rules-9=請不要無故使用全圖喇叭.
+rules-10=請不要無故轉動傳送帶方向, 停用傳送帶, 或停止生產.
+rules-11=請不要用迴旋處. 火車站尾返程則是例外.
+rules-12=請跟其他人使用相同的火車組成. 常用的有 1-2-1, 2-4-2, 或 3-8-3, 即 1個 動車組 拖 2個 貨車組 再拖 不同方向的 1個 動車組.
rules-13=火車必須是左上右下 (LHD).
rules-14=禁止要求身份組, 發廣告, 發惡意連結.
rules-15=使用常識, 舉報違規人員, 管理員只有最終決定權.
From 3ec5cbd0ebf7f2004c888533efe382eacf969eb2 Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Tue, 25 Oct 2022 02:06:55 +0900
Subject: [PATCH 115/129] .
---
locale/zh-CN/addons.cfg | 4 ++--
locale/zh-TW/addons.cfg | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/locale/zh-CN/addons.cfg b/locale/zh-CN/addons.cfg
index f1bff801..73af5418 100644
--- a/locale/zh-CN/addons.cfg
+++ b/locale/zh-CN/addons.cfg
@@ -79,7 +79,7 @@ verify=Please return to our discord and type r!verify __1__
message=因沒有活躍玩家而被請離
[report-jail]
-jail=__1__ 因被多次舉報而被送監. 請等管理員.
+jail=__1__ 因被多次舉報而被送監. 請等候管理員.
[protection-jail]
-jail=__1__ 因被多次拆除受保護物體而被送監. 請等管理員.
+jail=__1__ 因被多次拆除受保護物體而被送監. 請等候管理員.
diff --git a/locale/zh-TW/addons.cfg b/locale/zh-TW/addons.cfg
index f1bff801..73af5418 100644
--- a/locale/zh-TW/addons.cfg
+++ b/locale/zh-TW/addons.cfg
@@ -79,7 +79,7 @@ verify=Please return to our discord and type r!verify __1__
message=因沒有活躍玩家而被請離
[report-jail]
-jail=__1__ 因被多次舉報而被送監. 請等管理員.
+jail=__1__ 因被多次舉報而被送監. 請等候管理員.
[protection-jail]
-jail=__1__ 因被多次拆除受保護物體而被送監. 請等管理員.
+jail=__1__ 因被多次拆除受保護物體而被送監. 請等候管理員.
From 487f6d4a1ab10efbbe791d0da5b39052189d66fe Mon Sep 17 00:00:00 2001
From: PHIDIAS
Date: Tue, 25 Oct 2022 18:21:21 +0900
Subject: [PATCH 116/129] .
---
locale/zh-CN/gui.cfg | 2 +-
locale/zh-TW/gui.cfg | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/locale/zh-CN/gui.cfg b/locale/zh-CN/gui.cfg
index fe8ad072..86904c88 100644
--- a/locale/zh-CN/gui.cfg
+++ b/locale/zh-CN/gui.cfg
@@ -150,7 +150,7 @@ rules-8=請不要隨意移動來開大量地圖, 這有助減少地圖下載時
rules-9=請不要無故使用全圖喇叭.
rules-10=請不要無故轉動傳送帶方向, 停用傳送帶, 或停止生產.
rules-11=請不要用迴旋處. 火車站尾返程則是例外.
-rules-12=請跟其他人使用相同的火車組成. 常用的有 1-2-1, 2-4-2, 或 3-8-3, 即 1個 動車組 拖 2個 貨車組 再拖 不同方向的 1個 動車組.
+rules-12=請跟其他人使用相同的火車組成. 常用的有 1-2-1, 2-4-2, 或 3-8-3, 即1個動車組拖2個貨車組再拖不同方向的1個動車組.
rules-13=火車必須是左上右下 (LHD).
rules-14=禁止要求身份組, 發廣告, 發惡意連結.
rules-15=使用常識, 舉報違規人員, 管理員只有最終決定權.
diff --git a/locale/zh-TW/gui.cfg b/locale/zh-TW/gui.cfg
index fe8ad072..86904c88 100644
--- a/locale/zh-TW/gui.cfg
+++ b/locale/zh-TW/gui.cfg
@@ -150,7 +150,7 @@ rules-8=請不要隨意移動來開大量地圖, 這有助減少地圖下載時
rules-9=請不要無故使用全圖喇叭.
rules-10=請不要無故轉動傳送帶方向, 停用傳送帶, 或停止生產.
rules-11=請不要用迴旋處. 火車站尾返程則是例外.
-rules-12=請跟其他人使用相同的火車組成. 常用的有 1-2-1, 2-4-2, 或 3-8-3, 即 1個 動車組 拖 2個 貨車組 再拖 不同方向的 1個 動車組.
+rules-12=請跟其他人使用相同的火車組成. 常用的有 1-2-1, 2-4-2, 或 3-8-3, 即1個動車組拖2個貨車組再拖不同方向的1個動車組.
rules-13=火車必須是左上右下 (LHD).
rules-14=禁止要求身份組, 發廣告, 發惡意連結.
rules-15=使用常識, 舉報違規人員, 管理員只有最終決定權.
From 9750ff7d6a5f3ce9f643e6412ed0fb8e08e1607f Mon Sep 17 00:00:00 2001
From: Cooldude2606 <25043174+Cooldude2606@users.noreply.github.com>
Date: Mon, 31 Oct 2022 15:14:46 +0000
Subject: [PATCH 117/129] Automatic Doc Update
---
docs/addons/Advanced-Start.html | 2 +-
docs/addons/Chat-Popups.html | 2 +-
docs/addons/Chat-Reply.html | 2 +-
docs/addons/Compilatron.html | 2 +-
docs/addons/Damage-Popups.html | 2 +-
docs/addons/Death-Logger.html | 2 +-
docs/addons/Deconlog.html | 2 +-
docs/addons/Discord-Alerts.html | 2 +-
docs/addons/FAGC.html | 2 +-
docs/addons/Inventory-Clear.html | 2 +-
docs/addons/Pollution-Grading.html | 2 +-
docs/addons/Scorched-Earth.html | 2 +-
docs/addons/Spawn-Area.html | 2 +-
docs/addons/Tree-Decon.html | 2 +-
docs/addons/afk-kick.html | 2 +-
docs/addons/protection-jail.html | 2 +-
docs/addons/report-jail.html | 2 +-
docs/commands/Admin-Chat.html | 2 +-
docs/commands/Admin-Markers.html | 2 +-
docs/commands/Cheat-Mode.html | 2 +-
docs/commands/Clear-Inventory.html | 2 +-
docs/commands/Connect.html | 2 +-
docs/commands/Debug.html | 2 +-
docs/commands/Find.html | 2 +-
docs/commands/Help.html | 2 +-
docs/commands/Home.html | 2 +-
docs/commands/Interface.html | 2 +-
docs/commands/InventorySearch.html | 2 +-
docs/commands/Jail.html | 2 +-
docs/commands/Kill.html | 2 +-
docs/commands/LastLocation.html | 2 +-
docs/commands/Me.html | 2 +-
docs/commands/Protection.html | 2 +-
docs/commands/Rainbow.html | 2 +-
docs/commands/Repair.html | 2 +-
docs/commands/Reports.html | 2 +-
docs/commands/Roles.html | 2 +-
docs/commands/Spawn.html | 2 +-
docs/commands/Spectate.html | 2 +-
docs/commands/Teleport.html | 2 +-
docs/commands/Warnings.html | 2 +-
docs/configs/Advanced-Start.html | 2 +-
docs/configs/Autofill.html | 2 +-
docs/configs/Bonuses.html | 2 +-
docs/configs/Chat-Reply.html | 2 +-
docs/configs/Commands-Auth-Admin.html | 2 +-
docs/configs/Commands-Auth-Roles.html | 2 +-
docs/configs/Commands-Auth-Runtime-Disable.html | 2 +-
docs/configs/Commands-Color-Parse.html | 2 +-
docs/configs/Commands-Parse-Roles.html | 2 +-
docs/configs/Commands-Parse.html | 2 +-
docs/configs/Compilatron.html | 2 +-
docs/configs/Death-Logger.html | 2 +-
docs/configs/Deconlog.html | 2 +-
docs/configs/Discord-Alerts.html | 2 +-
docs/configs/File-Loader.html | 2 +-
docs/configs/Permission-Groups.html | 2 +-
docs/configs/Player-List.html | 2 +-
docs/configs/Pollution-Grading.html | 2 +-
docs/configs/Popup-Messages.html | 2 +-
docs/configs/Preset-Player-Colours.html | 2 +-
docs/configs/Preset-Player-Quickbar.html | 2 +-
docs/configs/Repair.html | 2 +-
docs/configs/Rockets.html | 2 +-
docs/configs/Roles.html | 2 +-
docs/configs/Science.html | 2 +-
docs/configs/Scorched-Earth.html | 2 +-
docs/configs/Spawn-Area.html | 2 +-
docs/configs/Statistics.html | 2 +-
docs/configs/Tasks.html | 2 +-
docs/configs/Warnings.html | 2 +-
docs/configs/Warps.html | 2 +-
docs/configs/inventory_clear.html | 2 +-
docs/control/Jail.html | 2 +-
docs/control/Production.html | 2 +-
docs/control/Protection.html | 2 +-
docs/control/Reports.html | 2 +-
docs/control/Rockets.html | 2 +-
docs/control/Selection.html | 2 +-
docs/control/Tasks.html | 2 +-
docs/control/Warnings.html | 2 +-
docs/control/Warps.html | 2 +-
docs/core/Async.html | 2 +-
docs/core/Commands.html | 2 +-
docs/core/Common.html | 2 +-
docs/core/Datastore.html | 2 +-
docs/core/External.html | 2 +-
docs/core/Groups.html | 2 +-
docs/core/Gui.html | 2 +-
docs/core/PlayerData.html | 2 +-
docs/core/Roles.html | 2 +-
docs/data/Alt-View.html | 2 +-
docs/data/Bonus.html | 2 +-
docs/data/Greetings.html | 2 +-
docs/data/Player-Colours.html | 2 +-
docs/data/Quickbar.html | 2 +-
docs/data/Tag.html | 2 +-
docs/guis/Autofill.html | 2 +-
docs/guis/Player-List.html | 2 +-
docs/guis/Readme.html | 2 +-
docs/guis/Rocket-Info.html | 2 +-
docs/guis/Science-Info.html | 2 +-
docs/guis/Task-List.html | 2 +-
docs/guis/Warps-List.html | 2 +-
docs/guis/server-ups.html | 2 +-
docs/index.html | 2 +-
docs/modules/control.html | 2 +-
docs/modules/modules.addons.station-auto-name.html | 2 +-
docs/modules/overrides.debug.html | 2 +-
docs/modules/overrides.math.html | 2 +-
docs/modules/overrides.table.html | 2 +-
docs/modules/utils.event.html | 2 +-
docs/modules/utils.event_core.html | 2 +-
docs/modules/utils.task.html | 2 +-
docs/topics/LICENSE.html | 2 +-
docs/topics/README.md.html | 2 +-
116 files changed, 116 insertions(+), 116 deletions(-)
diff --git a/docs/addons/Advanced-Start.html b/docs/addons/Advanced-Start.html
index 9081ff42..46515d92 100644
--- a/docs/addons/Advanced-Start.html
+++ b/docs/addons/Advanced-Start.html
@@ -351,7 +351,7 @@
generated by LDoc
diff --git a/docs/addons/Chat-Popups.html b/docs/addons/Chat-Popups.html
index 100117dd..5594f0ab 100644
--- a/docs/addons/Chat-Popups.html
+++ b/docs/addons/Chat-Popups.html
@@ -380,7 +380,7 @@
generated by LDoc
diff --git a/docs/addons/Chat-Reply.html b/docs/addons/Chat-Reply.html
index f90314c6..73b24be7 100644
--- a/docs/addons/Chat-Reply.html
+++ b/docs/addons/Chat-Reply.html
@@ -379,7 +379,7 @@
generated by LDoc
diff --git a/docs/addons/Compilatron.html b/docs/addons/Compilatron.html
index 78737f2a..9f9b8db6 100644
--- a/docs/addons/Compilatron.html
+++ b/docs/addons/Compilatron.html
@@ -588,7 +588,7 @@
generated by LDoc
diff --git a/docs/addons/Damage-Popups.html b/docs/addons/Damage-Popups.html
index 8d11c838..bfa15bc3 100644
--- a/docs/addons/Damage-Popups.html
+++ b/docs/addons/Damage-Popups.html
@@ -380,7 +380,7 @@
generated by LDoc
diff --git a/docs/addons/Death-Logger.html b/docs/addons/Death-Logger.html
index 9047eaca..8e4c4fb2 100644
--- a/docs/addons/Death-Logger.html
+++ b/docs/addons/Death-Logger.html
@@ -407,7 +407,7 @@
generated by LDoc
diff --git a/docs/addons/Deconlog.html b/docs/addons/Deconlog.html
index 53d2e17b..a85b09ec 100644
--- a/docs/addons/Deconlog.html
+++ b/docs/addons/Deconlog.html
@@ -379,7 +379,7 @@
generated by LDoc
diff --git a/docs/addons/Discord-Alerts.html b/docs/addons/Discord-Alerts.html
index a4127937..35674298 100644
--- a/docs/addons/Discord-Alerts.html
+++ b/docs/addons/Discord-Alerts.html
@@ -491,7 +491,7 @@
generated by LDoc
diff --git a/docs/addons/FAGC.html b/docs/addons/FAGC.html
index 2fc193bb..377de561 100644
--- a/docs/addons/FAGC.html
+++ b/docs/addons/FAGC.html
@@ -323,7 +323,7 @@
generated by LDoc
diff --git a/docs/addons/Inventory-Clear.html b/docs/addons/Inventory-Clear.html
index 6dd62372..cfa2480d 100644
--- a/docs/addons/Inventory-Clear.html
+++ b/docs/addons/Inventory-Clear.html
@@ -379,7 +379,7 @@
generated by LDoc
diff --git a/docs/addons/Pollution-Grading.html b/docs/addons/Pollution-Grading.html
index e07c3e8c..0da7a54a 100644
--- a/docs/addons/Pollution-Grading.html
+++ b/docs/addons/Pollution-Grading.html
@@ -351,7 +351,7 @@
generated by LDoc
diff --git a/docs/addons/Scorched-Earth.html b/docs/addons/Scorched-Earth.html
index dfdc237e..c5f8d1a0 100644
--- a/docs/addons/Scorched-Earth.html
+++ b/docs/addons/Scorched-Earth.html
@@ -407,7 +407,7 @@
generated by LDoc
diff --git a/docs/addons/Spawn-Area.html b/docs/addons/Spawn-Area.html
index b509e457..69a3c4fd 100644
--- a/docs/addons/Spawn-Area.html
+++ b/docs/addons/Spawn-Area.html
@@ -379,7 +379,7 @@
generated by LDoc
diff --git a/docs/addons/Tree-Decon.html b/docs/addons/Tree-Decon.html
index 6eee7409..e91abca8 100644
--- a/docs/addons/Tree-Decon.html
+++ b/docs/addons/Tree-Decon.html
@@ -435,7 +435,7 @@
generated by LDoc
diff --git a/docs/addons/afk-kick.html b/docs/addons/afk-kick.html
index e82dba4e..04ada927 100644
--- a/docs/addons/afk-kick.html
+++ b/docs/addons/afk-kick.html
@@ -407,7 +407,7 @@
generated by LDoc
diff --git a/docs/addons/protection-jail.html b/docs/addons/protection-jail.html
index 9e89f419..ed2f1967 100644
--- a/docs/addons/protection-jail.html
+++ b/docs/addons/protection-jail.html
@@ -435,7 +435,7 @@
generated by LDoc
diff --git a/docs/addons/report-jail.html b/docs/addons/report-jail.html
index fe5720df..abf27cac 100644
--- a/docs/addons/report-jail.html
+++ b/docs/addons/report-jail.html
@@ -407,7 +407,7 @@
generated by LDoc
diff --git a/docs/commands/Admin-Chat.html b/docs/commands/Admin-Chat.html
index 709c9efc..20607e25 100644
--- a/docs/commands/Admin-Chat.html
+++ b/docs/commands/Admin-Chat.html
@@ -419,7 +419,7 @@
generated by LDoc
diff --git a/docs/commands/Admin-Markers.html b/docs/commands/Admin-Markers.html
index b3bbc654..7a499331 100644
--- a/docs/commands/Admin-Markers.html
+++ b/docs/commands/Admin-Markers.html
@@ -424,7 +424,7 @@
generated by LDoc
diff --git a/docs/commands/Cheat-Mode.html b/docs/commands/Cheat-Mode.html
index 8e1286dc..afca838f 100644
--- a/docs/commands/Cheat-Mode.html
+++ b/docs/commands/Cheat-Mode.html
@@ -392,7 +392,7 @@
generated by LDoc
diff --git a/docs/commands/Clear-Inventory.html b/docs/commands/Clear-Inventory.html
index 7e7b5959..573b2b68 100644
--- a/docs/commands/Clear-Inventory.html
+++ b/docs/commands/Clear-Inventory.html
@@ -419,7 +419,7 @@
generated by LDoc
diff --git a/docs/commands/Connect.html b/docs/commands/Connect.html
index 89ea6172..d3a40441 100644
--- a/docs/commands/Connect.html
+++ b/docs/commands/Connect.html
@@ -622,7 +622,7 @@
generated by LDoc
diff --git a/docs/commands/Debug.html b/docs/commands/Debug.html
index 1a3708a8..d8623cd0 100644
--- a/docs/commands/Debug.html
+++ b/docs/commands/Debug.html
@@ -396,7 +396,7 @@
generated by LDoc
diff --git a/docs/commands/Find.html b/docs/commands/Find.html
index f5f78465..a07f7783 100644
--- a/docs/commands/Find.html
+++ b/docs/commands/Find.html
@@ -391,7 +391,7 @@
generated by LDoc
diff --git a/docs/commands/Help.html b/docs/commands/Help.html
index 7ef2d028..8c1c0892 100644
--- a/docs/commands/Help.html
+++ b/docs/commands/Help.html
@@ -435,7 +435,7 @@
generated by LDoc
diff --git a/docs/commands/Home.html b/docs/commands/Home.html
index 20e69ff7..c68c001f 100644
--- a/docs/commands/Home.html
+++ b/docs/commands/Home.html
@@ -489,7 +489,7 @@
generated by LDoc
diff --git a/docs/commands/Interface.html b/docs/commands/Interface.html
index 3e3559e6..8f7a0da0 100644
--- a/docs/commands/Interface.html
+++ b/docs/commands/Interface.html
@@ -419,7 +419,7 @@
generated by LDoc
diff --git a/docs/commands/InventorySearch.html b/docs/commands/InventorySearch.html
index 61f97418..82727e6e 100644
--- a/docs/commands/InventorySearch.html
+++ b/docs/commands/InventorySearch.html
@@ -609,7 +609,7 @@
generated by LDoc
diff --git a/docs/commands/Jail.html b/docs/commands/Jail.html
index f3e8a226..f2fce054 100644
--- a/docs/commands/Jail.html
+++ b/docs/commands/Jail.html
@@ -518,7 +518,7 @@
generated by LDoc
diff --git a/docs/commands/Kill.html b/docs/commands/Kill.html
index 7ef0b2c8..a08bf3ed 100644
--- a/docs/commands/Kill.html
+++ b/docs/commands/Kill.html
@@ -420,7 +420,7 @@
generated by LDoc
diff --git a/docs/commands/LastLocation.html b/docs/commands/LastLocation.html
index d9aac4fe..6259486b 100644
--- a/docs/commands/LastLocation.html
+++ b/docs/commands/LastLocation.html
@@ -419,7 +419,7 @@
generated by LDoc
diff --git a/docs/commands/Me.html b/docs/commands/Me.html
index 6f645b68..3125c493 100644
--- a/docs/commands/Me.html
+++ b/docs/commands/Me.html
@@ -391,7 +391,7 @@
generated by LDoc
diff --git a/docs/commands/Protection.html b/docs/commands/Protection.html
index 06b50104..dc01b810 100644
--- a/docs/commands/Protection.html
+++ b/docs/commands/Protection.html
@@ -567,7 +567,7 @@
generated by LDoc
diff --git a/docs/commands/Rainbow.html b/docs/commands/Rainbow.html
index c10f23c0..414eb9f9 100644
--- a/docs/commands/Rainbow.html
+++ b/docs/commands/Rainbow.html
@@ -419,7 +419,7 @@
generated by LDoc
diff --git a/docs/commands/Repair.html b/docs/commands/Repair.html
index b511d359..b636a019 100644
--- a/docs/commands/Repair.html
+++ b/docs/commands/Repair.html
@@ -352,7 +352,7 @@
generated by LDoc
diff --git a/docs/commands/Reports.html b/docs/commands/Reports.html
index 12eb8c09..03d1b178 100644
--- a/docs/commands/Reports.html
+++ b/docs/commands/Reports.html
@@ -616,7 +616,7 @@
generated by LDoc
diff --git a/docs/commands/Roles.html b/docs/commands/Roles.html
index ce841f95..bc351dc7 100644
--- a/docs/commands/Roles.html
+++ b/docs/commands/Roles.html
@@ -588,7 +588,7 @@
generated by LDoc
diff --git a/docs/commands/Spawn.html b/docs/commands/Spawn.html
index a105e0b1..692ea2e0 100644
--- a/docs/commands/Spawn.html
+++ b/docs/commands/Spawn.html
@@ -420,7 +420,7 @@
generated by LDoc
diff --git a/docs/commands/Spectate.html b/docs/commands/Spectate.html
index be052565..9823fcba 100644
--- a/docs/commands/Spectate.html
+++ b/docs/commands/Spectate.html
@@ -450,7 +450,7 @@
generated by LDoc
diff --git a/docs/commands/Teleport.html b/docs/commands/Teleport.html
index 2a4775b2..f9b18f8d 100644
--- a/docs/commands/Teleport.html
+++ b/docs/commands/Teleport.html
@@ -515,7 +515,7 @@
generated by LDoc
diff --git a/docs/commands/Warnings.html b/docs/commands/Warnings.html
index df804f14..531736b1 100644
--- a/docs/commands/Warnings.html
+++ b/docs/commands/Warnings.html
@@ -600,7 +600,7 @@
generated by LDoc
diff --git a/docs/configs/Advanced-Start.html b/docs/configs/Advanced-Start.html
index b60652e2..931d8602 100644
--- a/docs/configs/Advanced-Start.html
+++ b/docs/configs/Advanced-Start.html
@@ -537,7 +537,7 @@
generated by LDoc
diff --git a/docs/configs/Autofill.html b/docs/configs/Autofill.html
index 498ee8e5..2ecfee36 100644
--- a/docs/configs/Autofill.html
+++ b/docs/configs/Autofill.html
@@ -268,7 +268,7 @@
generated by LDoc
diff --git a/docs/configs/Bonuses.html b/docs/configs/Bonuses.html
index 4a058003..c4776061 100644
--- a/docs/configs/Bonuses.html
+++ b/docs/configs/Bonuses.html
@@ -268,7 +268,7 @@
generated by LDoc
diff --git a/docs/configs/Chat-Reply.html b/docs/configs/Chat-Reply.html
index 7a72cb5a..41d5bf42 100644
--- a/docs/configs/Chat-Reply.html
+++ b/docs/configs/Chat-Reply.html
@@ -516,7 +516,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Auth-Admin.html b/docs/configs/Commands-Auth-Admin.html
index a4075dc7..6af15916 100644
--- a/docs/configs/Commands-Auth-Admin.html
+++ b/docs/configs/Commands-Auth-Admin.html
@@ -325,7 +325,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Auth-Roles.html b/docs/configs/Commands-Auth-Roles.html
index 4b95cd78..e493ef15 100644
--- a/docs/configs/Commands-Auth-Roles.html
+++ b/docs/configs/Commands-Auth-Roles.html
@@ -351,7 +351,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Auth-Runtime-Disable.html b/docs/configs/Commands-Auth-Runtime-Disable.html
index 8069bd43..1811d06e 100644
--- a/docs/configs/Commands-Auth-Runtime-Disable.html
+++ b/docs/configs/Commands-Auth-Runtime-Disable.html
@@ -473,7 +473,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Color-Parse.html b/docs/configs/Commands-Color-Parse.html
index 1ce5e3df..f2dc0774 100644
--- a/docs/configs/Commands-Color-Parse.html
+++ b/docs/configs/Commands-Color-Parse.html
@@ -351,7 +351,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Parse-Roles.html b/docs/configs/Commands-Parse-Roles.html
index c866f655..2b5e45f0 100644
--- a/docs/configs/Commands-Parse-Roles.html
+++ b/docs/configs/Commands-Parse-Roles.html
@@ -385,7 +385,7 @@
generated by LDoc
diff --git a/docs/configs/Commands-Parse.html b/docs/configs/Commands-Parse.html
index bf5ad3e6..59fd5355 100644
--- a/docs/configs/Commands-Parse.html
+++ b/docs/configs/Commands-Parse.html
@@ -341,7 +341,7 @@ see ./expcore/commands.lua for more details
generated by LDoc
diff --git a/docs/configs/Compilatron.html b/docs/configs/Compilatron.html
index 5c151d9c..fccf49de 100644
--- a/docs/configs/Compilatron.html
+++ b/docs/configs/Compilatron.html
@@ -385,7 +385,7 @@
generated by LDoc
diff --git a/docs/configs/Death-Logger.html b/docs/configs/Death-Logger.html
index d67ab59f..5d6919fa 100644
--- a/docs/configs/Death-Logger.html
+++ b/docs/configs/Death-Logger.html
@@ -507,7 +507,7 @@
generated by LDoc
diff --git a/docs/configs/Deconlog.html b/docs/configs/Deconlog.html
index a959b926..da24fd86 100644
--- a/docs/configs/Deconlog.html
+++ b/docs/configs/Deconlog.html
@@ -475,7 +475,7 @@
generated by LDoc
diff --git a/docs/configs/Discord-Alerts.html b/docs/configs/Discord-Alerts.html
index a56698c2..6959543b 100644
--- a/docs/configs/Discord-Alerts.html
+++ b/docs/configs/Discord-Alerts.html
@@ -268,7 +268,7 @@
generated by LDoc
diff --git a/docs/configs/File-Loader.html b/docs/configs/File-Loader.html
index efbb88d2..fbf3201c 100644
--- a/docs/configs/File-Loader.html
+++ b/docs/configs/File-Loader.html
@@ -271,7 +271,7 @@
generated by LDoc
diff --git a/docs/configs/Permission-Groups.html b/docs/configs/Permission-Groups.html
index 9d380719..1864a68c 100644
--- a/docs/configs/Permission-Groups.html
+++ b/docs/configs/Permission-Groups.html
@@ -326,7 +326,7 @@
generated by LDoc
diff --git a/docs/configs/Player-List.html b/docs/configs/Player-List.html
index b8393982..489d4503 100644
--- a/docs/configs/Player-List.html
+++ b/docs/configs/Player-List.html
@@ -725,7 +725,7 @@
generated by LDoc
diff --git a/docs/configs/Pollution-Grading.html b/docs/configs/Pollution-Grading.html
index cde7b812..c9ffcfab 100644
--- a/docs/configs/Pollution-Grading.html
+++ b/docs/configs/Pollution-Grading.html
@@ -415,7 +415,7 @@
generated by LDoc
diff --git a/docs/configs/Popup-Messages.html b/docs/configs/Popup-Messages.html
index 942d7ad6..ad50733a 100644
--- a/docs/configs/Popup-Messages.html
+++ b/docs/configs/Popup-Messages.html
@@ -445,7 +445,7 @@
generated by LDoc
diff --git a/docs/configs/Preset-Player-Colours.html b/docs/configs/Preset-Player-Colours.html
index 4b995630..fd59159c 100644
--- a/docs/configs/Preset-Player-Colours.html
+++ b/docs/configs/Preset-Player-Colours.html
@@ -355,7 +355,7 @@
generated by LDoc
diff --git a/docs/configs/Preset-Player-Quickbar.html b/docs/configs/Preset-Player-Quickbar.html
index 9c6ebe2d..634cd115 100644
--- a/docs/configs/Preset-Player-Quickbar.html
+++ b/docs/configs/Preset-Player-Quickbar.html
@@ -268,7 +268,7 @@
generated by LDoc
diff --git a/docs/configs/Repair.html b/docs/configs/Repair.html
index 7c3c5a6b..99faa2aa 100644
--- a/docs/configs/Repair.html
+++ b/docs/configs/Repair.html
@@ -445,7 +445,7 @@
generated by LDoc
diff --git a/docs/configs/Rockets.html b/docs/configs/Rockets.html
index 7560dea4..7ebe498a 100644
--- a/docs/configs/Rockets.html
+++ b/docs/configs/Rockets.html
@@ -865,7 +865,7 @@
generated by LDoc
diff --git a/docs/configs/Roles.html b/docs/configs/Roles.html
index c9e62c94..b58cc718 100644
--- a/docs/configs/Roles.html
+++ b/docs/configs/Roles.html
@@ -351,7 +351,7 @@
generated by LDoc
diff --git a/docs/configs/Science.html b/docs/configs/Science.html
index 35ad3af1..df36a388 100644
--- a/docs/configs/Science.html
+++ b/docs/configs/Science.html
@@ -385,7 +385,7 @@
generated by LDoc
diff --git a/docs/configs/Scorched-Earth.html b/docs/configs/Scorched-Earth.html
index b2704003..ed1f2a34 100644
--- a/docs/configs/Scorched-Earth.html
+++ b/docs/configs/Scorched-Earth.html
@@ -419,7 +419,7 @@
generated by LDoc
diff --git a/docs/configs/Spawn-Area.html b/docs/configs/Spawn-Area.html
index 145ed0ea..2c293b82 100644
--- a/docs/configs/Spawn-Area.html
+++ b/docs/configs/Spawn-Area.html
@@ -1226,7 +1226,7 @@
generated by LDoc
diff --git a/docs/configs/Statistics.html b/docs/configs/Statistics.html
index a5bdb0ef..69b12b58 100644
--- a/docs/configs/Statistics.html
+++ b/docs/configs/Statistics.html
@@ -685,7 +685,7 @@
generated by LDoc
diff --git a/docs/configs/Tasks.html b/docs/configs/Tasks.html
index 46603a64..5f24b6f4 100644
--- a/docs/configs/Tasks.html
+++ b/docs/configs/Tasks.html
@@ -415,7 +415,7 @@
generated by LDoc
diff --git a/docs/configs/Warnings.html b/docs/configs/Warnings.html
index 78637310..aab43619 100644
--- a/docs/configs/Warnings.html
+++ b/docs/configs/Warnings.html
@@ -386,7 +386,7 @@
generated by LDoc
diff --git a/docs/configs/Warps.html b/docs/configs/Warps.html
index a5138904..77b09e94 100644
--- a/docs/configs/Warps.html
+++ b/docs/configs/Warps.html
@@ -775,7 +775,7 @@
generated by LDoc
diff --git a/docs/configs/inventory_clear.html b/docs/configs/inventory_clear.html
index 729937c1..f2d46ae0 100644
--- a/docs/configs/inventory_clear.html
+++ b/docs/configs/inventory_clear.html
@@ -268,7 +268,7 @@
generated by LDoc
diff --git a/docs/control/Jail.html b/docs/control/Jail.html
index 50e4293f..45784512 100644
--- a/docs/control/Jail.html
+++ b/docs/control/Jail.html
@@ -806,7 +806,7 @@
generated by LDoc
diff --git a/docs/control/Production.html b/docs/control/Production.html
index 5fb6be79..2d3095b1 100644
--- a/docs/control/Production.html
+++ b/docs/control/Production.html
@@ -1360,7 +1360,7 @@
generated by LDoc
diff --git a/docs/control/Protection.html b/docs/control/Protection.html
index 55841802..10c0f2a7 100644
--- a/docs/control/Protection.html
+++ b/docs/control/Protection.html
@@ -1032,7 +1032,7 @@
generated by LDoc
diff --git a/docs/control/Reports.html b/docs/control/Reports.html
index ade2e462..618749aa 100644
--- a/docs/control/Reports.html
+++ b/docs/control/Reports.html
@@ -1173,7 +1173,7 @@
generated by LDoc
diff --git a/docs/control/Rockets.html b/docs/control/Rockets.html
index 3ecc71a6..6dd1241b 100644
--- a/docs/control/Rockets.html
+++ b/docs/control/Rockets.html
@@ -1015,7 +1015,7 @@
generated by LDoc
diff --git a/docs/control/Selection.html b/docs/control/Selection.html
index 84cfe0ca..2baa61a7 100644
--- a/docs/control/Selection.html
+++ b/docs/control/Selection.html
@@ -922,7 +922,7 @@
generated by LDoc
diff --git a/docs/control/Tasks.html b/docs/control/Tasks.html
index 8e325deb..6979a026 100644
--- a/docs/control/Tasks.html
+++ b/docs/control/Tasks.html
@@ -1016,7 +1016,7 @@ Tasks.update_task(task_id, 'We need more iron!', gam
generated by LDoc
diff --git a/docs/control/Warnings.html b/docs/control/Warnings.html
index 9499e232..e34123b5 100644
--- a/docs/control/Warnings.html
+++ b/docs/control/Warnings.html
@@ -1556,7 +1556,7 @@
generated by LDoc
diff --git a/docs/control/Warps.html b/docs/control/Warps.html
index 77704b43..48a0cbb5 100644
--- a/docs/control/Warps.html
+++ b/docs/control/Warps.html
@@ -1538,7 +1538,7 @@ Warps.make_warp_tag(warp_id)
generated by LDoc
diff --git a/docs/core/Async.html b/docs/core/Async.html
index c1766c2f..a891a1f6 100644
--- a/docs/core/Async.html
+++ b/docs/core/Async.html
@@ -629,7 +629,7 @@ Async.register(function(player, message)
generated by LDoc
diff --git a/docs/core/Commands.html b/docs/core/Commands.html
index 1a57e46f..5402f290 100644
--- a/docs/core/Commands.html
+++ b/docs/core/Commands.html
@@ -2444,7 +2444,7 @@ nb: use error(error_message) within your callback to trigger do not trigger dire
generated by LDoc
diff --git a/docs/core/Common.html b/docs/core/Common.html
index 906cc524..d8ae9416 100644
--- a/docs/core/Common.html
+++ b/docs/core/Common.html
@@ -2919,7 +2919,7 @@ https://github.com/Refactorio/RedMew/blob/9184b2940f311d8c9c891e83429fc57ec7e0c4
generated by LDoc
diff --git a/docs/core/Datastore.html b/docs/core/Datastore.html
index d8780040..2962de72 100644
--- a/docs/core/Datastore.html
+++ b/docs/core/Datastore.html
@@ -2980,7 +2980,7 @@ ExampleData:on_update(function(key, value)
generated by LDoc
diff --git a/docs/core/External.html b/docs/core/External.html
index 6ca7bf0f..221bc1fe 100644
--- a/docs/core/External.html
+++ b/docs/core/External.html
@@ -764,7 +764,7 @@
generated by LDoc
diff --git a/docs/core/Groups.html b/docs/core/Groups.html
index 395ecf69..12f211e6 100644
--- a/docs/core/Groups.html
+++ b/docs/core/Groups.html
@@ -1459,7 +1459,7 @@
generated by LDoc
diff --git a/docs/core/Gui.html b/docs/core/Gui.html
index 79c99405..d4252703 100644
--- a/docs/core/Gui.html
+++ b/docs/core/Gui.html
@@ -4437,7 +4437,7 @@ Gui.left_toolbar_button('entity/inserter', generated by LDoc
diff --git a/docs/core/PlayerData.html b/docs/core/PlayerData.html
index 5137e4ca..d033764d 100644
--- a/docs/core/PlayerData.html
+++ b/docs/core/PlayerData.html
@@ -547,7 +547,7 @@
generated by LDoc
diff --git a/docs/core/Roles.html b/docs/core/Roles.html
index a79226b6..b3b89a01 100644
--- a/docs/core/Roles.html
+++ b/docs/core/Roles.html
@@ -3407,7 +3407,7 @@ nb: this is one way, failing false after already gaining the role will not revok
generated by LDoc
diff --git a/docs/data/Alt-View.html b/docs/data/Alt-View.html
index 5fffa609..078e9f4b 100644
--- a/docs/data/Alt-View.html
+++ b/docs/data/Alt-View.html
@@ -351,7 +351,7 @@
generated by LDoc
diff --git a/docs/data/Bonus.html b/docs/data/Bonus.html
index 38a65c29..1862efcb 100644
--- a/docs/data/Bonus.html
+++ b/docs/data/Bonus.html
@@ -503,7 +503,7 @@
generated by LDoc
diff --git a/docs/data/Greetings.html b/docs/data/Greetings.html
index f495efc7..0e0e9ac8 100644
--- a/docs/data/Greetings.html
+++ b/docs/data/Greetings.html
@@ -446,7 +446,7 @@
generated by LDoc
diff --git a/docs/data/Player-Colours.html b/docs/data/Player-Colours.html
index 8e44a68c..8738d728 100644
--- a/docs/data/Player-Colours.html
+++ b/docs/data/Player-Colours.html
@@ -407,7 +407,7 @@
generated by LDoc
diff --git a/docs/data/Quickbar.html b/docs/data/Quickbar.html
index 92ff99da..586976c7 100644
--- a/docs/data/Quickbar.html
+++ b/docs/data/Quickbar.html
@@ -424,7 +424,7 @@
generated by LDoc
diff --git a/docs/data/Tag.html b/docs/data/Tag.html
index 667d7d09..b9aefd45 100644
--- a/docs/data/Tag.html
+++ b/docs/data/Tag.html
@@ -556,7 +556,7 @@
generated by LDoc
diff --git a/docs/guis/Autofill.html b/docs/guis/Autofill.html
index 35f6c456..01dc4e21 100644
--- a/docs/guis/Autofill.html
+++ b/docs/guis/Autofill.html
@@ -608,7 +608,7 @@
generated by LDoc
diff --git a/docs/guis/Player-List.html b/docs/guis/Player-List.html
index 7b7d87b2..4b7ca337 100644
--- a/docs/guis/Player-List.html
+++ b/docs/guis/Player-List.html
@@ -722,7 +722,7 @@
generated by LDoc
diff --git a/docs/guis/Readme.html b/docs/guis/Readme.html
index 4a9b6277..ccc96e84 100644
--- a/docs/guis/Readme.html
+++ b/docs/guis/Readme.html
@@ -1014,7 +1014,7 @@
generated by LDoc
diff --git a/docs/guis/Rocket-Info.html b/docs/guis/Rocket-Info.html
index 2d9d085c..9dab2b71 100644
--- a/docs/guis/Rocket-Info.html
+++ b/docs/guis/Rocket-Info.html
@@ -722,7 +722,7 @@
generated by LDoc
diff --git a/docs/guis/Science-Info.html b/docs/guis/Science-Info.html
index 9f44d043..727c3ef2 100644
--- a/docs/guis/Science-Info.html
+++ b/docs/guis/Science-Info.html
@@ -601,7 +601,7 @@
generated by LDoc
diff --git a/docs/guis/Task-List.html b/docs/guis/Task-List.html
index ce8ec50a..5b097528 100644
--- a/docs/guis/Task-List.html
+++ b/docs/guis/Task-List.html
@@ -1125,7 +1125,7 @@
generated by LDoc
diff --git a/docs/guis/Warps-List.html b/docs/guis/Warps-List.html
index 65b50b01..f53e6575 100644
--- a/docs/guis/Warps-List.html
+++ b/docs/guis/Warps-List.html
@@ -1091,7 +1091,7 @@
generated by LDoc
diff --git a/docs/guis/server-ups.html b/docs/guis/server-ups.html
index 1681bfd8..33495174 100644
--- a/docs/guis/server-ups.html
+++ b/docs/guis/server-ups.html
@@ -524,7 +524,7 @@
generated by LDoc
diff --git a/docs/index.html b/docs/index.html
index fc63e5ca..88a3a056 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -622,7 +622,7 @@ Events.set_event_filter(defines.events.on_built_entity, {{filter = "name", name
generated by LDoc
diff --git a/docs/modules/control.html b/docs/modules/control.html
index 04bb4585..f48a9186 100644
--- a/docs/modules/control.html
+++ b/docs/modules/control.html
@@ -271,7 +271,7 @@
generated by LDoc
diff --git a/docs/modules/modules.addons.station-auto-name.html b/docs/modules/modules.addons.station-auto-name.html
index b60a4fc7..a24cc240 100644
--- a/docs/modules/modules.addons.station-auto-name.html
+++ b/docs/modules/modules.addons.station-auto-name.html
@@ -324,7 +324,7 @@ Events.set_event_filter(defines.events.on_built_entity, {{filter = "name", name
generated by LDoc
diff --git a/docs/modules/overrides.debug.html b/docs/modules/overrides.debug.html
index 5ede674e..7b02dc6d 100644
--- a/docs/modules/overrides.debug.html
+++ b/docs/modules/overrides.debug.html
@@ -685,7 +685,7 @@
generated by LDoc
diff --git a/docs/modules/overrides.math.html b/docs/modules/overrides.math.html
index 65d6fec9..19794cb2 100644
--- a/docs/modules/overrides.math.html
+++ b/docs/modules/overrides.math.html
@@ -384,7 +384,7 @@
generated by LDoc
diff --git a/docs/modules/overrides.table.html b/docs/modules/overrides.table.html
index 46da4e32..a8dedeb3 100644
--- a/docs/modules/overrides.table.html
+++ b/docs/modules/overrides.table.html
@@ -2039,7 +2039,7 @@
generated by LDoc
diff --git a/docs/modules/utils.event.html b/docs/modules/utils.event.html
index 6e71ca84..731b3f33 100644
--- a/docs/modules/utils.event.html
+++ b/docs/modules/utils.event.html
@@ -1323,7 +1323,7 @@
generated by LDoc
diff --git a/docs/modules/utils.event_core.html b/docs/modules/utils.event_core.html
index 08badf4c..ac1f68f3 100644
--- a/docs/modules/utils.event_core.html
+++ b/docs/modules/utils.event_core.html
@@ -465,7 +465,7 @@
generated by LDoc
diff --git a/docs/modules/utils.task.html b/docs/modules/utils.task.html
index c3a41e9c..65d45212 100644
--- a/docs/modules/utils.task.html
+++ b/docs/modules/utils.task.html
@@ -682,7 +682,7 @@
generated by LDoc
diff --git a/docs/topics/LICENSE.html b/docs/topics/LICENSE.html
index 3dafd4c2..55b17cd3 100644
--- a/docs/topics/LICENSE.html
+++ b/docs/topics/LICENSE.html
@@ -820,7 +820,7 @@ Public License instead of this License. But first, please read
generated by LDoc
diff --git a/docs/topics/README.md.html b/docs/topics/README.md.html
index ec26cde0..aeaf033c 100644
--- a/docs/topics/README.md.html
+++ b/docs/topics/README.md.html
@@ -381,7 +381,7 @@
generated by LDoc
From d0d59d35d83a92cf67b078a01ec2ebb222779f2c Mon Sep 17 00:00:00 2001
From: oof2win2
Date: Sat, 12 Nov 2022 22:39:37 +0100
Subject: [PATCH 118/129] fix(config): roles
---
config/expcore/roles.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/expcore/roles.lua b/config/expcore/roles.lua
index 9b32922d..d1209fc6 100644
--- a/config/expcore/roles.lua
+++ b/config/expcore/roles.lua
@@ -291,7 +291,7 @@ Roles.define_role_order{
}
Roles.override_player_roles{
- ["oof2win2"]={"Senior Administrator","Moderator","Senior Backer","Supporter"},
+ ["Cooldude2606"]={"Senior Administrator","Moderator","Senior Backer","Supporter"},
["arty714"]={"Senior Administrator","Senior Backer","Supporter"},
["Drahc_pro"]={"Administrator","Moderator","Veteran","Member"},
["mark9064"]={"Administrator","Moderator","Member"},
From 875e1b2bf68f92366258cef5a6dc6f6486277e2d Mon Sep 17 00:00:00 2001
From: oof2win2
Date: Sat, 12 Nov 2022 22:39:58 +0100
Subject: [PATCH 119/129] feat: nukeprotect modularity
---
config/nukeprotect.lua | 34 ++++++++++++++++++++++-------
modules/addons/nukeprotect.lua | 39 ++++++++--------------------------
2 files changed, 35 insertions(+), 38 deletions(-)
diff --git a/config/nukeprotect.lua b/config/nukeprotect.lua
index ca04250d..26b919ca 100644
--- a/config/nukeprotect.lua
+++ b/config/nukeprotect.lua
@@ -1,12 +1,30 @@
return {
- [tostring(defines.inventory.character_ammo)] = {
- ["atomic-bomb"] = true
- }, -- @setting ammo The items to not allow in the player's ammo inventory
- [tostring(defines.inventory.character_armor)] = {}, -- @setting armor The items to not allow in the player's armor inventory
- [tostring(defines.inventory.character_guns)] = {}, -- @setting gun The items to not allow in the player's gun inventory
- [tostring(defines.inventory.character_main)] = {
- ["atomic-bomb"] = true
- }, -- @setting main The items to not allow in the player's main inventory
+ inventories = {
+ {
+ inventory = defines.inventory.character_ammo,
+ event = defines.events.on_player_ammo_inventory_changed,
+ items = {
+ ["atomic-bomb"] = true
+ },
+ },
+ {
+ inventory = defines.inventory.character_armor,
+ event = defines.events.on_player_armor_inventory_changed,
+ items = {},
+ },
+ {
+ inventory = defines.inventory.character_guns,
+ event = defines.events.on_player_gun_inventory_changed,
+ items = {},
+ },
+ {
+ inventory = defines.inventory.character_main,
+ event = defines.events.on_player_main_inventory_changed,
+ items = {
+ ["atomic-bomb"] = true
+ },
+ },
+ },
ignore_permisison = "bypass-nukeprotect", -- @setting ignore_permisison The permission that nukeprotect will ignore
ignore_admins = true, -- @setting ignore_admins Ignore admins, true by default. Allows usage outside of the roles module
}
diff --git a/modules/addons/nukeprotect.lua b/modules/addons/nukeprotect.lua
index bda57c20..c633e32b 100644
--- a/modules/addons/nukeprotect.lua
+++ b/modules/addons/nukeprotect.lua
@@ -24,34 +24,13 @@ local function check_items(player, type)
end
end
-if table_size(config[tostring(defines.inventory.character_ammo)]) > 0 then
- Event.add(defines.events.on_player_ammo_inventory_changed, function(event)
- local player = game.get_player(event.player_index)
-
- check_items(player, defines.inventory.character_ammo)
- end)
-end
-
-if table_size(config[tostring(defines.inventory.character_armor)]) > 0 then
- Event.add(defines.events.on_player_armor_inventory_changed, function(event)
- local player = game.get_player(event.player_index)
-
- check_items(player, defines.inventory.character_armor)
- end)
-end
-
-if table_size(config[tostring(defines.inventory.character_guns)]) > 0 then
- Event.add(defines.events.on_player_gun_inventory_changed, function(event)
- local player = game.get_player(event.player_index)
-
- check_items(player, defines.inventory.character_guns)
- end)
-end
-
-if table_size(config[tostring(defines.inventory.character_main)]) > 0 then
- Event.add(defines.events.on_player_main_inventory_changed, function(event)
- local player = game.get_player(event.player_index)
-
- check_items(player, defines.inventory.character_main)
- end)
+for _, inventory in ipairs(config.inventories) do
+ if #inventory.items > 0 then
+ Event.add(inventory.event, function(event)
+ local player = game.get_player(event.player_index)
+ if player and player.valid then
+ check_items(player, inventory.inventory)
+ end
+ end)
+ end
end
From 7568da8e8d745386d592f038df61b8610e46b284 Mon Sep 17 00:00:00 2001
From: Cooldude2606 <25043174+Cooldude2606@users.noreply.github.com>
Date: Fri, 9 Dec 2022 21:10:01 +0000
Subject: [PATCH 120/129] Automatic Doc Update
---
docs/addons/Advanced-Start.html | 3 +-
docs/addons/Chat-Popups.html | 3 +-
docs/addons/Chat-Reply.html | 3 +-
docs/addons/Compilatron.html | 3 +-
docs/addons/Damage-Popups.html | 3 +-
docs/addons/Death-Logger.html | 3 +-
docs/addons/Deconlog.html | 3 +-
docs/addons/Discord-Alerts.html | 3 +-
docs/addons/FAGC.html | 3 +-
docs/addons/Inventory-Clear.html | 3 +-
docs/addons/Nukeprotect.html | 416 ++++++++++++++++++
docs/addons/Pollution-Grading.html | 3 +-
docs/addons/Scorched-Earth.html | 3 +-
docs/addons/Spawn-Area.html | 3 +-
docs/addons/Tree-Decon.html | 3 +-
docs/addons/afk-kick.html | 3 +-
docs/addons/protection-jail.html | 3 +-
docs/addons/report-jail.html | 3 +-
docs/commands/Admin-Chat.html | 3 +-
docs/commands/Admin-Markers.html | 3 +-
docs/commands/Cheat-Mode.html | 3 +-
docs/commands/Clear-Inventory.html | 3 +-
docs/commands/Connect.html | 3 +-
docs/commands/Debug.html | 3 +-
docs/commands/Find.html | 3 +-
docs/commands/Help.html | 3 +-
docs/commands/Home.html | 3 +-
docs/commands/Interface.html | 3 +-
docs/commands/InventorySearch.html | 3 +-
docs/commands/Jail.html | 3 +-
docs/commands/Kill.html | 3 +-
docs/commands/LastLocation.html | 3 +-
docs/commands/Me.html | 3 +-
docs/commands/Protection.html | 3 +-
docs/commands/Rainbow.html | 3 +-
docs/commands/Repair.html | 3 +-
docs/commands/Reports.html | 3 +-
docs/commands/Roles.html | 3 +-
docs/commands/Spawn.html | 3 +-
docs/commands/Spectate.html | 3 +-
docs/commands/Teleport.html | 3 +-
docs/commands/Warnings.html | 3 +-
docs/configs/Advanced-Start.html | 3 +-
docs/configs/Autofill.html | 3 +-
docs/configs/Bonuses.html | 3 +-
docs/configs/Chat-Reply.html | 3 +-
docs/configs/Commands-Auth-Admin.html | 3 +-
docs/configs/Commands-Auth-Roles.html | 3 +-
.../Commands-Auth-Runtime-Disable.html | 3 +-
docs/configs/Commands-Color-Parse.html | 3 +-
docs/configs/Commands-Parse-Roles.html | 3 +-
docs/configs/Commands-Parse.html | 3 +-
docs/configs/Compilatron.html | 3 +-
docs/configs/Death-Logger.html | 3 +-
docs/configs/Deconlog.html | 3 +-
docs/configs/Discord-Alerts.html | 3 +-
docs/configs/File-Loader.html | 3 +-
docs/configs/Permission-Groups.html | 3 +-
docs/configs/Player-List.html | 3 +-
docs/configs/Pollution-Grading.html | 3 +-
docs/configs/Popup-Messages.html | 3 +-
docs/configs/Preset-Player-Colours.html | 3 +-
docs/configs/Preset-Player-Quickbar.html | 3 +-
docs/configs/Repair.html | 3 +-
docs/configs/Rockets.html | 3 +-
docs/configs/Roles.html | 3 +-
docs/configs/Science.html | 3 +-
docs/configs/Scorched-Earth.html | 3 +-
docs/configs/Spawn-Area.html | 3 +-
docs/configs/Statistics.html | 3 +-
docs/configs/Tasks.html | 3 +-
docs/configs/Warnings.html | 3 +-
docs/configs/Warps.html | 3 +-
docs/configs/inventory_clear.html | 3 +-
docs/control/Jail.html | 3 +-
docs/control/Production.html | 3 +-
docs/control/Protection.html | 3 +-
docs/control/Reports.html | 3 +-
docs/control/Rockets.html | 3 +-
docs/control/Selection.html | 3 +-
docs/control/Tasks.html | 3 +-
docs/control/Warnings.html | 3 +-
docs/control/Warps.html | 3 +-
docs/core/Async.html | 3 +-
docs/core/Commands.html | 3 +-
docs/core/Common.html | 53 +--
docs/core/Datastore.html | 3 +-
docs/core/External.html | 3 +-
docs/core/Groups.html | 3 +-
docs/core/Gui.html | 3 +-
docs/core/PlayerData.html | 3 +-
docs/core/Roles.html | 3 +-
docs/data/Alt-View.html | 3 +-
docs/data/Bonus.html | 3 +-
docs/data/Greetings.html | 3 +-
docs/data/Player-Colours.html | 3 +-
docs/data/Quickbar.html | 3 +-
docs/data/Tag.html | 3 +-
docs/guis/Autofill.html | 3 +-
docs/guis/Player-List.html | 3 +-
docs/guis/Readme.html | 3 +-
docs/guis/Rocket-Info.html | 3 +-
docs/guis/Science-Info.html | 3 +-
docs/guis/Task-List.html | 3 +-
docs/guis/Warps-List.html | 3 +-
docs/guis/server-ups.html | 3 +-
docs/index.html | 6 +-
docs/modules/control.html | 3 +-
.../modules.addons.station-auto-name.html | 3 +-
docs/modules/overrides.debug.html | 3 +-
docs/modules/overrides.math.html | 3 +-
docs/modules/overrides.table.html | 3 +-
docs/modules/utils.event.html | 3 +-
docs/modules/utils.event_core.html | 3 +-
docs/modules/utils.task.html | 3 +-
docs/topics/LICENSE.html | 3 +-
docs/topics/README.md.html | 3 +-
117 files changed, 662 insertions(+), 155 deletions(-)
create mode 100644 docs/addons/Nukeprotect.html
diff --git a/docs/addons/Advanced-Start.html b/docs/addons/Advanced-Start.html
index 46515d92..da405ff5 100644
--- a/docs/addons/Advanced-Start.html
+++ b/docs/addons/Advanced-Start.html
@@ -60,6 +60,7 @@
@@ -2444,7 +2445,7 @@ nb: use error(error_message) within your callback to trigger do not trigger dire
generated by LDoc
diff --git a/docs/core/Common.html b/docs/core/Common.html
index d8ae9416..afc62b6f 100644
--- a/docs/core/Common.html
+++ b/docs/core/Common.html
@@ -96,6 +96,7 @@
Copies items to the position and stores them in the closest entity of the type given
-- Copies the items by prototype name, but keeps them in the original inventory
Moves items to the position and stores them in the closest entity of the type given
+
Copies items to the position and stores them in the closest entity of the type given
-- Copies the items by prototype name, but keeps them in the original inventory
@@ -2486,7 +2459,7 @@
(table)
- items which are to be added to the chests, ['name']=count
+ items which are to be added to the chests, an array of LuaItemStack
@@ -2502,7 +2475,7 @@
(LuaSurface)
- the surface that the items will be moved to
+ the surface that the items will be copied to
(default: navies)
@@ -2519,7 +2492,7 @@
(table)
- the position that the items will be moved to {x=100, y=100}
+ the position that the items will be copied to {x=100, y=100}
(default: {0)
@@ -2553,7 +2526,7 @@
(string)
- the chest type that the items should be moved into
+ the chest type that the items should be copied into
(default: iron-chest)
@@ -2580,7 +2553,7 @@
Usage:
-- Copy all the items in a players inventory and place them in chests at {0, 0}
-move_items(game.player.get_main_inventory().get_contents())
@@ -3407,7 +3408,7 @@ nb: this is one way, failing false after already gaining the role will not revok
generated by LDoc
diff --git a/docs/data/Alt-View.html b/docs/data/Alt-View.html
index 078e9f4b..4b2fcc9d 100644
--- a/docs/data/Alt-View.html
+++ b/docs/data/Alt-View.html
@@ -105,6 +105,7 @@
@@ -381,7 +382,7 @@
generated by LDoc
From ceca8fbf00c9bcd3b9745fcaadda44bee111e5b4 Mon Sep 17 00:00:00 2001
From: oof2win2
Date: Sat, 12 Nov 2022 22:28:06 +0100
Subject: [PATCH 121/129] fix: set roles after jailing
---
expcore/roles.lua | 11 ++++++++++-
modules/control/jail.lua | 20 ++++++++++++++++----
modules/control/jail_old_role.lua | 13 +++++++++++++
3 files changed, 39 insertions(+), 5 deletions(-)
create mode 100644 modules/control/jail_old_role.lua
diff --git a/expcore/roles.lua b/expcore/roles.lua
index 2028cd23..b6d1000d 100644
--- a/expcore/roles.lua
+++ b/expcore/roles.lua
@@ -115,6 +115,7 @@ local Groups = require 'expcore.permission_groups' --- @dep expcore.permission_g
local Async = require 'expcore.async' --- @dep expcore.async
local Colours = require 'utils.color_presets' --- @dep utils.color_presets
local write_json = _C.write_json --- @dep expcore.common
+local JailOldRole = require 'modules.control.jail_old_role' --- @dep modules.control.jail
local Roles = {
_prototype={},
@@ -368,7 +369,15 @@ function Roles.assign_player(player, roles, by_player_name, skip_checks, silent)
if not skip_checks and not valid_player then return end
if not player then return end
if type(roles) ~= 'table' or roles.name then
- roles = {roles}
+ roles = { roles }
+ end
+ if Roles.player_has_role(player, "Jail") then
+ local to_assign = JailOldRole.old_roles[valid_player.name] or {}
+ for _, role in ipairs(roles) do
+ table.insert(to_assign, role)
+ end
+ JailOldRole.old_roles[valid_player.name] = to_assign
+ return
end
for _, role in ipairs(roles) do
role = Roles.get_role_from_any(role)
diff --git a/modules/control/jail.lua b/modules/control/jail.lua
index 1e37fbfa..93a02734 100644
--- a/modules/control/jail.lua
+++ b/modules/control/jail.lua
@@ -19,6 +19,7 @@
local Roles = require 'expcore.roles' --- @dep expcore.roles
local Game = require 'utils.game' --- @dep utils.game
local Global = require 'utils.global' --- @dep utils.global
+local JailOldRole = require 'modules.control.jail_old_role' --- @dep modules.control.jail_old_role
local valid_player = Game.get_player_from_any
local assign_roles = Roles.assign_player
@@ -89,7 +90,7 @@ function Jail.jail_player(player, by_player_name, reason)
if has_role(player, 'Jail') then return end
local roles = get_roles(player)
- old_roles[player.name] = roles
+ JailOldRole.old_roles[player.name] = roles
player.walking_state = { walking = false }
player.riding_state = { acceleration = defines.riding.acceleration.nothing, direction = player.riding_state.direction }
@@ -116,14 +117,25 @@ function Jail.unjail_player(player, by_player_name)
if not by_player_name then return end
if not has_role(player, 'Jail') then return end
- local roles = old_roles[player.name] or {}
+ local roles = JailOldRole.old_roles[player.name] or {}
- assign_roles(player, roles, by_player_name, nil, true)
unassign_roles(player, 'Jail', by_player_name, nil, true)
+ assign_roles(player, roles, by_player_name, nil, true)
event_emit(Jail.events.on_player_unjailed, player, by_player_name)
return true
end
-return Jail
\ No newline at end of file
+function Jail.add_old_role(player, to_assign)
+ player = valid_player(player)
+ if not player then return end
+
+ if not has_role(player, 'Jail') then return end
+ local roles = JailOldRole.old_roles[player.name]
+ if not roles then return end
+
+ table.insert(roles, to_assign)
+end
+
+return Jail
diff --git a/modules/control/jail_old_role.lua b/modules/control/jail_old_role.lua
new file mode 100644
index 00000000..0bf5d836
--- /dev/null
+++ b/modules/control/jail_old_role.lua
@@ -0,0 +1,13 @@
+local Global = require 'utils.global' --- @dep utils.global
+
+local Jail = {
+ old_roles = {}
+}
+
+local old_roles = Jail.old_roles
+Global.register(old_roles, function(tbl)
+ Jail.old_roles = tbl
+ old_roles = tbl
+end)
+
+return Jail
From 2d9cfd8e11e3be3f0d84a86cfe1bb66eb7bb6b4e Mon Sep 17 00:00:00 2001
From: oof2win2
Date: Sat, 12 Nov 2022 22:31:36 +0100
Subject: [PATCH 122/129] feat: change future to assign roles to table
---
expcore/roles.lua | 4 +++-
modules/control/jail.lua | 21 ++++++++++-----------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/expcore/roles.lua b/expcore/roles.lua
index b6d1000d..a7ec1a9e 100644
--- a/expcore/roles.lua
+++ b/expcore/roles.lua
@@ -374,7 +374,9 @@ function Roles.assign_player(player, roles, by_player_name, skip_checks, silent)
if Roles.player_has_role(player, "Jail") then
local to_assign = JailOldRole.old_roles[valid_player.name] or {}
for _, role in ipairs(roles) do
- table.insert(to_assign, role)
+ if not to_assign[role] then
+ to_assign[role] = 1
+ end
end
JailOldRole.old_roles[valid_player.name] = to_assign
return
diff --git a/modules/control/jail.lua b/modules/control/jail.lua
index 93a02734..120ad2c8 100644
--- a/modules/control/jail.lua
+++ b/modules/control/jail.lua
@@ -18,11 +18,10 @@
local Roles = require 'expcore.roles' --- @dep expcore.roles
local Game = require 'utils.game' --- @dep utils.game
-local Global = require 'utils.global' --- @dep utils.global
local JailOldRole = require 'modules.control.jail_old_role' --- @dep modules.control.jail_old_role
local valid_player = Game.get_player_from_any
-local assign_roles = Roles.assign_player
+local assign_role = Roles.assign_player
local unassign_roles = Roles.unassign_player
local has_role = Roles.player_has_role
local get_roles = Roles.get_player_roles
@@ -44,12 +43,6 @@ local Jail = {
}
}
-local old_roles = Jail.old_roles
-Global.register(old_roles, function(tbl)
- Jail.old_roles = tbl
- old_roles = tbl
-end)
-
--- Used to emit the jail related events
-- @tparam number event the name of the event that will be emited
-- @tparam LuaPlayer player the player who is being acted on
@@ -90,7 +83,11 @@ function Jail.jail_player(player, by_player_name, reason)
if has_role(player, 'Jail') then return end
local roles = get_roles(player)
- JailOldRole.old_roles[player.name] = roles
+ local old_roles = {}
+ for _, role in ipairs(roles) do
+ old_roles[role.name] = 1
+ end
+ JailOldRole.old_roles[player.name] = old_roles
player.walking_state = { walking = false }
player.riding_state = { acceleration = defines.riding.acceleration.nothing, direction = player.riding_state.direction }
@@ -99,7 +96,7 @@ function Jail.jail_player(player, by_player_name, reason)
player.picking_state = false
player.repair_state = { repairing = false }
- assign_roles(player, 'Jail', by_player_name, nil, true)
+ assign_role(player, 'Jail', by_player_name, nil, true)
unassign_roles(player, roles, by_player_name, nil, true)
event_emit(Jail.events.on_player_jailed, player, by_player_name, reason)
@@ -120,7 +117,9 @@ function Jail.unjail_player(player, by_player_name)
local roles = JailOldRole.old_roles[player.name] or {}
unassign_roles(player, 'Jail', by_player_name, nil, true)
- assign_roles(player, roles, by_player_name, nil, true)
+ for role, _ in pairs(roles) do
+ assign_role(player, role, by_player_name, nil, true)
+ end
event_emit(Jail.events.on_player_unjailed, player, by_player_name)
From 3f42681ddc1b8e6289fce243b37debf106f9887a Mon Sep 17 00:00:00 2001
From: oof2win2
Date: Sun, 13 Nov 2022 08:42:18 +0100
Subject: [PATCH 123/129] feat: role deference in Roles module itself
---
config/expcore/roles.lua | 1 +
expcore/roles.lua | 56 ++++++++++++++++++++++---------
modules/control/jail.lua | 26 ++------------
modules/control/jail_old_role.lua | 13 -------
4 files changed, 44 insertions(+), 52 deletions(-)
delete mode 100644 modules/control/jail_old_role.lua
diff --git a/config/expcore/roles.lua b/config/expcore/roles.lua
index 3f6dd512..20feeb14 100644
--- a/config/expcore/roles.lua
+++ b/config/expcore/roles.lua
@@ -267,6 +267,7 @@ Roles.new_role('Jail')
:set_permission_group('Restricted')
:set_custom_color{r=50,g=50,b=50}
:set_block_auto_assign(true)
+:set_flag("defer_role_changes")
:disallow(default.allowed)
--- System defaults which are required to be set
diff --git a/expcore/roles.lua b/expcore/roles.lua
index a7ec1a9e..acbf9b28 100644
--- a/expcore/roles.lua
+++ b/expcore/roles.lua
@@ -115,17 +115,17 @@ local Groups = require 'expcore.permission_groups' --- @dep expcore.permission_g
local Async = require 'expcore.async' --- @dep expcore.async
local Colours = require 'utils.color_presets' --- @dep utils.color_presets
local write_json = _C.write_json --- @dep expcore.common
-local JailOldRole = require 'modules.control.jail_old_role' --- @dep modules.control.jail
local Roles = {
- _prototype={},
- config={
- order = {}, -- Contains the order of the roles, lower index is better
- roles = {}, -- Contains the raw info for the roles, indexed by role name
- flags = {}, -- Contains functions that run when a flag is added/removed from a player
- internal = {}, -- Contains all internally accessed roles, such as root, default
- players = {}, -- Contains the roles that players have
- auto_assign = {} -- Contains references to all roles which have auto assign conditions
+ _prototype = {},
+ config = {
+ order = {}, -- Contains the order of the roles, lower index is better
+ roles = {}, -- Contains the raw info for the roles, indexed by role name
+ flags = {}, -- Contains functions that run when a flag is added/removed from a player
+ internal = {}, -- Contains all internally accessed roles, such as root, default
+ players = {}, -- Contains the roles that players have
+ auto_assign = {}, -- Contains references to all roles which have auto assign conditions
+ deferred_roles = {}, -- Contains the roles that are to be assigned to players when they are unjailed
},
events = {
on_role_assigned = script.generate_event_name(),
@@ -137,6 +137,9 @@ local Roles = {
Global.register(Roles.config.players, function(tbl)
Roles.config.players = tbl
end)
+Global.register(Roles.config.deferred_roles, function(tbl)
+ Roles.config.deferred_roles = tbl
+end)
--- Getter.
-- Functions which get roles
@@ -371,16 +374,17 @@ function Roles.assign_player(player, roles, by_player_name, skip_checks, silent)
if type(roles) ~= 'table' or roles.name then
roles = { roles }
end
- if Roles.player_has_role(player, "Jail") then
- local to_assign = JailOldRole.old_roles[valid_player.name] or {}
+
+ -- if the player has a role that needs to defer the role changes, save the roles that need to be assigned later into a table
+ if valid_player and Roles.player_has_flag(player, "defer_role_changes") then
+ local assign_later = Roles.config.deferred_roles[valid_player.name] or {}
for _, role in ipairs(roles) do
- if not to_assign[role] then
- to_assign[role] = 1
- end
+ assign_later[role] = 1
end
- JailOldRole.old_roles[valid_player.name] = to_assign
+ Roles.config.deferred_roles[valid_player.name] = assign_later
return
end
+
for _, role in ipairs(roles) do
role = Roles.get_role_from_any(role)
if role then
@@ -411,14 +415,34 @@ function Roles.unassign_player(player, roles, by_player_name, skip_checks, silen
if not skip_checks and not valid_player then return end
if not player then return end
if type(roles) ~= 'table' or roles.name then
- roles = {roles}
+ roles = { roles }
end
+
+ local had_deferred_changes = false
+
for _, role in ipairs(roles) do
role = Roles.get_role_from_any(role)
if role then
+ if role:has_flag("defer_role_changes") then
+ had_deferred_changes = true
+ end
role:remove_player(valid_player or player, valid_player == nil, true)
end
end
+
+
+ -- if there are deferred role changes, apply them now
+ if had_deferred_changes then
+ local assign_later = Roles.config.deferred_roles[player.name] or {}
+ log(serpent.line(assign_later))
+ for role_name, _ in pairs(assign_later) do
+ local role = Roles.get_role_from_any(role_name)
+ if role then
+ role:add_player(valid_player or player, valid_player == nil, true)
+ end
+ end
+ end
+
if valid_player then
emit_player_roles_updated(valid_player, 'unassign', roles, by_player_name, silent)
end
diff --git a/modules/control/jail.lua b/modules/control/jail.lua
index 120ad2c8..b5bf7df4 100644
--- a/modules/control/jail.lua
+++ b/modules/control/jail.lua
@@ -18,10 +18,9 @@
local Roles = require 'expcore.roles' --- @dep expcore.roles
local Game = require 'utils.game' --- @dep utils.game
-local JailOldRole = require 'modules.control.jail_old_role' --- @dep modules.control.jail_old_role
local valid_player = Game.get_player_from_any
-local assign_role = Roles.assign_player
+local assign_roles = Roles.assign_player
local unassign_roles = Roles.unassign_player
local has_role = Roles.player_has_role
local get_roles = Roles.get_player_roles
@@ -83,11 +82,6 @@ function Jail.jail_player(player, by_player_name, reason)
if has_role(player, 'Jail') then return end
local roles = get_roles(player)
- local old_roles = {}
- for _, role in ipairs(roles) do
- old_roles[role.name] = 1
- end
- JailOldRole.old_roles[player.name] = old_roles
player.walking_state = { walking = false }
player.riding_state = { acceleration = defines.riding.acceleration.nothing, direction = player.riding_state.direction }
@@ -96,8 +90,9 @@ function Jail.jail_player(player, by_player_name, reason)
player.picking_state = false
player.repair_state = { repairing = false }
- assign_role(player, 'Jail', by_player_name, nil, true)
unassign_roles(player, roles, by_player_name, nil, true)
+ assign_roles(player, 'Jail', by_player_name, nil, true)
+ assign_roles(player, roles, by_player_name, nil, true)
event_emit(Jail.events.on_player_jailed, player, by_player_name, reason)
@@ -114,27 +109,12 @@ function Jail.unjail_player(player, by_player_name)
if not by_player_name then return end
if not has_role(player, 'Jail') then return end
- local roles = JailOldRole.old_roles[player.name] or {}
unassign_roles(player, 'Jail', by_player_name, nil, true)
- for role, _ in pairs(roles) do
- assign_role(player, role, by_player_name, nil, true)
- end
event_emit(Jail.events.on_player_unjailed, player, by_player_name)
return true
end
-function Jail.add_old_role(player, to_assign)
- player = valid_player(player)
- if not player then return end
-
- if not has_role(player, 'Jail') then return end
- local roles = JailOldRole.old_roles[player.name]
- if not roles then return end
-
- table.insert(roles, to_assign)
-end
-
return Jail
diff --git a/modules/control/jail_old_role.lua b/modules/control/jail_old_role.lua
deleted file mode 100644
index 0bf5d836..00000000
--- a/modules/control/jail_old_role.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-local Global = require 'utils.global' --- @dep utils.global
-
-local Jail = {
- old_roles = {}
-}
-
-local old_roles = Jail.old_roles
-Global.register(old_roles, function(tbl)
- Jail.old_roles = tbl
- old_roles = tbl
-end)
-
-return Jail
From c42613e63c2a78b383aac4fb76fa671c7d53565d Mon Sep 17 00:00:00 2001
From: oof2win2
Date: Sun, 13 Nov 2022 08:49:06 +0100
Subject: [PATCH 124/129] fix(debug): remove log
---
expcore/roles.lua | 1 -
1 file changed, 1 deletion(-)
diff --git a/expcore/roles.lua b/expcore/roles.lua
index acbf9b28..28ba0b80 100644
--- a/expcore/roles.lua
+++ b/expcore/roles.lua
@@ -434,7 +434,6 @@ function Roles.unassign_player(player, roles, by_player_name, skip_checks, silen
-- if there are deferred role changes, apply them now
if had_deferred_changes then
local assign_later = Roles.config.deferred_roles[player.name] or {}
- log(serpent.line(assign_later))
for role_name, _ in pairs(assign_later) do
local role = Roles.get_role_from_any(role_name)
if role then
From 7b2a35259dd7bfef168405d1de80ff7f5f082902 Mon Sep 17 00:00:00 2001
From: oof2win2
Date: Sun, 13 Nov 2022 09:27:33 +0100
Subject: [PATCH 125/129] feat(roles): deferred role assignment message
---
expcore/roles.lua | 17 ++++++++++++++---
locale/en/expcore.cfg | 1 +
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/expcore/roles.lua b/expcore/roles.lua
index 28ba0b80..0dcaa2ac 100644
--- a/expcore/roles.lua
+++ b/expcore/roles.lua
@@ -148,7 +148,7 @@ end)
--- Internal function used to trigger a few different things when roles are changed
-- this is the raw internal trigger as the other function is called at other times
-- there is a second half called role_update which triggers after the event call, it also is called when a player joins
-local function emit_player_roles_updated(player, type, roles, by_player_name, skip_game_print)
+local function emit_player_roles_updated(player, type, roles, by_player_name, skip_game_print, deferred)
by_player_name = game.player and game.player.name or by_player_name or ''
local by_player = game.players[by_player_name]
local by_player_index = by_player and by_player.index or 0
@@ -168,7 +168,11 @@ local function emit_player_roles_updated(player, type, roles, by_player_name, sk
end
-- output to all the different locations: game print, player sound, event trigger and role log
if not skip_game_print then
- game.print({'expcore-roles.game-message-'..type, player.name, table.concat(role_names, ', '), by_player_name}, Colours.cyan)
+ if deferred then
+ game.print({'expcore-roles.game-message-deferred-'..type, player.name, table.concat(role_names, ', '), by_player_name}, Colours.cyan)
+ else
+ game.print({'expcore-roles.game-message-'..type, player.name, table.concat(role_names, ', '), by_player_name}, Colours.cyan)
+ end
end
if type == 'assign' then
player.play_sound{path='utility/achievement_unlocked'}
@@ -378,10 +382,17 @@ function Roles.assign_player(player, roles, by_player_name, skip_checks, silent)
-- if the player has a role that needs to defer the role changes, save the roles that need to be assigned later into a table
if valid_player and Roles.player_has_flag(player, "defer_role_changes") then
local assign_later = Roles.config.deferred_roles[valid_player.name] or {}
+ local were_changes = false
for _, role in ipairs(roles) do
- assign_later[role] = 1
+ if not assign_later[role] then
+ assign_later[role] = 1
+ were_changes = true
+ end
end
Roles.config.deferred_roles[valid_player.name] = assign_later
+ if were_changes then
+ emit_player_roles_updated(valid_player, 'assign', roles, by_player_name, silent, true)
+ end
return
end
diff --git a/locale/en/expcore.cfg b/locale/en/expcore.cfg
index bdc4907d..3bfb6828 100644
--- a/locale/en/expcore.cfg
+++ b/locale/en/expcore.cfg
@@ -29,6 +29,7 @@ error-log-format-flag=[ERROR] roleFlag/__1__ :: __2__
error-log-format-assign=[ERROR] rolePromote/__1__ :: __2__
game-message-assign=__1__ has been assigned to __2__ by __3__
game-message-unassign=__1__ has been unassigned from __2__ by __3__
+game-message-deferred-assign=__1__ will been assigned to __2__ by __3__
reject-role=Invalid Role Name.
reject-player-role=Player has a higher role.
From e8e5f963a1986cadf56e2141ff53baa9d734de17 Mon Sep 17 00:00:00 2001
From: oof2win2
Date: Thu, 17 Nov 2022 07:58:48 +0100
Subject: [PATCH 126/129] feat: review changes
---
expcore/roles.lua | 54 +++++++++++++++++++++++++++++------------------
1 file changed, 34 insertions(+), 20 deletions(-)
diff --git a/expcore/roles.lua b/expcore/roles.lua
index 0dcaa2ac..cbaa2395 100644
--- a/expcore/roles.lua
+++ b/expcore/roles.lua
@@ -134,11 +134,9 @@ local Roles = {
}
--- When global is loaded it will have the metatable re-assigned to the roles
-Global.register(Roles.config.players, function(tbl)
- Roles.config.players = tbl
-end)
-Global.register(Roles.config.deferred_roles, function(tbl)
- Roles.config.deferred_roles = tbl
+Global.register({ Roles.config.players, Roles.config.deferred_roles }, function(tbl)
+ Roles.config.players = tbl[1]
+ Roles.config.deferred_roles = tbl[2]
end)
--- Getter.
@@ -382,17 +380,17 @@ function Roles.assign_player(player, roles, by_player_name, skip_checks, silent)
-- if the player has a role that needs to defer the role changes, save the roles that need to be assigned later into a table
if valid_player and Roles.player_has_flag(player, "defer_role_changes") then
local assign_later = Roles.config.deferred_roles[valid_player.name] or {}
- local were_changes = false
+ local were_changes = false
for _, role in ipairs(roles) do
- if not assign_later[role] then
- assign_later[role] = 1
- were_changes = true
- end
+ if assign_later[role] ~= 1 then
+ assign_later[role] = 1
+ were_changes = true
+ end
end
Roles.config.deferred_roles[valid_player.name] = assign_later
- if were_changes then
- emit_player_roles_updated(valid_player, 'assign', roles, by_player_name, silent, true)
- end
+ if were_changes then
+ emit_player_roles_updated(valid_player, 'assign', roles, by_player_name, silent, true)
+ end
return
end
@@ -429,26 +427,42 @@ function Roles.unassign_player(player, roles, by_player_name, skip_checks, silen
roles = { roles }
end
- local had_deferred_changes = false
+ -- if the player has a role that needs to defer the role changes, save the roles that need to be unassigned later into a table
+ if Roles.player_has_flag(player, "defer_role_changes") then
+ local assign_later = Roles.config.deferred_roles[valid_player.name] or {}
+ local were_changes = false
+ for _, role in ipairs(roles) do
+ if assign_later[role] ~= -1 then
+ assign_later[role] = -1
+ were_changes = true
+ end
+ end
+ Roles.config.deferred_roles[valid_player.name] = assign_later
+ if were_changes then
+ emit_player_roles_updated(valid_player, 'unassign', roles, by_player_name, silent, true)
+ end
+ return
+ end
for _, role in ipairs(roles) do
role = Roles.get_role_from_any(role)
if role then
- if role:has_flag("defer_role_changes") then
- had_deferred_changes = true
- end
role:remove_player(valid_player or player, valid_player == nil, true)
end
end
-- if there are deferred role changes, apply them now
- if had_deferred_changes then
+ if Roles.player_has_flag(valid_player, "defer_role_changes") then
local assign_later = Roles.config.deferred_roles[player.name] or {}
- for role_name, _ in pairs(assign_later) do
+ for role_name, assign in pairs(assign_later) do
local role = Roles.get_role_from_any(role_name)
if role then
- role:add_player(valid_player or player, valid_player == nil, true)
+ if assign == 1 then
+ role:add_player(valid_player or player, valid_player == nil, true)
+ elseif assign == -1 then
+ role:remove_player(valid_player or player, valid_player == nil, true)
+ end
end
end
end
From fce01baf1c1d4e84606dfdbe3d296eaacf343d5c Mon Sep 17 00:00:00 2001
From: Cooldude2606 <25043174+Cooldude2606@users.noreply.github.com>
Date: Sat, 18 Feb 2023 19:17:15 +0000
Subject: [PATCH 127/129] Fixed assignment logic edge cases
---
expcore/roles.lua | 133 +++++++++++++++++++++++++-----------------
locale/en/expcore.cfg | 1 -
2 files changed, 81 insertions(+), 53 deletions(-)
diff --git a/expcore/roles.lua b/expcore/roles.lua
index cbaa2395..cedbd016 100644
--- a/expcore/roles.lua
+++ b/expcore/roles.lua
@@ -146,8 +146,8 @@ end)
--- Internal function used to trigger a few different things when roles are changed
-- this is the raw internal trigger as the other function is called at other times
-- there is a second half called role_update which triggers after the event call, it also is called when a player joins
-local function emit_player_roles_updated(player, type, roles, by_player_name, skip_game_print, deferred)
- by_player_name = game.player and game.player.name or by_player_name or ''
+local function emit_player_roles_updated(player, type, roles, by_player_name, skip_game_print)
+ by_player_name = by_player_name or game.player and game.player.name or ''
local by_player = game.players[by_player_name]
local by_player_index = by_player and by_player.index or 0
-- get the event id from the type of emit
@@ -155,22 +155,14 @@ local function emit_player_roles_updated(player, type, roles, by_player_name, sk
if type == 'unassign' then
event = Roles.events.on_role_unassigned
end
- -- convert the roles to objects and get the names of the roles
- local index, role_names = 0, {}
- for _, role in ipairs(roles) do
- role = Roles.get_role_from_any(role)
- if role then
- index = index + 1
- role_names[index] = role.name
- end
+ -- Get the names of the roles
+ local role_names = {}
+ for index, role in ipairs(roles) do
+ role_names[index] = role.name
end
-- output to all the different locations: game print, player sound, event trigger and role log
if not skip_game_print then
- if deferred then
- game.print({'expcore-roles.game-message-deferred-'..type, player.name, table.concat(role_names, ', '), by_player_name}, Colours.cyan)
- else
- game.print({'expcore-roles.game-message-'..type, player.name, table.concat(role_names, ', '), by_player_name}, Colours.cyan)
- end
+ game.print({'expcore-roles.game-message-'..type, player.name, table.concat(role_names, ', '), by_player_name}, Colours.cyan)
end
if type == 'assign' then
player.play_sound{path='utility/achievement_unlocked'}
@@ -373,35 +365,46 @@ function Roles.assign_player(player, roles, by_player_name, skip_checks, silent)
local valid_player = Game.get_player_from_any(player)
if not skip_checks and not valid_player then return end
if not player then return end
+
+ -- Convert the roles into a table (allows for optional array)
if type(roles) ~= 'table' or roles.name then
roles = { roles }
end
- -- if the player has a role that needs to defer the role changes, save the roles that need to be assigned later into a table
+ -- Convert to role objects
+ local role_objects = {}
+ for _, role in ipairs(roles) do
+ local role_object = Roles.get_role_from_any(role)
+ if role_object then table.insert(role_objects, role_object) end
+ end
+
+ -- If the player has a role that needs to defer the role changes, save the roles that need to be assigned later into a table
if valid_player and Roles.player_has_flag(player, "defer_role_changes") then
local assign_later = Roles.config.deferred_roles[valid_player.name] or {}
- local were_changes = false
- for _, role in ipairs(roles) do
- if assign_later[role] ~= 1 then
- assign_later[role] = 1
- were_changes = true
+ for _, role in ipairs(role_objects) do
+ local role_change = assign_later[role.name]
+ if role_change then
+ role_change.count = role_change.count + 1
+ if role_change.count == 1 then
+ role_change.by_player_name = by_player_name or ""
+ role_change.silent = silent
+ end
+ else
+ assign_later[role.name] = {
+ count = 1, by_player_name = by_player_name or "", silent = silent
+ }
end
end
Roles.config.deferred_roles[valid_player.name] = assign_later
- if were_changes then
- emit_player_roles_updated(valid_player, 'assign', roles, by_player_name, silent, true)
- end
return
end
- for _, role in ipairs(roles) do
- role = Roles.get_role_from_any(role)
- if role then
- role:add_player(valid_player or player, valid_player == nil, true)
- end
+ for _, role in ipairs(role_objects) do
+ role:add_player(valid_player or player, valid_player == nil, true)
end
+
if valid_player then
- emit_player_roles_updated(valid_player, 'assign', roles, by_player_name, silent)
+ emit_player_roles_updated(valid_player, 'assign', role_objects, by_player_name, silent)
end
end
@@ -423,52 +426,78 @@ function Roles.unassign_player(player, roles, by_player_name, skip_checks, silen
local valid_player = Game.get_player_from_any(player)
if not skip_checks and not valid_player then return end
if not player then return end
+
+ -- Convert the roles into a table (allows for optional array)
if type(roles) ~= 'table' or roles.name then
roles = { roles }
end
- -- if the player has a role that needs to defer the role changes, save the roles that need to be unassigned later into a table
- if Roles.player_has_flag(player, "defer_role_changes") then
+ -- Convert to role objects
+ local role_objects = {}
+ for _, role in ipairs(roles) do
+ local role_object = Roles.get_role_from_any(role)
+ if role_object then table.insert(role_objects, role_object) end
+ end
+
+ -- If the player has a role that needs to defer the role changes, save the roles that need to be unassigned later into a table
+ local defer_changes = Roles.player_has_flag(player, "defer_role_changes")
+ if defer_changes then
local assign_later = Roles.config.deferred_roles[valid_player.name] or {}
- local were_changes = false
- for _, role in ipairs(roles) do
- if assign_later[role] ~= -1 then
- assign_later[role] = -1
- were_changes = true
+ for _, role in ipairs(role_objects) do
+ local role_change = assign_later[role.name]
+ if role_change then
+ role_change.count = role_change.count - 1
+ if role_change.count == -1 then
+ role_change.by_player_name = by_player_name or ""
+ role_change.silent = silent
+ end
+ else
+ assign_later[role.name] = {
+ count = -1, by_player_name = by_player_name or "", silent = silent
+ }
end
end
Roles.config.deferred_roles[valid_player.name] = assign_later
- if were_changes then
- emit_player_roles_updated(valid_player, 'unassign', roles, by_player_name, silent, true)
- end
- return
end
- for _, role in ipairs(roles) do
- role = Roles.get_role_from_any(role)
- if role then
+ -- Remove the player from roles
+ local role_changes = {}
+ for _, role in ipairs(role_objects) do
+ if not defer_changes or role:has_flag("defer_role_changes") then
role:remove_player(valid_player or player, valid_player == nil, true)
+ table.insert(role_changes, role)
end
end
-
- -- if there are deferred role changes, apply them now
- if Roles.player_has_flag(valid_player, "defer_role_changes") then
+ -- If there are deferred role changes, apply them now
+ if defer_changes and not Roles.player_has_flag(valid_player, "defer_role_changes") then
local assign_later = Roles.config.deferred_roles[player.name] or {}
- for role_name, assign in pairs(assign_later) do
+ local assigns, unassigns = {}, {}
+ for role_name, details in pairs(assign_later) do
local role = Roles.get_role_from_any(role_name)
if role then
- if assign == 1 then
+ if details.count > 0 then
role:add_player(valid_player or player, valid_player == nil, true)
- elseif assign == -1 then
+ if not assigns[details.by_player_name] then assigns[details.by_player_name] = {} end
+ if not details.silent then table.insert(assigns[details.by_player_name], role) end
+ elseif details.count < 0 then
role:remove_player(valid_player or player, valid_player == nil, true)
+ if not unassigns[details.by_player_name] then unassigns[details.by_player_name] = {} end
+ if not details.silent then table.insert(unassigns[details.by_player_name], role) end
end
end
end
+ for assign_by_player_name, assign_roles in pairs(assigns) do
+ if #assign_roles > 0 then emit_player_roles_updated(valid_player, 'assign', assign_roles, assign_by_player_name) end
+ end
+ for unassign_by_player_name, unassign_roles in pairs(unassigns) do
+ if #unassign_roles > 0 then emit_player_roles_updated(valid_player, 'unassign', unassign_roles, unassign_by_player_name) end
+ end
+ Roles.config.deferred_roles[player.name] = nil
end
- if valid_player then
- emit_player_roles_updated(valid_player, 'unassign', roles, by_player_name, silent)
+ if valid_player and #role_changes > 0 then
+ emit_player_roles_updated(valid_player, 'unassign', role_changes, by_player_name, silent)
end
end
diff --git a/locale/en/expcore.cfg b/locale/en/expcore.cfg
index 3bfb6828..bdc4907d 100644
--- a/locale/en/expcore.cfg
+++ b/locale/en/expcore.cfg
@@ -29,7 +29,6 @@ error-log-format-flag=[ERROR] roleFlag/__1__ :: __2__
error-log-format-assign=[ERROR] rolePromote/__1__ :: __2__
game-message-assign=__1__ has been assigned to __2__ by __3__
game-message-unassign=__1__ has been unassigned from __2__ by __3__
-game-message-deferred-assign=__1__ will been assigned to __2__ by __3__
reject-role=Invalid Role Name.
reject-player-role=Player has a higher role.
From 19ad8838a65dc62668ea3d4f1f325116757ea530 Mon Sep 17 00:00:00 2001
From: Cooldude2606 <25043174+Cooldude2606@users.noreply.github.com>
Date: Sat, 25 Feb 2023 15:32:49 +0000
Subject: [PATCH 128/129] Fixed Indentation
---
expcore/roles.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/expcore/roles.lua b/expcore/roles.lua
index cedbd016..b895897b 100644
--- a/expcore/roles.lua
+++ b/expcore/roles.lua
@@ -162,7 +162,7 @@ local function emit_player_roles_updated(player, type, roles, by_player_name, sk
end
-- output to all the different locations: game print, player sound, event trigger and role log
if not skip_game_print then
- game.print({'expcore-roles.game-message-'..type, player.name, table.concat(role_names, ', '), by_player_name}, Colours.cyan)
+ game.print({'expcore-roles.game-message-'..type, player.name, table.concat(role_names, ', '), by_player_name}, Colours.cyan)
end
if type == 'assign' then
player.play_sound{path='utility/achievement_unlocked'}
From 4b4202b4b7175b3f4deb1880eebd9a8f44363ca5 Mon Sep 17 00:00:00 2001
From: Cooldude2606 <25043174+Cooldude2606@users.noreply.github.com>
Date: Sun, 5 Mar 2023 23:27:20 +0000
Subject: [PATCH 129/129] Fixed auto fill amounts not working
---
modules/gui/autofill.lua | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/gui/autofill.lua b/modules/gui/autofill.lua
index c27e962b..f4a90ad8 100644
--- a/modules/gui/autofill.lua
+++ b/modules/gui/autofill.lua
@@ -177,7 +177,7 @@ end)
if not value then value = 0 end
local clamped = math.clamp(value, 0, 1000)
local item_name = element.parent.tooltip
- local entity_name = element.parent.parent.parent.parent.name
+ local entity_name = element.parent.parent.parent.name
if not autofill_player_settings[player.name] then return end
local setting = autofill_player_settings[player.name][entity_name]
if not setting then return end