Merge remote-tracking branch 'upstream/master'

- [3d_armor_ui] et [shields] sont concernés

.gitignore

@@ -4,7 +4,6 @@
 *bak*
 tags
 *.vim
-armor.conf
 
 ## Eclipse project files & directories
 .project

3d_armor/armor.conf

@@ -0,0 +1,37 @@
+-- Armor Configuration (defaults)
+
+-- Increase this if you get initialization glitches when a player first joins.
+ARMOR_INIT_DELAY = 3
+
+-- Number of initialization attempts.
+-- Use in conjunction with ARMOR_INIT_DELAY if initialization problems persist.
+ARMOR_INIT_TIMES = 3
+
+-- Increase this if armor is not getting into bones due to server lag.
+ARMOR_BONES_DELAY = 3
+
+-- How often player armor/wield items are updated.
+ARMOR_UPDATE_TIME = 1
+
+-- Drop armor when a player dies.
+-- Uses bones mod if present, otherwise items are dropped around the player.
+ARMOR_DROP = true
+
+-- Pulverise armor when a player dies, overrides ARMOR_DROP.
+ARMOR_DESTROY = false
+
+-- You can use this to increase or decrease overall armor effectiveness,
+-- eg: ARMOR_LEVEL_MULTIPLIER = 0.5 will reduce armor level by half.
+ARMOR_LEVEL_MULTIPLIER = 1
+
+-- You can use this to increase or decrease overall armor healing,
+-- eg: ARMOR_HEAL_MULTIPLIER = 0 will disable healing altogether.
+ARMOR_HEAL_MULTIPLIER = 1
+
+-- You can also use this file to execute arbitary lua code
+-- eg: Dumb the armor down if using Simple Mobs
+--if minetest.get_modpath("mobs") then
+--	ARMOR_LEVEL_MULTIPLIER = 1
+--	ARMOR_HEAL_MULTIPLIER = 0
+--end
+

3d_armor/init.lua

@@ -501,3 +501,5 @@ if armor.config.fire_protect == true then
 		return hp_change
 	end, true)
 end
+
+minetest.log("action", "[3d_armor] loaded.")