Merge branch 'dev'

.github/workflows/deploy-poligon.yml

@@ -17,6 +17,7 @@ jobs:
           user: ${{ secrets.LORD_TEST_USER }}
           key: ${{ secrets.LORD_TEST_KEY }}
           command: |
+            set -e
             cd mt/games/lord/
             git checkout dev
             git pull --recurse-submodules

.github/workflows/deploy-production.yml

@@ -21,6 +21,7 @@ jobs:
           user: ${{ secrets.LORD_PROD_USER }}
           key: ${{ secrets.LORD_PROD_KEY }}
           command: |
+            set -e
             cd minetest-master/games/lord
             git checkout master
             git pull --recurse-submodules
@@ -39,6 +40,7 @@ jobs:
           token: ${{ secrets.GH_TOKEN }}
       - name: Merge `Master` -> `Dev`
         run: |
+          set -e
           git config user.name github-actions
           git config user.email [email protected]
           git fetch

.gitmodules

@@ -29,6 +29,9 @@
 [submodule "mods/_minetest_game/give_initial_stuff"]
 	path = mods/_minetest_game/give_initial_stuff
 	url = https://github.com/minetest-game-mod/give_initial_stuff
+[submodule "mods/_minetest_game/keys"]
+	path = mods/_minetest_game/keys
+	url = https://github.com/minetest-game-mod/keys
 [submodule "mods/_minetest_game/player_api"]
 	path = mods/_minetest_game/player_api
 	url = https://github.com/minetest-game-mod/player_api
@@ -63,17 +66,20 @@
 
 [submodule "mods/_various/ambience"]
 	path = mods/_various/ambience
-	url = https://notabug.org/TenPlus1/ambience.git
+	url = https://codeberg.org/tenplus1/ambience.git
 [submodule "mods/_various/candles_3d"]
 	path = mods/_various/candles_3d
 	url = https://gitlab.com/lord-server/candles_3d.git
 	branch = lord
 [submodule "mods/_various/mywalls"]
 	path = mods/_various/mywalls
 	url = https://github.com/minetest-mods/mywalls
-[submodule "mods/_minetest_game/keys"]
-	path = mods/_minetest_game/keys
-	url = https://github.com/minetest-game-mod/keys
 [submodule "mods/_various/stainedglass"]
 	path = mods/_various/stainedglass
 	url = https://gitlab.com/alerikaisattera/stainedglass.git
+[submodule "mods/_various/WorldEdit"]
+	path = mods/_various/WorldEdit
+	url = https://github.com/Uberi/Minetest-WorldEdit.git
+[submodule "mods/_various/discord"]
+	path = mods/_various/discord
+	url = https://github.com/googolgl/lp_api

.luacheckrc

@@ -47,7 +47,7 @@ read_globals      = {
 
 	-- MTG
 	"beds", "sfinv", "creative", "dungeon_loot",
-	"dye", "stairs", "sethome",
+	"dye", "stairs", "sethome", "walls",
 
 	-- Lord specific
 	"lord", "hb",
@@ -72,14 +72,12 @@ read_globals      = {
 exclude_files     = {
 	-- External mods:
 
-    -- пришлось добавить после того, как обновился LuaRocks:
-	"mods/lord/Game/lord_base_commands/chatcommands.lua",
-
     -- MTG:
     "mods/_minetest_game/",
 
     -- наследие из LOTT (требует переработки):
 	"mods/lord/World/Generation/lottmapgen",
+	"mods/lord/Blocks/protector_lott",
 
     -- Остальное:
 	"mods/_various/",
@@ -88,8 +86,9 @@ exclude_files     = {
 
 -- Lua extending:
 files["mods/lord/Core/helpers/src/lua_ext/**/*.lua"] = {
-	globals = {
-		table  = { fields = {} },
-		string = { fields = {} },
-	}
+	globals = { "table", "string", }
+}
+-- WorldEdit extending:
+files["mods/lord/World/worldedit_ext/**/*.lua"] = {
+	globals = { "worldedit"	}
 }