Merge remote-tracking branch 'upstream/master'

3d_armor/README.md

@@ -53,6 +53,7 @@ Change the following default settings by going to Main Menu>>Settings(Tab)>>All
     armor_material_gold = true
     armor_material_mithril = true
     armor_material_crystal = true
+    armor_material_nether = true
 
 ### Initialization glitches when a player first joins
  **Increase to prevent glitches**

3d_armor/api.lua

@@ -132,6 +132,7 @@ armor = {
 		gold = "default:gold_ingot",
 		mithril = "moreores:mithril_ingot",
 		crystal = "ethereal:crystal_ingot",
+		nether = "nether:nether_ingot",
 	},
 	fire_nodes = {
 		{"nether:lava_source",      5, 8},
@@ -176,6 +177,7 @@ armor.config = {
 	material_gold = true,
 	material_mithril = true,
 	material_crystal = true,
+	material_nether = true,
 	set_elements = "head torso legs feet shield",
 	set_multiplier = 1.1,
 	water_protect = true,

3d_armor/armor.conf.example

@@ -15,6 +15,7 @@ ARMOR_MATERIALS = {
 	gold = "default:gold_ingot",
 	mithril = "moreores:mithril_ingot",
 	crystal = "ethereal:crystal_ingot",
+	nether = "nether:nether_ingot",
 }
 
 -- Enable fire protection (defaults true if using ethereal mod)

3d_armor/armor.lua

@@ -868,6 +868,92 @@ if armor.materials.crystal then
 end
 
 
+--- Nether
+--
+--  Requires `armor_material_nether`.
+--
+--  @section nether
+
+if armor.materials.nether then
+	--- Nether Helmet
+	--
+	--  @helmet 3d_armor:helmet_nether
+	--  @img 3d_armor_inv_helmet_nether.png
+	--  @grp armor_head 1
+	--  @grp armor_heal 14
+	--  @grp armor_use 200
+	--  @grp armor_fire 1
+	--  @armorgrp fleshy 18
+	--  @damagegrp cracky 3
+	--  @damagegrp snappy 2
+	--  @damagegrp level 3
+	armor:register_armor("3d_armor:helmet_nether", {
+		description = S("Nether Helmet"),
+		inventory_image = "3d_armor_inv_helmet_nether.png",
+		groups = {armor_head=1, armor_heal=14, armor_use=100, armor_fire=1},
+		armor_groups = {fleshy=18},
+		damage_groups = {cracky=3, snappy=2, level=3},
+	})
+	--- Nether Chestplate
+	--
+	--  @chestplate 3d_armor:chestplate_nether
+	--  @img 3d_armor_inv_chestplate_nether.png
+	--  @grp armor_torso 1
+	--  @grp armor_heal 14
+	--  @grp armor_use 200
+	--  @grp armor_fire 1
+	--  @armorgrp fleshy 25
+	--  @damagegrp cracky 3
+	--  @damagegrp snappy 2
+	--  @damagegrp level 3
+	armor:register_armor("3d_armor:chestplate_nether", {
+		description = S("Nether Chestplate"),
+		inventory_image = "3d_armor_inv_chestplate_nether.png",
+		groups = {armor_torso=1, armor_heal=14, armor_use=200, armor_fire=1},
+		armor_groups = {fleshy=25},
+		damage_groups = {cracky=3, snappy=2, level=3},
+	})
+	--- Nether Leggings
+	--
+	--  @leggings 3d_armor:leggings_nether
+	--  @img 3d_armor_inv_leggings_nether.png
+	--  @grp armor_legs 1
+	--  @grp armor_heal 14
+	--  @grp armor_use 200
+	--  @grp armor_fire 1
+	--  @armorgrp fleshy 25
+	--  @damagegrp cracky 3
+	--  @damagegrp snappy 2
+	--  @damagegrp level 3
+	armor:register_armor("3d_armor:leggings_nether", {
+		description = S("Nether Leggings"),
+		inventory_image = "3d_armor_inv_leggings_nether.png",
+		groups = {armor_legs=1, armor_heal=14, armor_use=200, armor_fire=1},
+		armor_groups = {fleshy=25},
+		damage_groups = {cracky=3, snappy=2, level=3},
+	})
+	--- Nether Boots
+	--
+	--  @boots 3d_armor:boots_nether
+	--  @img 3d_armor_inv_boots_nether.png
+	--  @grp armor_feet 1
+	--  @grp armor_heal 14
+	--  @grp armor_use 200
+	--  @grp armor_fire 1
+	--  @armorgrp fleshy 18
+	--  @damagegrp cracky 3
+	--  @damagegrp snappy 2
+	--  @damagegrp level 3
+	armor:register_armor("3d_armor:boots_nether", {
+		description = S("Nether Boots"),
+		inventory_image = "3d_armor_inv_boots_nether.png",
+		groups = {armor_feet=1, armor_heal=14, armor_use=200, armor_fire=1},
+		armor_groups = {fleshy=18},
+		damage_groups = {cracky=3, snappy=2, level=3},
+	})
+end
+
+
 --- Crafting
 --
 --  @section craft
@@ -886,6 +972,7 @@ end
 --    - gold:    default:gold_ingot
 --    - mithril: moreores:mithril_ingot
 --    - crystal: ethereal:crystal_ingot
+--    - nether:  nether:nether_ingot
 --
 --  helmet:        chestplate:    leggings:
 --  ┌───┬───┬───┐  ┌───┬───┬───┐  ┌───┬───┬───┐

3d_armor/crafting_guide.txt

@@ -19,6 +19,7 @@ Helmets:
 [3d_armor:helmet_gold] X = [default:gold_ingot]
 [3d_armor:helmet_mithril] X = [moreores:mithril_ingot] *
 [3d_armor:helmet_crystal] X = [ethereal:crystal_ingot] **
+[3d_armor:helmet_nether] X = [ethereal:nether_ingot] **
 
 Chestplates:
 
@@ -38,6 +39,7 @@ Chestplates:
 [3d_armor:chestplate_gold] X = [default:gold_ingot]
 [3d_armor:chestplate_mithril] X = [moreores:mithril_ingot] *
 [3d_armor:chestplate_crystal] X = [ethereal:crystal_ingot] **
+[3d_armor:chestplate_nether] X = [ethereal:nether_ingot] **
 
 Leggings:
 
@@ -57,6 +59,7 @@ Leggings:
 [3d_armor:leggings_gold] X = [default:gold_ingot]
 [3d_armor:leggings_mithril] X = [moreores:mithril_ingot] *
 [3d_armor:leggings_crystal] X = [ethereal:crystal_ingot] **
+[3d_armor:leggings_nether] X = [ethereal:nether_ingot] **
 
 Boots:
 
@@ -74,6 +77,8 @@ Boots:
 [3d_armor:boots_gold] X = [default:gold_ingot]
 [3d_armor:boots_mithril] X = [moreores:mithril_ingot] *
 [3d_armor:boots_crystal] X = [ethereal:crystal_ingot] **
+[3d_armor:boots_nether] X = [ethereal:nether_ingot] **
 
  * Requires moreores mod by Calinou - https://forum.minetest.net/viewtopic.php?id=549
 ** Requires ethereal mod by Chinchow & TenPlus1 - https://github.com/tenplus1/ethereal
+** Requires nether mod - https://github.com/minetest-mods/nether.git

3d_armor/depends.txt

@@ -6,3 +6,4 @@ fire?
 ethereal?
 bakedclay?
 moreores?
+nether?

3d_armor/init.lua

@@ -105,6 +105,9 @@ end
 if not minetest.get_modpath("ethereal") then
 	armor.materials.crystal = nil
 end
+if not minetest.get_modpath("nether") then
+	armor.materials.nether = nil
+end
 
 dofile(modpath.."/armor.lua")
 

3d_armor/locale/3d_armor.de.tr

@@ -0,0 +1,62 @@
+# textdomain: 3d_armor
+
+
+### api.lua ###
+
+3d_armor: Detached armor inventory is nil @1=3d_armor : Abgetrennter Rüstungsbestand ist nicht gesetzt: @1
+3d_armor: Player name is nil @1=3d_armor : Spielername ist nicht gesetzt: @1
+3d_armor: Player reference is nil @1=3d_armor : Spielerreferenz ist nicht gesetzt: @1
+
+### armor.lua ###
+
+Admin Boots=Adminstiefel
+Admin Chestplate=Adminbrustplatte
+Admin Helmet=Adminhelm
+Admin Leggings=Adminhose
+Bronze Boots=Bronzestiefel
+Bronze Chestplate=Bronzebrustplatte
+Bronze Helmet=Bronzehelm
+Bronze Leggings=Bronzehose
+Cactus Boots=Kaktusstiefel
+Cactus Chestplate=Kaktusbrustplatte
+Cactus Helmet=Kaktushelm
+Cactus Leggings=Kaktushose
+Crystal Boots=Kristallstiefel
+Crystal Chestplate=Kristallbrustplatte
+Crystal Helmet=Kristallhelm
+Crystal Leggings=Kristallhose
+Nether Boots=Netherstiefel
+Nether Chestplate=Netherbrustplatte
+Nether Helmet=Netherhelm
+Nether Leggings=Netherhose
+Diamond Boots=Diamantstiefel
+Diamond Chestplate=Diamantbrustplatte
+Diamond Helmet=Diamanthelm
+Diamond Leggings=Diamanthose
+Gold Boots=Goldstiefel
+Gold Chestplate=Goldbrustplatte
+Gold Helmet=Goldhelm
+Gold Leggings=Goldhose
+Mithril Boots=Mithrilstiefel
+Mithril Chestplate=Mithrilbrustplatte
+Mithril Helmet=Mithrilhelm
+Mithril Leggings=Mithrilhose
+Steel Boots=Stahlstiefel
+Steel Chestplate=Stahlbrustplatte
+Steel Helmet=Stahlhelm
+Steel Leggings=Stahlhose
+Wood Boots=Holzstiefel
+Wood Chestplate=Holzbrustplatte
+Wood Helmet=Holzhelm
+Wood Leggings=Holzhose
+
+### init.lua ###
+
+3d_armor: Failed to initialize player=3d_armor : Initialisierung des Spielers fehlgeschlagen
+Fire=Feuer
+Heal=Heilen
+Level=Stufe
+Radiation=Strahlen
+Your @1 got destroyed!=Deine @1 wurde zerstört!
+Your @1 is almost broken!=Deine @1 ist fast kaputt!
+[3d_armor] Fire Nodes disabled=[3d_armor] Feuer-Knoten deaktiviert

3d_armor/locale/3d_armor.es.tr

@@ -25,6 +25,10 @@ Crystal Boots=Botas de cristal
 Crystal Chestplate=Peto de cristal
 Crystal Helmet=Casco de cristal
 Crystal Leggings=Grebas de cristal
+Nether Boots=Botas de nether
+Nether Chestplate=Peto de nether
+Nether Helmet=Casco de nether
+Nether Leggings=Grebas de nether
 Diamond Boots=Botas de diamante
 Diamond Chestplate=Peto de diamante
 Diamond Helmet=Casco de diamante

3d_armor/locale/3d_armor.fr.tr

@@ -25,6 +25,10 @@ Crystal Boots=Bottes en cristal
 Crystal Chestplate=Cuirasse en cristal
 Crystal Helmet=Casque en cristal
 Crystal Leggings=Jambières en cristal
+Nether Boots=Bottes en nether
+Nether Chestplate=Cuirasse en nether
+Nether Helmet=Casque en nether
+Nether Leggings=Jambières en nether
 Diamond Boots=Bottes en diamant
 Diamond Chestplate=Cuirasse en diamant
 Diamond Helmet=Casque en diamant

3d_armor/locale/3d_armor.it.tr

@@ -25,6 +25,10 @@ Crystal Boots=Stivali di cristallo
 Crystal Chestplate=Corazza di cristallo
 Crystal Helmet=Elmo di cristallo
 Crystal Leggings=Gambali di cristallo
+Nether Boots=Stivali di nether
+Nether Chestplate=Corazza di nether
+Nether Helmet=Elmo di nether
+Nether Leggings=Gambali di nether
 Diamond Boots=Stivali di diamante
 Diamond Chestplate=Corazza di diamante
 Diamond Helmet=Elmo di diamante
@@ -83,3 +87,4 @@ Diamond Shield=Scudo di diamante
 Gold Shield=Scudo d'oro
 Mithril Shield=Scudo di mithril
 Crystal Shield=Scudo di cristallo
+Nether Shield=Scudo di nether

3d_armor/locale/3d_armor.ms.tr

@@ -25,6 +25,10 @@ Crystal Boots=But Kristal
 Crystal Chestplate=Perisai Dada Kristal
 Crystal Helmet=Helmet Kristal
 Crystal Leggings=Perisai Kaki Kristal
+Nether Boots=But Nether
+Nether Chestplate=Perisai Dada Nether
+Nether Helmet=Helmet Nether
+Nether Leggings=Perisai Kaki Nether
 Diamond Boots=But Intan
 Diamond Chestplate=Perisai Dada Intan
 Diamond Helmet=Helmet Intan
@@ -83,3 +87,4 @@ Diamond Shield=Perisai Pegang Intan
 Gold Shield=Perisai Pegang Emas
 Mithril Shield=Perisai Pegang Mithril
 Crystal Shield=Perisai Pegang Kristal
+Nether Shield=Perisai Pegang Nether

3d_armor/locale/3d_armor.pt.tr

@@ -25,6 +25,10 @@ Crystal Boots=Botas de Cristal
 Crystal Chestplate=Peitoral de Cristal
 Crystal Helmet=Capacete de Cristal
 Crystal Leggings=Calças de Cristal
+Nether Boots=Botas de Nether
+Nether Chestplate=Peitoral de Nether
+Nether Helmet=Capacete de Nether
+Nether Leggings=Calças de Nether
 Diamond Boots=Botas de Diamante
 Diamond Chestplate=Peitoral de Diamante
 Diamond Helmet=Capacete de Diamante
@@ -83,3 +87,4 @@ Diamond Shield=Escudo de Diamante
 Gold Shield=Escudo de Ouro
 Mithril Shield=Escudo de Mithril
 Crystal Shield=Escudo de Cristal
+Nether Shield=Escudo de Nether

3d_armor/locale/3d_armor.pt_BR.tr

@@ -25,6 +25,10 @@ Crystal Boots=Botas de Cristal
 Crystal Chestplate=Peitoral de Cristal
 Crystal Helmet=Capacete de Cristal
 Crystal Leggings=Calças de Cristal
+Nether Boots=Botas de Nether
+Nether Chestplate=Peitoral de Nether
+Nether Helmet=Capacete de Nether
+Nether Leggings=Calças de Nether
 Diamond Boots=Botas de Diamante
 Diamond Chestplate=Peitoral de Diamante
 Diamond Helmet=Capacete de Diamante
@@ -83,3 +87,4 @@ Diamond Shield=Escudo de Diamante
 Gold Shield=Escudo de Ouro
 Mithril Shield=Escudo de Mithril
 Crystal Shield=Escudo de Cristal
+Nether Shield=Escudo de Nether

3d_armor/locale/template.txt

@@ -25,6 +25,10 @@ Crystal Boots=
 Crystal Chestplate=
 Crystal Helmet=
 Crystal Leggings=
+Nether Boots=
+Nether Chestplate=
+Nether Helmet=
+Nether Leggings=
 Diamond Boots=
 Diamond Chestplate=
 Diamond Helmet=

3d_armor/mod.conf

@@ -1,4 +1,4 @@
 name = 3d_armor
 depends = default
-optional_depends = player_monoids, armor_monoid, pova, fire, ethereal, bakedclay, moreores
+optional_depends = player_monoids, armor_monoid, pova, fire, ethereal, bakedclay, moreores, nether
 description = Adds craftable armor that is visible to other players.

3d_armor/textures/preview_index.txt

@@ -38,6 +38,11 @@
 3d_armor/textures/3d_armor_leggings_crystal.png:legs
 3d_armor/textures/3d_armor_boots_crystal.png:feet
 
+3d_armor/textures/3d_armor_helmet_nether.png:head
+3d_armor/textures/3d_armor_chestplate_nether.png:torso
+3d_armor/textures/3d_armor_leggings_nether.png:legs
+3d_armor/textures/3d_armor_boots_nether.png:feet
+
 3d_armor/textures/3d_armor_helmet_admin.png:head
 3d_armor/textures/3d_armor_chestplate_admin.png:torso
 3d_armor/textures/3d_armor_leggings_admin.png:legs