milan
/
minetest-mm
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Merge pull request 'develop' (#11) from develop into master 

Reviewed-on: #11
This commit is contained in:
Milan Meduna 2020-11-11 19:58:03 +01:00
parent a4cbbb9688 d9df7c310f
commit 41e788f692
27 changed files with 169 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
debug.txt Normal file
View File

@ -0,0 +1,117 @@
2020-11-11 19:41:38: WARNING[Main]: Mod name conflict detected: "carts"
2020-11-11 19:41:38: WARNING[Main]: Will not load: /home/minetest/.minetest/games/minetest/mods/carts
2020-11-11 19:41:38: WARNING[Main]: Overridden by: /home/minetest/.minetest/mods/carts
2020-11-11 19:41:38: WARNING[Main]: Mod name conflict detected: "doors"
2020-11-11 19:41:38: WARNING[Main]: Will not load: /home/minetest/.minetest/games/minetest/mods/doors
2020-11-11 19:41:38: WARNING[Main]: Overridden by: /home/minetest/.minetest/mods/doors
2020-11-11 19:41:38: WARNING[Main]: Mod name conflict detected: "farming"
2020-11-11 19:41:38: WARNING[Main]: Will not load: /home/minetest/.minetest/games/minetest/mods/farming
2020-11-11 19:41:38: WARNING[Main]: Overridden by: /home/minetest/.minetest/mods/farming
2020-11-11 19:41:38: WARNING[Main]: Mod name conflict detected: "stairs"
2020-11-11 19:41:38: WARNING[Main]: Will not load: /home/minetest/.minetest/games/minetest/mods/stairs
2020-11-11 19:41:38: WARNING[Main]: Overridden by: /home/minetest/.minetest/mods/stairs
2020-11-11 19:41:38: WARNING[Main]: Mod name conflict detected: "wool"
2020-11-11 19:41:38: WARNING[Main]: Will not load: /home/minetest/.minetest/games/minetest/mods/wool
2020-11-11 19:41:38: WARNING[Main]: Overridden by: /home/minetest/.minetest/mods/wool
2020-11-11 19:41:38: ERROR[Main]: mod "infrastructure" has unsatisfied dependencies: "digilines" "mesecons"
2020-11-11 19:41:39: WARNING[Main]: [xban] Unable to load database: /home/minetest/.minetest/worlds/world/xban.db: No such file or directory
2020-11-11 19:41:40: WARNING[Main]: Not registering alias, item with same name is already defined: mushroom:brown_natural -> flowers:mushroom_fertile_brown
2020-11-11 19:41:40: WARNING[Main]: Not registering alias, item with same name is already defined: mushroom:red_natural -> flowers:mushroom_fertile_red
2020-11-11 19:41:42: WARNING[Main]: (T@3d_armor_ip)3d_armor_ip: Mod loaded but unused.E
2020-11-11 19:42:20: WARNING[Main]: Not registering alias, item with same name is already defined: unifieddyes:white -> unifieddyes:white_paint
2020-11-11 19:42:20: WARNING[Main]: Not registering alias, item with same name is already defined: unifieddyes:grey -> unifieddyes:grey_paint
2020-11-11 19:42:20: WARNING[Main]: Node default:brick has a palette, but not a suitable paramtype2.
2020-11-11 19:42:20: WARNING[Main]: Node default:clay has a palette, but not a suitable paramtype2.
2020-11-11 19:42:20: WARNING[Main]: Node moreblocks:super_glow_glass has a palette, but not a suitable paramtype2.
2020-11-11 19:42:20: WARNING[Main]: Node moreblocks:trap_super_glow_glass has a palette, but not a suitable paramtype2.
2020-11-11 19:42:24: WARNING[Main]: Node default:wood has a palette, but not a suitable paramtype2.
2020-11-11 19:42:24: WARNING[Main]: Node default:fence_wood has a palette, but not a suitable paramtype2.
2020-11-11 19:42:24: WARNING[Main]: Field "light_propagates": Obsolete; determined from paramtype
2020-11-11 19:42:24: WARNING[Main]: Node default:stone_block has a palette, but not a suitable paramtype2.
2020-11-11 19:42:24: WARNING[Main]: Node default:stone has a palette, but not a suitable paramtype2.
2020-11-11 19:42:24: WARNING[Main]: Node default:cobble has a palette, but not a suitable paramtype2.
2020-11-11 19:42:24: WARNING[Main]: Node moreblocks:circle_stone_bricks has a palette, but not a suitable paramtype2.
2020-11-11 19:42:24: WARNING[Main]: Node moreblocks:iron_checker has a palette, but not a suitable paramtype2.
2020-11-11 19:42:24: WARNING[Main]: Node moreblocks:wood_tile has a palette, but not a suitable paramtype2.
2020-11-11 19:42:24: WARNING[Main]: Node moreblocks:wood_tile_flipped has a palette, but not a suitable paramtype2.
2020-11-11 19:42:26: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:glowlight_half_max -> homedecor:glowlight_half_14
2020-11-11 19:42:26: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:glowlight_quarter_max -> homedecor:glowlight_quarter_14
2020-11-11 19:42:26: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:glowlight_small_cube_max -> homedecor:glowlight_small_cube_14
2020-11-11 19:42:26: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:plasma_lamp_max -> homedecor:plasma_lamp_14
2020-11-11 19:42:26: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:ground_lantern_max -> homedecor:ground_lantern_14
2020-11-11 19:42:26: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:hanging_lantern_max -> homedecor:hanging_lantern_14
2020-11-11 19:42:26: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:ceiling_lantern_max -> homedecor:ceiling_lantern_14
2020-11-11 19:42:26: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:lattice_lantern_large_max -> homedecor:lattice_lantern_large_14
2020-11-11 19:42:26: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:lattice_lantern_small_max -> homedecor:lattice_lantern_small_14
2020-11-11 19:42:26: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:desk_lamp_max -> homedecor:desk_lamp_14
2020-11-11 19:42:26: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:ceiling_lamp_max -> homedecor:ceiling_lamp_14
2020-11-11 19:42:26: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:table_lamp_max -> homedecor:table_lamp_14
2020-11-11 19:42:26: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:standing_lamp_max -> homedecor:standing_lamp_14
2020-11-11 19:42:26: WARNING[Main]: Not registering alias, item with same name is already defined: 3dforniture:table_lamp_max -> homedecor:table_lamp_14
2020-11-11 19:42:26: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:rope_light_on_floor_off -> homedecor:rope_light_on_floor_0
2020-11-11 19:42:26: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:rope_light_on_ceiling_off -> homedecor:rope_light_on_ceiling_0
2020-11-11 19:42:26: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:plasma_ball_off -> homedecor:plasma_ball_0
2020-11-11 19:42:26: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:rope_light_on_floor_on -> homedecor:rope_light_on_floor_14
2020-11-11 19:42:26: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:rope_light_on_ceiling_on -> homedecor:rope_light_on_ceiling_14
2020-11-11 19:42:26: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:plasma_ball_on -> homedecor:plasma_ball_14
2020-11-11 19:42:27: WARNING[Main]: Not registering alias, item with same name is already defined: mycorners:machine_installer -> mycorners:machine_corner
2020-11-11 19:42:28: WARNING[Main]: Not registering alias, item with same name is already defined: 3dforniture:table_lamp -> homedecor:table_lamp_off
2020-11-11 19:46:25: WARNING[ConnectionSend]: con(5/1) Packet quota used up for peer_id=3, was 1024 pkts
2020-11-11 19:46:49: WARNING[Server]: (T@3d_armor)3d_armor: Detached armor inventory is nil F[set_player_armor]EE
2020-11-11 19:49:27: WARNING[Main]: Mod name conflict detected: "carts"
2020-11-11 19:49:27: WARNING[Main]: Will not load: /home/minetest/.minetest/games/minetest/mods/carts
2020-11-11 19:49:27: WARNING[Main]: Overridden by: /home/minetest/.minetest/mods/carts
2020-11-11 19:49:27: WARNING[Main]: Mod name conflict detected: "doors"
2020-11-11 19:49:27: WARNING[Main]: Will not load: /home/minetest/.minetest/games/minetest/mods/doors
2020-11-11 19:49:27: WARNING[Main]: Overridden by: /home/minetest/.minetest/mods/doors
2020-11-11 19:49:27: WARNING[Main]: Mod name conflict detected: "farming"
2020-11-11 19:49:27: WARNING[Main]: Will not load: /home/minetest/.minetest/games/minetest/mods/farming
2020-11-11 19:49:27: WARNING[Main]: Overridden by: /home/minetest/.minetest/mods/farming
2020-11-11 19:49:27: WARNING[Main]: Mod name conflict detected: "stairs"
2020-11-11 19:49:27: WARNING[Main]: Will not load: /home/minetest/.minetest/games/minetest/mods/stairs
2020-11-11 19:49:27: WARNING[Main]: Overridden by: /home/minetest/.minetest/mods/stairs
2020-11-11 19:49:27: WARNING[Main]: Mod name conflict detected: "wool"
2020-11-11 19:49:27: WARNING[Main]: Will not load: /home/minetest/.minetest/games/minetest/mods/wool
2020-11-11 19:49:27: WARNING[Main]: Overridden by: /home/minetest/.minetest/mods/wool
2020-11-11 19:49:27: ERROR[Main]: mod "infrastructure" has unsatisfied dependencies: "digilines" "mesecons"
2020-11-11 19:49:29: WARNING[Main]: Not registering alias, item with same name is already defined: mushroom:brown_natural -> flowers:mushroom_fertile_brown
2020-11-11 19:49:29: WARNING[Main]: Not registering alias, item with same name is already defined: mushroom:red_natural -> flowers:mushroom_fertile_red
2020-11-11 19:49:30: WARNING[Main]: (T@3d_armor_ip)3d_armor_ip: Mod loaded but unused.E
2020-11-11 19:50:04: WARNING[Main]: Not registering alias, item with same name is already defined: unifieddyes:white -> unifieddyes:white_paint
2020-11-11 19:50:04: WARNING[Main]: Not registering alias, item with same name is already defined: unifieddyes:grey -> unifieddyes:grey_paint
2020-11-11 19:50:04: WARNING[Main]: Node default:brick has a palette, but not a suitable paramtype2.
2020-11-11 19:50:04: WARNING[Main]: Node default:clay has a palette, but not a suitable paramtype2.
2020-11-11 19:50:04: WARNING[Main]: Node moreblocks:super_glow_glass has a palette, but not a suitable paramtype2.
2020-11-11 19:50:04: WARNING[Main]: Node moreblocks:trap_super_glow_glass has a palette, but not a suitable paramtype2.
2020-11-11 19:50:09: WARNING[Main]: Node default:wood has a palette, but not a suitable paramtype2.
2020-11-11 19:50:09: WARNING[Main]: Node default:fence_wood has a palette, but not a suitable paramtype2.
2020-11-11 19:50:09: WARNING[Main]: Field "light_propagates": Obsolete; determined from paramtype
2020-11-11 19:50:09: WARNING[Main]: Node default:stone_block has a palette, but not a suitable paramtype2.
2020-11-11 19:50:09: WARNING[Main]: Node default:stone has a palette, but not a suitable paramtype2.
2020-11-11 19:50:09: WARNING[Main]: Node default:cobble has a palette, but not a suitable paramtype2.
2020-11-11 19:50:09: WARNING[Main]: Node moreblocks:circle_stone_bricks has a palette, but not a suitable paramtype2.
2020-11-11 19:50:09: WARNING[Main]: Node moreblocks:iron_checker has a palette, but not a suitable paramtype2.
2020-11-11 19:50:09: WARNING[Main]: Node moreblocks:wood_tile has a palette, but not a suitable paramtype2.
2020-11-11 19:50:09: WARNING[Main]: Node moreblocks:wood_tile_flipped has a palette, but not a suitable paramtype2.
2020-11-11 19:50:11: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:glowlight_half_max -> homedecor:glowlight_half_14
2020-11-11 19:50:11: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:glowlight_quarter_max -> homedecor:glowlight_quarter_14
2020-11-11 19:50:11: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:glowlight_small_cube_max -> homedecor:glowlight_small_cube_14
2020-11-11 19:50:11: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:plasma_lamp_max -> homedecor:plasma_lamp_14
2020-11-11 19:50:11: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:ground_lantern_max -> homedecor:ground_lantern_14
2020-11-11 19:50:11: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:hanging_lantern_max -> homedecor:hanging_lantern_14
2020-11-11 19:50:11: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:ceiling_lantern_max -> homedecor:ceiling_lantern_14
2020-11-11 19:50:11: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:lattice_lantern_large_max -> homedecor:lattice_lantern_large_14
2020-11-11 19:50:11: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:lattice_lantern_small_max -> homedecor:lattice_lantern_small_14
2020-11-11 19:50:11: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:desk_lamp_max -> homedecor:desk_lamp_14
2020-11-11 19:50:11: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:ceiling_lamp_max -> homedecor:ceiling_lamp_14
2020-11-11 19:50:11: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:table_lamp_max -> homedecor:table_lamp_14
2020-11-11 19:50:11: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:standing_lamp_max -> homedecor:standing_lamp_14
2020-11-11 19:50:11: WARNING[Main]: Not registering alias, item with same name is already defined: 3dforniture:table_lamp_max -> homedecor:table_lamp_14
2020-11-11 19:50:11: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:rope_light_on_floor_off -> homedecor:rope_light_on_floor_0
2020-11-11 19:50:11: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:rope_light_on_ceiling_off -> homedecor:rope_light_on_ceiling_0
2020-11-11 19:50:11: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:plasma_ball_off -> homedecor:plasma_ball_0
2020-11-11 19:50:11: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:rope_light_on_floor_on -> homedecor:rope_light_on_floor_14
2020-11-11 19:50:11: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:rope_light_on_ceiling_on -> homedecor:rope_light_on_ceiling_14
2020-11-11 19:50:11: WARNING[Main]: Not registering alias, item with same name is already defined: homedecor:plasma_ball_on -> homedecor:plasma_ball_14
2020-11-11 19:50:12: WARNING[Main]: Not registering alias, item with same name is already defined: mycorners:machine_installer -> mycorners:machine_corner
2020-11-11 19:50:14: WARNING[Main]: Not registering alias, item with same name is already defined: 3dforniture:table_lamp -> homedecor:table_lamp_off

10
mods/bonemeal/init.lua
View File

@ -632,6 +632,16 @@ minetest.register_craft({
}
})
minetest.register_craft({
type = "shapeless",
output = "bonemeal:mulch",
recipe = {
"group:seed", "group:seed", "group:seed",
"group:seed", "group:seed", "group:seed",
"group:seed", "group:seed", "group:seed"
}
})
-- fertiliser
minetest.register_craft({
type = "shapeless",

3
mods/skinsdb/meta/character_1915.txt Normal file
View File

@ -0,0 +1,3 @@
people
pseudonyme
CC BY-SA 3.0

3
mods/skinsdb/meta/character_1916.txt Normal file
View File

@ -0,0 +1,3 @@
Red Hume2
pseudonyme
CC BY-SA 3.0

3
mods/skinsdb/meta/character_1917.txt Normal file
View File

@ -0,0 +1,3 @@
Secret Man
pseudonyme
CC BY-SA 3.0

3
mods/skinsdb/meta/character_1918.txt Normal file
View File

@ -0,0 +1,3 @@
Fire and Ice girl
pseudonyme
CC BY-SA 3.0

3
mods/skinsdb/meta/character_1919.txt Normal file
View File

@ -0,0 +1,3 @@
Blue Hume2
pseudonyme
CC BY-SA 3.0

3
mods/skinsdb/meta/character_1920.txt Normal file
View File

@ -0,0 +1,3 @@
Green Hume2
pseudonyme
CC BY-SA 3.0

3
mods/skinsdb/meta/character_1921.txt Normal file
View File

@ -0,0 +1,3 @@
Blue Hume2 v2
pseudonyme
CC BY-SA 3.0

3
mods/skinsdb/meta/character_1922.txt Normal file
View File

@ -0,0 +1,3 @@
Puple Hume2
pseudonyme
CC BY-SA 3.0

3
mods/skinsdb/meta/character_1923.txt Normal file
View File

@ -0,0 +1,3 @@
Evil Hume2
pseudonyme
CC BY-SA 3.0

3
mods/skinsdb/meta/character_1924.txt Normal file
View File

@ -0,0 +1,3 @@
Golden Hume2
pseudonyme
CC BY-SA 3.0

3
mods/skinsdb/meta/character_1925.txt Normal file
View File

@ -0,0 +1,3 @@
Fire and Ice man re-dited
pseudonyme
CC BY-SA 3.0

3
mods/skinsdb/meta/character_1926.txt Normal file
View File

@ -0,0 +1,3 @@
Fire and Ice girl re-edited
pseudonyme
CC BY-SA 3.0

BIN
mods/skinsdb/textures/character_1915.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
mods/skinsdb/textures/character_1916.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
mods/skinsdb/textures/character_1917.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
mods/skinsdb/textures/character_1918.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.7 KiB

BIN
mods/skinsdb/textures/character_1919.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
mods/skinsdb/textures/character_1920.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
mods/skinsdb/textures/character_1921.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
mods/skinsdb/textures/character_1922.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
mods/skinsdb/textures/character_1923.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
mods/skinsdb/textures/character_1924.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
mods/skinsdb/textures/character_1925.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
mods/skinsdb/textures/character_1926.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.0 KiB

9
mods/stamina/init.lua
View File

@ -63,12 +63,15 @@ local function stamina_update_level(player, level)
return
end
local meta = player:get_meta() ; if not meta then return end
local meta = player and player:get_meta() ; if not meta then return end
meta:set_string("stamina:level", level)
player:hud_change(stamina.players[player:get_player_name()].hud_id, "number",
math.min(STAMINA_VISUAL_MAX, level))
player:hud_change(
stamina.players[player:get_player_name()].hud_id,
"number",
math.min(STAMINA_VISUAL_MAX, level)
)
end