Merge branch 'master' into minecart

CREDITS.md

@@ -110,6 +110,7 @@
 * wuniversales
 * kay27
 * pitchum
+* todoporlalibertad
 
 ## Special thanks
 * celeron55 for creating Minetest

mods/HUD/mcl_inventory/creative.lua

@@ -417,8 +417,7 @@ function mcl_inventory.set_creative_formspec(player, start_i, pagenum, inv_size,
 		return
 			"style["..this_tab..";border=false;bgimg=;bgimg_pressed=]"..
 			"item_image_button[" .. boffset[this_tab] ..";1,1;"..tab_icon[this_tab]..";"..this_tab..";]"..
-			"image[" .. offset[this_tab] .. ";1.5,1.44;" .. bg_img .. "]" ..
-			"image[" .. boffset[this_tab] .. ";1,1;crafting_creative_marker.png]"
+			"image[" .. offset[this_tab] .. ";1.5,1.44;" .. bg_img .. "]"
 	end
 	local caption = ""
 	if name ~= "inv" and filtername[name] then

mods/ITEMS/mcl_banners/patterncraft.lua

@@ -119,8 +119,7 @@ local patterns = {
 
 		name = N("@1 Thing Charge"),
 		type = "shapeless",
-		-- TODO: Replace with enchanted golden apple
-		{ e, "mcl_core:apple_gold", d },
+		{ e, "mcl_core:apple_gold_enchanted", d },
 	},
 	["rhombus"] = {
 		name = N("@1 Lozenge"),

mods/ITEMS/mcl_enchanting/locale/mcl_enchanting.es.tr

@@ -0,0 +1,123 @@
+# textdomain: mcl_enchanting
+
+
+### enchantments.lua ###
+
+Arrows passes through multiple objects.=Las flechas atraviesan multiples enemigos.
+Arrows set target on fire.=Las flechas prenderan los enemigos.
+Bane of Arthropods=Perdición de los Artrópodos
+Channeling=Conductividad
+
+Channels a bolt of lightning toward a target. Works only during thunderstorms and if target is unobstructed with opaque blocks.=Canaliza los rayos de una tormenta hacia el enemigo.
+
+Curse of Vanishing=Maldición de Desaparición
+Decreases crossbow charging time.=Disminuye el tiempo de carga de las ballestas.
+Decreases time until rod catches something.=Disminuye el tiempo que tardan en picar los cebos en la pesca.
+Depth Strider=Agilidad acuática
+Efficiency=Eficiencia
+Extends underwater breathing time.=Aumenta el tiempo de mantener la respiración.
+Fire Aspect=Aspecto Ígneo
+Flame=Fuego
+Fortune=Fortuna
+Frost Walker=Paso Helado
+Impaling=Empalamiento
+Increases arrow damage.=Incrementa el daño de las flechas.
+Increases arrow knockback.=Incrementa el empuje de las flechas.
+Increases certain block drops.=Incrementa la cantidad de objetos que sueltan los bloques.
+
+Increases damage and applies Slowness IV to arthropod mobs (spiders, cave spiders, silverfish and endermites).=Incrementa el daño y ralentiza a los artrópodos. (arañas, lepismas, endermitas, etc)
+
+Increases damage to undead mobs.=Incrementa el daño contra no-muertos.
+Increases damage.=Incrementa el daño.
+Increases item durability.=Incrementa la durabilidad de una herramienta.
+Increases knockback.=Incrementa el empuje.
+Increases mining speed.=Incrementa la velocidad de picado.
+Increases mob loot.=Incrementa el botín de los enemigos.
+Increases rate of good loot (enchanting books, etc.)=Incrementa la probabilidad de encontrar tesoros.
+Increases sweeping attack damage.=Incrementa el daño de efecto area.
+Increases underwater movement speed.=Incrementa la velocidad de nado bajo el agua.
+Increases walking speed on soul sand.=Incrementa la velocidad al caminar sobre arena de Almas.
+Infinity=Infinidad
+Item destroyed on death.=El objeto se destruye tras tu muerte.
+Knockback=Empuje
+Looting=Botín
+Loyalty=Lealtad
+Luck of the Sea=Suerte Marina
+Lure=Atracción
+Mending=Reparación
+Mined blocks drop themselves.=Los bloques se minarán enteros.
+Multishot=Multidisparo
+Piercing=Perforación
+Power=Poder
+Punch=Retroceso
+Quick Charge=Carga Rápida
+Repair the item while gaining XP orbs.=Repara los objetos portados al recibir orbes de experiencia.
+Respiration=Respiración
+Riptide=Propulsión acuática
+Sets target on fire.=Incencia al enemigo.
+Sharpness=Filo
+Shoot 3 arrows at the cost of one.=Dispara 3 flechas al precio de una.
+Shooting consumes no regular arrows.=No se consumiran las flechas lanzadas.
+Silk Touch=Toque de Seda
+Smite=Golpeo
+Soul Speed=Velocidad de Almas
+Sweeping Edge=Filo Arrasador
+Trident deals additional damage to ocean mobs.=Incrementa el daño del tridente sobre criaturas acuáticas.
+
+Trident launches player with itself when thrown. Works only in water or rain.=El tridente impulsa al portador dentro del agua o bajo la lluvia.
+
+Trident returns after being thrown. Higher levels reduce return time.=El tridente regresa al portador tras lanzarlo.
+
+Turns water beneath the player into frosted ice and prevents the damage from magma blocks.=Congela el agua bajo tus pies y evita el daño de los bloques de magma.
+
+Unbreaking=Irrompibilidad
+
+### engine.lua ###
+
+@1 Enchantment Levels=Nivel de encantamiento: @1
+@1 Lapis Lazuli=@1 Lapis Lázuli
+Inventory=Inventario
+Level requirement: @1=Nivel requerido: @1
+
+### init.lua ###
+
+'@1' is not a valid number='@1' no es un número válido
+'@1' is not a valid number.='@1' no es un número válido
+<player> <enchantment> [<level>]=<jugador> <encantamiento> [<nivel>]
+@1 can't be combined with @2.=@1 no se puede combinar con @2
+
+After finally selecting your enchantment; left-click on the selection, and you will see both the lapis lazuli and your experience levels consumed. And, an enchanted item left in its place.=Despues elige tu encantamiento, los niveles de experiencia y el lapis lázuli seran consumidos y el encantamiento aplicado al objeto.
+
+After placing your items in the slots, the enchanting options will be shown. Hover over the options to read what is available to you.=Coloca el objeto en su ranura yse mostraran los encantamientos a elegir.
+
+Enchant=Encantamiento
+Enchant an item=Encantar objeto
+Enchanted Book=Libro Encantado
+Enchanting Table=Mesa de Encantamientos
+
+Enchanting Tables will let you enchant armors, tools, weapons, and books with various abilities. But, at the cost of some experience, and lapis lazuli.=La mesa de Encantamientos dara a tus herramientas, armas o armadura algunas habilidades magicas. Pero a coste de algo de experiencia y lapis lázuli.
+
+Enchanting succeded.=Encantado correctamente.
+Forcefully enchant an item=Encantar objeto a la fuerza.
+
+Place a tool, armor, weapon or book into the top left slot, and then place 1-3 Lapis Lazuli in the slot to the right.=Coloca una herramienta, arma, armadura o libro sobre la ranura izquierda, coloca de 1 a 3 Lapis lázulis en la ranura derecha.
+
+Player '@1' cannot be found.=Jugador @1 no encontrado.
+Rightclick the Enchanting Table to open the enchanting menu.=Clic derecho sobre la mesa de encantamientos para abrir la interfaz.
+Spend experience, and lapis to enchant various items.=Experiencia y Lapis para encantar varios objetos.
+
+The number you have entered (@1) is too big, it must be at most @2.=@1 es muy grande, debe ser menor que @2
+
+The number you have entered (@1) is too small, it must be at least @2.=@1 es muy pequeño, debe ser mayor a @2
+
+The selected enchantment can't be added to the target item.=El encantamiento seleccionado no puede añadirse a ese objeto.
+The target doesn't hold an item.=El jugador no sujeta un objeto.
+The target item is not enchantable.=El objeto del jugador no se puede encantar.
+There is no such enchantment '@1'.=@1 no es un encantamiento.
+
+These options are randomized, and dependent on experience level; but the enchantment strength can be increased.=Las opciones seran aleatorias dependiendo del nivel de experiencia, los niveles de encantamiento pueden ser aumentados.
+
+To increase the enchantment strength, place bookshelves around the enchanting table. However, you will need to keep 1 air node between the table, & the bookshelves to empower the enchanting table.=Para aumentar los niveles de encantamientos, coloca librerias alrededor y cerca de la mesa de encantamientos.
+
+Usage: /enchant <player> <enchantment> [<level>]=Usa: /enchant <jugador> <encantamiento> [<nivel>]
+Usage: /forceenchant <player> <enchantment> [<level>]=Usa /forceenchant <jugador> <encantamiento> [<nivel>]

mods/ITEMS/mcl_enchanting/locale/template.txt

@@ -1,100 +1,129 @@
 # textdomain: mcl_enchanting
-Aqua Affinity=
-Increases underwater mining speed.=
-Bane of Arthropods=
-Increases damage and applies Slowness IV to arthropod mobs (spiders, cave spiders, silverfish and endermites).=
-Blast Protection=
-Reduces explosion damage and knockback.=
-Channeling=
-Channels a bolt of lightning toward a target. Works only during thunderstorms and if target is unobstructed with opaque blocks.=
-Curse of Binding=
-Item cannot be removed from armor slots except due to death, breaking or in Creative Mode.=
-Curse of Vanishing=
-Item destroyed on death.=
-Depth Strider=
-Increases underwater movement speed.=
-Efficiency=
-Increases mining speed.=
-Feather Falling=
-Reduces fall damage.=
-Fire Aspect=
-Sets target on fire.=
-Fire Protection=
-Reduces fire damage.=
-Flame=
-Arrows set target on fire.=
-Fortune=
-Increases certain block drops.=
-Frost Walker=
-Turns water beneath the player into frosted ice and prevents the damage from magma blocks.=
-Impaling=
-Trident deals additional damage to ocean mobs.=
-Infinity=
-Shooting consumes no regular arrows.=
-Knockback=
-Increases knockback.=
-Looting=
-Increases mob loot.=
-Loyalty=
-Trident returns after being thrown. Higher levels reduce return time.=
-Luck of the Sea=
-Increases rate of good loot (enchanting books, etc.)=
-Lure=
-Decreases time until rod catches something.=
-Mending=
-Repair the item while gaining XP orbs.=
-Multishot=
-Shoot 3 arrows at the cost of one.=
-Piercing=
+
+
+### enchantments.lua ###
+
 Arrows passes through multiple objects.=
-Power=
-Increases arrow damage.=
-Projectile Protection=
-Reduces projectile damage.=
-Protection=
-Reduces most types of damage by 4% for each level.=
-Punch=
-Increases arrow knockback.=
-Quick Charge=
+Arrows set target on fire.=
+Bane of Arthropods=
+Channeling=
+
+Channels a bolt of lightning toward a target. Works only during thunderstorms and if target is unobstructed with opaque blocks.=
+
+Curse of Vanishing=
 Decreases crossbow charging time.=
-Respiration=
+Decreases time until rod catches something.=
+Depth Strider=
+Efficiency=
 Extends underwater breathing time.=
-Riptide=
-Trident launches player with itself when thrown. Works only in water or rain.=
-Sharpness=
-Increases damage.=
-Silk Touch=
-Mined blocks drop themselves.=
-Smite=
+Fire Aspect=
+Flame=
+Fortune=
+Frost Walker=
+Impaling=
+Increases arrow damage.=
+Increases arrow knockback.=
+Increases certain block drops.=
+
+Increases damage and applies Slowness IV to arthropod mobs (spiders, cave spiders, silverfish and endermites).=
+
 Increases damage to undead mobs.=
-Soul Speed=
-Increases walking speed on soul sand.=
-Sweeping Edge=
-Increases sweeping attack damage.=
-Thorns=
-Reflects some of the damage taken when hit, at the cost of reducing durability with each proc.=
-Unbreaking=
+Increases damage.=
 Increases item durability.=
-Inventory=
-@1 Lapis Lazuli=
+Increases knockback.=
+Increases mining speed.=
+Increases mob loot.=
+Increases rate of good loot (enchanting books, etc.)=
+Increases sweeping attack damage.=
+Increases underwater movement speed.=
+Increases walking speed on soul sand.=
+Infinity=
+Item destroyed on death.=
+Knockback=
+Looting=
+Loyalty=
+Luck of the Sea=
+Lure=
+Mending=
+Mined blocks drop themselves.=
+Multishot=
+Piercing=
+Power=
+Punch=
+Quick Charge=
+Repair the item while gaining XP orbs.=
+Respiration=
+Riptide=
+Sets target on fire.=
+Sharpness=
+Shoot 3 arrows at the cost of one.=
+Shooting consumes no regular arrows.=
+Silk Touch=
+Smite=
+Soul Speed=
+Sweeping Edge=
+Trident deals additional damage to ocean mobs.=
+
+Trident launches player with itself when thrown. Works only in water or rain.=
+
+Trident returns after being thrown. Higher levels reduce return time.=
+
+Turns water beneath the player into frosted ice and prevents the damage from magma blocks.=
+
+Unbreaking=
+
+### engine.lua ###
+
 @1 Enchantment Levels=
+@1 Lapis Lazuli=
+Inventory=
 Level requirement: @1=
-Enchant an item=
-<player> <enchantment> [<level>]=
-Usage: /enchant <player> <enchantment> [<level>]=
-Player '@1' cannot be found.=
-There is no such enchantment '@1'.=
-The target doesn't hold an item.=
-The selected enchantment can't be added to the target item.=
+
+### init.lua ###
+
 '@1' is not a valid number=
-The number you have entered (@1) is too big, it must be at most @2.=
-The number you have entered (@1) is too small, it must be at least @2.=
-@1 can't be combined with @2.=
-Enchanting succeded.=
-Forcefully enchant an item=
-Usage: /forceenchant <player> <enchantment> [<level>]=
-The target item is not enchantable.=
 '@1' is not a valid number.=
+<player> <enchantment> [<level>]=
+@1 can't be combined with @2.=
+
+After finally selecting your enchantment; left-click on the selection, and you will see both the lapis lazuli and your experience levels consumed. And, an enchanted item left in its place.=
+
+After placing your items in the slots, the enchanting options will be shown. Hover over the options to read what is available to you.=
+
+Enchant=
+Enchant an item=
 Enchanted Book=
 Enchanting Table=
-Enchant=
+
+Enchanting Tables will let you enchant armors, tools, weapons, and books with various abilities. But, at the cost of some experience, and lapis lazuli.=
+
+Enchanting succeded.=
+Forcefully enchant an item=
+
+Place a tool, armor, weapon or book into the top left slot, and then place 1-3 Lapis Lazuli in the slot to the right.=
+
+Player '@1' cannot be found.=
+Rightclick the Enchanting Table to open the enchanting menu.=
+Spend experience, and lapis to enchant various items.=
+
+The number you have entered (@1) is too big, it must be at most @2.=
+
+The number you have entered (@1) is too small, it must be at least @2.=
+
+The selected enchantment can't be added to the target item.=
+The target doesn't hold an item.=
+The target item is not enchantable.=
+There is no such enchantment '@1'.=
+
+These options are randomized, and dependent on experience level; but the enchantment strength can be increased.=
+
+To increase the enchantment strength, place bookshelves around the enchanting table. However, you will need to keep 1 air node between the table, & the bookshelves to empower the enchanting table.=
+
+Usage: /enchant <player> <enchantment> [<level>]=
+Usage: /forceenchant <player> <enchantment> [<level>]=
+
+
+##### not used anymore #####
+
+# textdomain: mcl_enchanting
+Aqua Affinity=

mods/ITEMS/mcl_totems/init.lua

@@ -4,6 +4,8 @@ minetest.register_on_leaveplayer(function(player)
 	hud_totem[player] = nil
 end)
 
+local particle_colors = {"98BF22", "C49E09", "337D0B", "B0B021", "1E9200"} -- TODO: real MC colors
+
 -- Save the player from death when holding totem of undying in hand
 mcl_damage.register_modifier(function(obj, damage, reason)
 	if obj:is_player() then
@@ -14,7 +16,7 @@ mcl_damage.register_modifier(function(obj, damage, reason)
 				local ppos = obj:get_pos()
 				local pnname = minetest.get_node(ppos).name
 				-- Some exceptions when _not_ to save the player
-				for n=1, #mobs_mc.misc.totem_fail_nodes do
+				for n = 1, #mobs_mc.misc.totem_fail_nodes do
 					if pnname == mobs_mc.misc.totem_fail_nodes[n] then
 						return
 					end
@@ -30,16 +32,41 @@ mcl_damage.register_modifier(function(obj, damage, reason)
 				end
 
 				-- Effects
-				minetest.sound_play({name = "mcl_totems_totem", gain=1}, {pos=ppos, max_hear_distance=16}, true)
+				minetest.sound_play({name = "mcl_totems_totem", gain = 1}, {pos=ppos, max_hear_distance = 16}, true)
+				
+				for i = 1, 4 do
+					for c = 1, #particle_colors do
+						minetest.add_particlespawner({
+    							amount = math.floor(100 / (4 * #particle_colors)),
+    							time = 1,
+    							minpos = vector.offset(ppos, 0, -1, 0),
+    							maxpos = vector.offset(ppos, 0, 1, 0),
+    							minvel = vector.new(-1.5, 0, -1.5),
+    							maxvel = vector.new(1.5, 1.5, 1.5),
+    							minacc = vector.new(0, -0.1, 0),
+    							maxacc = vector.new(0, -1, 0),
+    							minexptime = 1,
+    							maxexptime = 3,
+    							minsize = 1,
+    							maxsize = 2,
+    							collisiondetection = true,
+    							collision_removal = true,
+    							object_collision = false,
+    							vertical = false,
+    							texture = "mcl_particles_totem" .. i .. ".png^[colorize:#" .. particle_colors[c],
+    							glow = 10,
+    						})
+					end
+				end
 
 				-- Big totem overlay
 				if not hud_totem[obj] then
 					hud_totem[obj] = obj:hud_add({
 						hud_elem_type = "image",
 						text = "mcl_totems_totem.png",
-						position = { x=0.5, y=1 },
-						scale = { x=17, y=17 },
-						offset = { x=0, y=-178 },
+						position = {x = 0.5, y = 1},
+						scale = {x = 17, y = 17},
+						offset = {x = 0, y = -178},
 						z_index = 100,
 					})
 					minetest.after(3, function()