Merge branch 'dev' into dev8

This commit is contained in:
Cooldude2606
2023-12-21 21:44:07 +00:00
committed by GitHub
8 changed files with 278 additions and 24 deletions

View File

@@ -45,6 +45,7 @@ return {
'modules.commands.enemy',
'modules.commands.waterfill',
'modules.commands.artillery',
'modules.commands.surface-clearing',
--- Addons
'modules.addons.chat-popups',
@@ -93,6 +94,7 @@ return {
'modules.gui.vlayer',
'modules.gui.research',
'modules.gui.module',
'modules.gui.surveillance',
'modules.graftorio.require', -- graftorio
--- Config Files

View File

@@ -231,7 +231,10 @@ Roles.new_role('Member','Mem')
'command/manual-train',
'command/lawnmower',
'command/waterfill',
'command/artillery-target-remote'
'command/artillery-target-remote',
'command/clear-item-on-ground',
'command/clear-blueprint',
'gui/surveillance'
}
local hours3, hours15 = 3*216000, 15*60

View File

@@ -1,6 +1,6 @@
return {
-- type of machine to handle together
default_module_row_count = 4,
default_module_row_count = 6,
module_slot_max = 4,
machine_prod_disallow = {
['beacon'] = true