Merge branch 'dev' into dev3

.gitignore

@@ -47,6 +47,9 @@ jspm_packages
 # Thumbnails
 ._*
 
+# IDE
+.vscode/settings.json
+
 # Files that might appear in the root of a volume
 .DocumentRevisions-V100
 .fseventsd
@@ -82,4 +85,4 @@ $RECYCLE.BIN/
 *.msp
 
 # Windows shortcuts
-*.lnk
+*.lnk

config/expcore/roles.lua

@@ -39,7 +39,7 @@ Roles.new_role('Senior Administrator','SAdmin')
     'command/interface',
     'command/debug',
     'command/toggle-cheat-mode',
-    'command/research-all',
+    'command/research-all'
 }
 
 Roles.new_role('Administrator','Admin')
@@ -54,7 +54,7 @@ Roles.new_role('Administrator','Admin')
     'gui/warp-list/bypass-proximity',
     'gui/warp-list/bypass-cooldown',
     'command/connect-all',
-	'command/collectdata',
+	'command/collectdata'
 }
 
 Roles.new_role('Moderator','Mod')

locale/en/gui.cfg

@@ -210,7 +210,7 @@ disabled=disabled
 toggle-msg=Fast decon has been __1__
 
 [vlayer]
-main-tooltip=Enable vlayer GUI
+main-tooltip=Enable Vlayer GUI
 
 [module]
 main-tooltip=Enable Module GUI

locale/zh-CN/gui.cfg

@@ -210,7 +210,7 @@ disabled=停用
 toggle-msg=樹木快速拆除已 __1__
 
 [vlayer]
-main-tooltip=Enable vlayer GUI
+main-tooltip=Enable Vlayer GUI
 
 [module]
 main-tooltip=Enable Module GUI

locale/zh-TW/gui.cfg

@@ -210,7 +210,7 @@ disabled=停用
 toggle-msg=樹木快速拆除已 __1__
 
 [vlayer]
-main-tooltip=Enable vlayer GUI
+main-tooltip=Enable Vlayer GUI
 
 [module]
 main-tooltip=Enable Module GUI

modules/addons/spawn-area.lua

@@ -83,7 +83,7 @@ local function spawn_belts(surface, position)
         local set_position = apply_offset(position, belt_set)
         for _, belt in pairs(belt_details) do
             local pos = apply_offset(set_position, belt)
-            local belt_entity = surface.create_entity{name=belt_type, position=pos, force='spawn', direction=belt[3]}
+            local belt_entity = surface.create_entity{name=belt_type, position=pos, force='neutral', direction=belt[3]}
 
             if config.afk_belts.protected then
                 protect_entity(belt_entity)

modules/gui/vlayer.lua

@@ -93,6 +93,7 @@ local function vlayer_convert_chest_circuit(player)
 
     if (pos) then
         local circuit_o = player.surface.create_entity{name='constant-combinator', position=pos, force='neutral'}
+        game.print(player.name .. ' built a vlayer circuit on ' .. pos_to_gps_string(pos))
         circuit_o.destructible = false
         circuit_o.minable = false
         circuit_o.operable = true
@@ -112,7 +113,6 @@ local function vlayer_convert_chest_circuit(player)
         circuit_oc.set_signal(11, {signal={type='item', name='accumulator'}, count=0})
 
         table.insert(vlayer.power.circuit, circuit_o)
-        game.print(player.name .. ' built a vlayer circuit on ' .. pos_to_gps_string(pos))
     end
 end