This is an automated email from the git hooks/post-receive script.
jpuydt-guest pushed a commit to branch master
in repository minetest-mod-3d-armor.
commit e582d403d5fb46424534fce4987a39694a999e4d
Author: Julien Puydt <julien.pu...@laposte.net>
Date: Wed Feb 14 17:11:08 2018 +0100
New upstream version 0.4.11
---
3d_armor/README.txt | 3 +
3d_armor/api.lua | 80 ++++-
3d_armor/init.lua | 32 +-
3d_armor/locale/ms.po | 386 +++++++++++++++++++++
3d_armor_ip/LICENSE.txt | 2 +-
3d_armor_sfinv/LICENSE.txt | 2 +-
3d_armor_stand/LICENSE.txt | 4 +-
3d_armor_stand/init.lua | 16 +-
3d_armor_ui/LICENSE.txt | 2 +-
LICENSE.md | 4 +-
README.md | 25 +-
hazmat_suit/LICENSE.txt | 7 -
hazmat_suit/README.txt | 12 -
hazmat_suit/depends.txt | 2 -
hazmat_suit/description.txt | 1 -
hazmat_suit/init.lua | 105 ------
.../textures/hazmat_suit_inv_boots_hazmat.png | Bin 359 -> 0 bytes
.../textures/hazmat_suit_inv_chestplate_hazmat.png | Bin 334 -> 0 bytes
.../textures/hazmat_suit_inv_helmet_hazmat.png | Bin 409 -> 0 bytes
.../textures/hazmat_suit_inv_leggings_hazmat.png | Bin 355 -> 0 bytes
.../textures/hazmat_suit_inv_sleeve_hazmat.png | Bin 334 -> 0 bytes
.../textures/hazmat_suit_inv_suit_hazmat.png | Bin 383 -> 0 bytes
hazmat_suit/textures/hazmat_suit_suit_hazmat.png | Bin 614 -> 0 bytes
.../textures/hazmat_suit_suit_hazmat_preview.png | Bin 492 -> 0 bytes
hazmat_suit/textures/preview_index.txt | 1 -
shields/LICENSE.txt | 4 +-
technic_armor/LICENSE.txt | 7 -
technic_armor/README.txt | 9 -
technic_armor/depends.txt | 3 -
technic_armor/description.txt | 1 -
technic_armor/init.lua | 66 ----
technic_armor/textures/preview_index.txt | 41 ---
.../textures/technic_armor_boots_brass.png | Bin 528 -> 0 bytes
.../textures/technic_armor_boots_brass_preview.png | Bin 436 -> 0 bytes
.../textures/technic_armor_boots_carbon.png | Bin 432 -> 0 bytes
.../technic_armor_boots_carbon_preview.png | Bin 362 -> 0 bytes
.../textures/technic_armor_boots_cast.png | Bin 528 -> 0 bytes
.../textures/technic_armor_boots_cast_preview.png | Bin 436 -> 0 bytes
.../textures/technic_armor_boots_lead.png | Bin 506 -> 0 bytes
.../textures/technic_armor_boots_lead_preview.png | Bin 405 -> 0 bytes
.../textures/technic_armor_boots_silver.png | Bin 501 -> 0 bytes
.../technic_armor_boots_silver_preview.png | Bin 386 -> 0 bytes
.../textures/technic_armor_boots_stainless.png | Bin 661 -> 0 bytes
.../technic_armor_boots_stainless_preview.png | Bin 399 -> 0 bytes
technic_armor/textures/technic_armor_boots_tin.png | Bin 520 -> 0 bytes
.../textures/technic_armor_boots_tin_preview.png | Bin 436 -> 0 bytes
.../textures/technic_armor_chestplate_brass.png | Bin 723 -> 0 bytes
.../technic_armor_chestplate_brass_preview.png | Bin 553 -> 0 bytes
.../textures/technic_armor_chestplate_carbon.png | Bin 698 -> 0 bytes
.../technic_armor_chestplate_carbon_preview.png | Bin 522 -> 0 bytes
.../textures/technic_armor_chestplate_cast.png | Bin 723 -> 0 bytes
.../technic_armor_chestplate_cast_preview.png | Bin 553 -> 0 bytes
.../textures/technic_armor_chestplate_lead.png | Bin 918 -> 0 bytes
.../technic_armor_chestplate_lead_preview.png | Bin 549 -> 0 bytes
.../textures/technic_armor_chestplate_silver.png | Bin 709 -> 0 bytes
.../technic_armor_chestplate_silver_preview.png | Bin 465 -> 0 bytes
.../technic_armor_chestplate_stainless.png | Bin 867 -> 0 bytes
.../technic_armor_chestplate_stainless_preview.png | Bin 496 -> 0 bytes
.../textures/technic_armor_chestplate_tin.png | Bin 710 -> 0 bytes
.../technic_armor_chestplate_tin_preview.png | Bin 537 -> 0 bytes
.../textures/technic_armor_helmet_brass.png | Bin 693 -> 0 bytes
.../technic_armor_helmet_brass_preview.png | Bin 405 -> 0 bytes
.../textures/technic_armor_helmet_carbon.png | Bin 617 -> 0 bytes
.../technic_armor_helmet_carbon_preview.png | Bin 335 -> 0 bytes
.../textures/technic_armor_helmet_cast.png | Bin 693 -> 0 bytes
.../textures/technic_armor_helmet_cast_preview.png | Bin 405 -> 0 bytes
.../textures/technic_armor_helmet_lead.png | Bin 701 -> 0 bytes
.../textures/technic_armor_helmet_lead_preview.png | Bin 343 -> 0 bytes
.../textures/technic_armor_helmet_silver.png | Bin 647 -> 0 bytes
.../technic_armor_helmet_silver_preview.png | Bin 343 -> 0 bytes
.../textures/technic_armor_helmet_stainless.png | Bin 680 -> 0 bytes
.../technic_armor_helmet_stainless_preview.png | Bin 350 -> 0 bytes
.../textures/technic_armor_helmet_tin.png | Bin 665 -> 0 bytes
.../textures/technic_armor_helmet_tin_preview.png | Bin 401 -> 0 bytes
.../textures/technic_armor_inv_boots_brass.png | Bin 358 -> 0 bytes
.../textures/technic_armor_inv_boots_carbon.png | Bin 360 -> 0 bytes
.../textures/technic_armor_inv_boots_cast.png | Bin 360 -> 0 bytes
.../textures/technic_armor_inv_boots_lead.png | Bin 385 -> 0 bytes
.../textures/technic_armor_inv_boots_silver.png | Bin 358 -> 0 bytes
.../textures/technic_armor_inv_boots_stainless.png | Bin 377 -> 0 bytes
.../textures/technic_armor_inv_boots_tin.png | Bin 358 -> 0 bytes
.../technic_armor_inv_chestplate_brass.png | Bin 374 -> 0 bytes
.../technic_armor_inv_chestplate_carbon.png | Bin 375 -> 0 bytes
.../textures/technic_armor_inv_chestplate_cast.png | Bin 375 -> 0 bytes
.../textures/technic_armor_inv_chestplate_lead.png | Bin 432 -> 0 bytes
.../technic_armor_inv_chestplate_silver.png | Bin 374 -> 0 bytes
.../technic_armor_inv_chestplate_stainless.png | Bin 395 -> 0 bytes
.../textures/technic_armor_inv_chestplate_tin.png | Bin 374 -> 0 bytes
.../textures/technic_armor_inv_helmet_brass.png | Bin 361 -> 0 bytes
.../textures/technic_armor_inv_helmet_carbon.png | Bin 363 -> 0 bytes
.../textures/technic_armor_inv_helmet_cast.png | Bin 363 -> 0 bytes
.../textures/technic_armor_inv_helmet_lead.png | Bin 395 -> 0 bytes
.../textures/technic_armor_inv_helmet_silver.png | Bin 361 -> 0 bytes
.../technic_armor_inv_helmet_stainless.png | Bin 375 -> 0 bytes
.../textures/technic_armor_inv_helmet_tin.png | Bin 361 -> 0 bytes
.../textures/technic_armor_inv_leggings_brass.png | Bin 355 -> 0 bytes
.../textures/technic_armor_inv_leggings_carbon.png | Bin 359 -> 0 bytes
.../textures/technic_armor_inv_leggings_cast.png | Bin 359 -> 0 bytes
.../textures/technic_armor_inv_leggings_lead.png | Bin 398 -> 0 bytes
.../textures/technic_armor_inv_leggings_silver.png | Bin 355 -> 0 bytes
.../technic_armor_inv_leggings_stainless.png | Bin 377 -> 0 bytes
.../textures/technic_armor_inv_leggings_tin.png | Bin 355 -> 0 bytes
.../textures/technic_armor_inv_shield_brass.png | Bin 693 -> 0 bytes
.../textures/technic_armor_inv_shield_carbon.png | Bin 732 -> 0 bytes
.../textures/technic_armor_inv_shield_cast.png | Bin 706 -> 0 bytes
.../textures/technic_armor_inv_shield_lead.png | Bin 827 -> 0 bytes
.../textures/technic_armor_inv_shield_silver.png | Bin 743 -> 0 bytes
.../technic_armor_inv_shield_stainless.png | Bin 752 -> 0 bytes
.../textures/technic_armor_inv_shield_tin.png | Bin 684 -> 0 bytes
.../textures/technic_armor_leggings_brass.png | Bin 539 -> 0 bytes
.../technic_armor_leggings_brass_preview.png | Bin 451 -> 0 bytes
.../textures/technic_armor_leggings_carbon.png | Bin 449 -> 0 bytes
.../technic_armor_leggings_carbon_preview.png | Bin 365 -> 0 bytes
.../textures/technic_armor_leggings_cast.png | Bin 539 -> 0 bytes
.../technic_armor_leggings_cast_preview.png | Bin 451 -> 0 bytes
.../textures/technic_armor_leggings_lead.png | Bin 528 -> 0 bytes
.../technic_armor_leggings_lead_preview.png | Bin 440 -> 0 bytes
.../textures/technic_armor_leggings_silver.png | Bin 514 -> 0 bytes
.../technic_armor_leggings_silver_preview.png | Bin 391 -> 0 bytes
.../textures/technic_armor_leggings_stainless.png | Bin 534 -> 0 bytes
.../technic_armor_leggings_stainless_preview.png | Bin 406 -> 0 bytes
.../textures/technic_armor_leggings_tin.png | Bin 531 -> 0 bytes
.../technic_armor_leggings_tin_preview.png | Bin 451 -> 0 bytes
.../textures/technic_armor_shield_brass.png | Bin 705 -> 0 bytes
.../technic_armor_shield_brass_preview.png | Bin 695 -> 0 bytes
.../textures/technic_armor_shield_carbon.png | Bin 745 -> 0 bytes
.../technic_armor_shield_carbon_preview.png | Bin 734 -> 0 bytes
.../textures/technic_armor_shield_cast.png | Bin 720 -> 0 bytes
.../textures/technic_armor_shield_cast_preview.png | Bin 698 -> 0 bytes
.../textures/technic_armor_shield_lead.png | Bin 849 -> 0 bytes
.../textures/technic_armor_shield_lead_preview.png | Bin 842 -> 0 bytes
.../textures/technic_armor_shield_silver.png | Bin 756 -> 0 bytes
.../technic_armor_shield_silver_preview.png | Bin 734 -> 0 bytes
.../textures/technic_armor_shield_stainless.png | Bin 765 -> 0 bytes
.../technic_armor_shield_stainless_preview.png | Bin 759 -> 0 bytes
.../textures/technic_armor_shield_tin.png | Bin 697 -> 0 bytes
.../textures/technic_armor_shield_tin_preview.png | Bin 679 -> 0 bytes
wieldview/LICENSE.txt | 2 +-
138 files changed, 499 insertions(+), 318 deletions(-)
diff --git a/3d_armor/README.txt b/3d_armor/README.txt
index db445be..a0cb3b1 100644
--- a/3d_armor/README.txt
+++ b/3d_armor/README.txt
@@ -68,6 +68,9 @@ armor_fire_protect = false
-- Enable punch damage effects.
armor_punch_damage = true
+-- Enable migration of old armor inventories
+armor_migrate_old_inventory = true
+
API
---
diff --git a/3d_armor/api.lua b/3d_armor/api.lua
index c0b5d83..540f007 100644
--- a/3d_armor/api.lua
+++ b/3d_armor/api.lua
@@ -72,7 +72,8 @@ armor = {
on_damage = {},
on_destroy = {},
},
- version = "0.4.10",
+ migrate_old_inventory = true,
+ version = "0.4.11",
}
armor.config = {
@@ -174,7 +175,7 @@ armor.update_player_visuals = function(self, player)
end
armor.set_player_armor = function(self, player)
- local name, player_inv = self:get_valid_player(player,
"[set_player_armor]")
+ local name, armor_inv = self:get_valid_player(player,
"[set_player_armor]")
if not name then
return
end
@@ -199,7 +200,7 @@ armor.set_player_armor = function(self, player)
change[group] = 1
levels[group] = 0
end
- local list = player_inv:get_list("armor")
+ local list = armor_inv:get_list("armor")
if type(list) ~= "table" then
return
end
@@ -218,6 +219,7 @@ armor.set_player_armor = function(self, player)
local level =
def.groups["armor_"..element]
levels["fleshy"] =
levels["fleshy"] + level
end
+ break
end
-- DEPRECATED, use armor_groups instead
if def.groups["armor_radiation"] and
levels["radiation"] then
@@ -296,7 +298,7 @@ armor.set_player_armor = function(self, player)
end
armor.punch = function(self, player, hitter, time_from_last_punch,
tool_capabilities)
- local name, player_inv = self:get_valid_player(player, "[punch]")
+ local name, armor_inv = self:get_valid_player(player, "[punch]")
if not name then
return
end
@@ -304,7 +306,7 @@ armor.punch = function(self, player, hitter,
time_from_last_punch, tool_capabili
local count = 0
local recip = true
local default_groups = {cracky=3, snappy=3, choppy=3, crumbly=3,
level=1}
- local list = player_inv:get_list("armor")
+ local list = armor_inv:get_list("armor")
for i, stack in pairs(list) do
if stack:get_count() == 1 then
local name = stack:get_name()
@@ -419,12 +421,64 @@ armor.get_armor_formspec = function(self, name, listring)
for _, attr in pairs(self.attributes) do
formspec = formspec:gsub("armor_attr_"..attr,
armor.def[name][attr])
end
- for _, group in pairs(self.attributes) do
- formspec = formspec:gsub("armor_group_"..group,
armor.def[name][group])
+ for group, _ in pairs(self.registered_groups) do
+ formspec = formspec:gsub("armor_group_"..group,
+ armor.def[name].groups[group])
end
return formspec
end
+armor.serialize_inventory_list = function(self, list)
+ local list_table = {}
+ for _, stack in ipairs(list) do
+ table.insert(list_table, stack:to_string())
+ end
+ return minetest.serialize(list_table)
+end
+
+armor.deserialize_inventory_list = function(self, list_string)
+ local list_table = minetest.deserialize(list_string)
+ local list = {}
+ for _, stack in ipairs(list_table or {}) do
+ table.insert(list, ItemStack(stack))
+ end
+ return list
+end
+
+armor.load_armor_inventory = function(self, player)
+ local msg = "[load_armor_inventory]"
+ local name = player:get_player_name()
+ if not name then
+ minetest.log("warning", S("3d_armor: Player name is nil @1",
msg))
+ return
+ end
+ local armor_inv = minetest.get_inventory({type="detached",
name=name.."_armor"})
+ if not armor_inv then
+ minetest.log("warning", S("3d_armor: Detached armor inventory
is nil @1", msg))
+ return
+ end
+ local armor_list_string = player:get_attribute("3d_armor_inventory")
+ if armor_list_string then
+ armor_inv:set_list("armor",
self:deserialize_inventory_list(armor_list_string))
+ return true
+ end
+end
+
+armor.save_armor_inventory = function(self, player)
+ local msg = "[save_armor_inventory]"
+ local name = player:get_player_name()
+ if not name then
+ minetest.log("warning", S("3d_armor: Player name is nil @1",
msg))
+ return
+ end
+ local armor_inv = minetest.get_inventory({type="detached",
name=name.."_armor"})
+ if not armor_inv then
+ minetest.log("warning", S("3d_armor: Detached armor inventory
is nil @1", msg))
+ return
+ end
+ player:set_attribute("3d_armor_inventory",
self:serialize_inventory_list(armor_inv:get_list("armor")))
+end
+
armor.update_inventory = function(self, player)
-- DEPRECATED: Legacy inventory support
end
@@ -436,17 +490,13 @@ armor.set_inventory_stack = function(self, player, i,
stack)
minetest.log("warning", S("3d_armor: Player name is nil @1",
msg))
return
end
- local player_inv = player:get_inventory()
local armor_inv = minetest.get_inventory({type="detached",
name=name.."_armor"})
- if not player_inv then
- minetest.log("warning", S("3d_armor: Player inventory is nil
@1", msg))
- return
- elseif not armor_inv then
+ if not armor_inv then
minetest.log("warning", S("3d_armor: Detached armor inventory
is nil @1", msg))
return
end
- player_inv:set_stack("armor", i, stack)
armor_inv:set_stack("armor", i, stack)
+ self:save_armor_inventory(player)
end
armor.get_valid_player = function(self, player, msg)
@@ -460,9 +510,9 @@ armor.get_valid_player = function(self, player, msg)
minetest.log("warning", S("3d_armor: Player name is nil @1",
msg))
return
end
- local inv = player:get_inventory()
+ local inv = minetest.get_inventory({type="detached",
name=name.."_armor"})
if not inv then
- minetest.log("warning", S("3d_armor: Player inventory is nil
@1", msg))
+ minetest.log("warning", S("3d_armor: Detached armor inventory
is nil @1", msg))
return
end
return name, inv
diff --git a/3d_armor/init.lua b/3d_armor/init.lua
index 1a0651a..3e88e9d 100644
--- a/3d_armor/init.lua
+++ b/3d_armor/init.lua
@@ -111,27 +111,23 @@ end)
local function init_player_armor(player)
local name = player:get_player_name()
- local player_inv = player:get_inventory()
local pos = player:getpos()
- if not name or not player_inv or not pos then
+ if not name or not pos then
return false
end
local armor_inv = minetest.create_detached_inventory(name.."_armor", {
on_put = function(inv, listname, index, stack, player)
- player:get_inventory():set_stack(listname, index, stack)
+ armor:save_armor_inventory(player)
armor:run_callbacks("on_equip", player, index, stack)
armor:set_player_armor(player)
end,
on_take = function(inv, listname, index, stack, player)
- player:get_inventory():set_stack(listname, index, nil)
+ armor:save_armor_inventory(player)
armor:run_callbacks("on_unequip", player, index, stack)
armor:set_player_armor(player)
end,
on_move = function(inv, from_list, from_index, to_list,
to_index, count, player)
- local plaver_inv = player:get_inventory()
- local stack = inv:get_stack(to_list, to_index)
- player_inv:set_stack(to_list, to_index, stack)
- player_inv:set_stack(from_list, from_index, nil)
+ armor:save_armor_inventory(player)
armor:set_player_armor(player)
end,
allow_put = function(inv, listname, index, stack, player)
@@ -158,10 +154,18 @@ local function init_player_armor(player)
end,
}, name)
armor_inv:set_size("armor", 6)
- player_inv:set_size("armor", 6)
+ if not armor:load_armor_inventory(player) and
armor.migrate_old_inventory then
+ local player_inv = player:get_inventory()
+ player_inv:set_size("armor", 6)
+ for i=1, 6 do
+ local stack = player_inv:get_stack("armor", i)
+ armor_inv:set_stack("armor", i, stack)
+ end
+ armor:save_armor_inventory(player)
+ player_inv:set_size("armor", 0)
+ end
for i=1, 6 do
- local stack = player_inv:get_stack("armor", i)
- armor_inv:set_stack("armor", i, stack)
+ local stack = armor_inv:get_stack("armor", i)
armor:run_callbacks("on_equip", player, i, stack)
end
armor.def[name] = {
@@ -256,13 +260,13 @@ end)
if armor.config.drop == true or armor.config.destroy == true then
minetest.register_on_dieplayer(function(player)
- local name, player_inv = armor:get_valid_player(player,
"[on_dieplayer]")
+ local name, armor_inv = armor:get_valid_player(player,
"[on_dieplayer]")
if not name then
return
end
local drop = {}
- for i=1, player_inv:get_size("armor") do
- local stack = player_inv:get_stack("armor", i)
+ for i=1, armor_inv:get_size("armor") do
+ local stack = armor_inv:get_stack("armor", i)
if stack:get_count() > 0 then
table.insert(drop, stack)
armor:set_inventory_stack(player, i, nil)
diff --git a/3d_armor/locale/ms.po b/3d_armor/locale/ms.po
new file mode 100644
index 0000000..c86546f
--- /dev/null
+++ b/3d_armor/locale/ms.po
@@ -0,0 +1,386 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-08-06 18:20+0200\n"
+"PO-Revision-Date: 2018-02-07 13:25+0800\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.0.6\n"
+"Last-Translator: MuhdNurHidayat (MNH48) <mnh48m...@gmail.com>\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: ms\n"
+
+#: ../3d_armor/api.lua
+msgid "3d_armor: Player name is nil @1"
+msgstr "3d_armor: Nama pemain tiada nilai @1"
+
+#: ../3d_armor/api.lua
+msgid "3d_armor: Player inventory is nil @1"
+msgstr "3d_armor: Inventori pemain tiada nilai @1"
+
+#: ../3d_armor/api.lua
+msgid "3d_armor: Detached armor inventory is nil @1"
+msgstr "3d_armor: Inventori perisai terpisah tiada nilai @1"
+
+#: ../3d_armor/api.lua
+msgid "3d_armor: Player reference is nil @1"
+msgstr "3d_armor: Rujukan pemain tiada nilai @1"
+
+#: ../3d_armor/armor.lua
+msgid "Admin Helmet"
+msgstr "Helmet Pentadbir"
+
+#: ../3d_armor/armor.lua
+msgid "Admin Chestplate"
+msgstr "Perisai Dada Pentadbir"
+
+#: ../3d_armor/armor.lua
+msgid "Admin Leggings"
+msgstr "Perisai Kaki Pentadbir"
+
+#: ../3d_armor/armor.lua
+msgid "Admin Boots"
+msgstr "But Pentadbir"
+
+#: ../3d_armor/armor.lua
+msgid "Wood Helmet"
+msgstr "Helmet Kayu"
+
+#: ../3d_armor/armor.lua
+msgid "Wood Chestplate"
+msgstr "Perisai Dada Kayu"
+
+#: ../3d_armor/armor.lua
+msgid "Wood Leggings"
+msgstr "Perisai Kaki Kayu"
+
+#: ../3d_armor/armor.lua
+msgid "Wood Boots"
+msgstr "But Kayu"
+
+#: ../3d_armor/armor.lua
+msgid "Cactus Helmet"
+msgstr "Helmet Kaktus"
+
+#: ../3d_armor/armor.lua
+msgid "Cactus Chestplate"
+msgstr "Perisai Dada Kaktus"
+
+#: ../3d_armor/armor.lua
+msgid "Cactus Leggings"
+msgstr "Perisai Kaki Kaktus"
+
+#: ../3d_armor/armor.lua
+msgid "Cactus Boots"
+msgstr "But Kaktus"
+
+#: ../3d_armor/armor.lua
+msgid "Steel Helmet"
+msgstr "Helmet Keluli"
+
+#: ../3d_armor/armor.lua
+msgid "Steel Chestplate"
+msgstr "Perisai Dada Keluli"
+
+#: ../3d_armor/armor.lua
+msgid "Steel Leggings"
+msgstr "Perisai Kaki Keluli"
+
+#: ../3d_armor/armor.lua
+msgid "Steel Boots"
+msgstr "But Keluli"
+
+#: ../3d_armor/armor.lua
+msgid "Bronze Helmet"
+msgstr "Helmet Gangsa"
+
+#: ../3d_armor/armor.lua
+msgid "Bronze Chestplate"
+msgstr "Perisai Dada Gangsa"
+
+#: ../3d_armor/armor.lua
+msgid "Bronze Leggings"
+msgstr "Perisai Kaki Gangsa"
+
+#: ../3d_armor/armor.lua
+msgid "Bronze Boots"
+msgstr "But Gangsa"
+
+# 'Diamond' should be translated as 'intan' because the more common word
'berlian' is only specifically used for the gemstone diamond.
+#: ../3d_armor/armor.lua
+msgid "Diamond Helmet"
+msgstr "Helmet Intan"
+
+#: ../3d_armor/armor.lua
+msgid "Diamond Chestplate"
+msgstr "Perisai Dada Intan"
+
+#: ../3d_armor/armor.lua
+msgid "Diamond Leggings"
+msgstr "Perisai Kaki Intan"
+
+#: ../3d_armor/armor.lua
+msgid "Diamond Boots"
+msgstr "But Intan"
+
+#: ../3d_armor/armor.lua
+msgid "Gold Helmet"
+msgstr "Helmet Emas"
+
+#: ../3d_armor/armor.lua
+msgid "Gold Chestplate"
+msgstr "Perisai Dada Emas"
+
+#: ../3d_armor/armor.lua
+msgid "Gold Leggings"
+msgstr "Perisai Kaki Emas"
+
+#: ../3d_armor/armor.lua
+msgid "Gold Boots"
+msgstr "But Emas"
+
+#: ../3d_armor/armor.lua
+msgid "Mithril Helmet"
+msgstr "Helmet Mithril"
+
+#: ../3d_armor/armor.lua
+msgid "Mithril Chestplate"
+msgstr "Perisai Dada Mithril"
+
+#: ../3d_armor/armor.lua
+msgid "Mithril Leggings"
+msgstr "Perisai Kaki Mithril"
+
+#: ../3d_armor/armor.lua
+msgid "Mithril Boots"
+msgstr "But Mithril"
+
+#: ../3d_armor/armor.lua
+msgid "Crystal Helmet"
+msgstr "Helmet Kristal"
+
+#: ../3d_armor/armor.lua
+msgid "Crystal Chestplate"
+msgstr "Perisai Dada Kristal"
+
+#: ../3d_armor/armor.lua
+msgid "Crystal Leggings"
+msgstr "Perisai Kaki Kristal"
+
+#: ../3d_armor/armor.lua
+msgid "Crystal Boots"
+msgstr "But Kristal"
+
+#: ../3d_armor/init.lua ../3d_armor_ui/init.lua
+msgid "Radiation"
+msgstr "Radiasi"
+
+#: ../3d_armor/init.lua ../3d_armor_ui/init.lua
+msgid "Level"
+msgstr "Tahap"
+
+#: ../3d_armor/init.lua ../3d_armor_ui/init.lua
+msgid "Heal"
+msgstr "Pulih"
+
+#: ../3d_armor/init.lua ../3d_armor_ui/init.lua
+msgid "Fire"
+msgstr "Api"
+
+#: ../3d_armor/init.lua
+msgid "Your @1 got destroyed!"
+msgstr "@1 anda telah musnah!"
+
+#: ../3d_armor/init.lua
+msgid "3d_armor: Failed to initialize player"
+msgstr "3d_armor: Gagal mengasalkan pemain"
+
+#: ../3d_armor/init.lua
+msgid "[3d_armor] Fire Nodes disabled"
+msgstr "[3d_armor] Nod-nod Api dilumpuhkan"
+
+#: ../3d_armor_ip/init.lua
+msgid "3d_armor_ip: Mod loaded but unused."
+msgstr "3d_armor_ip: Mods dimuatkan tetapi tidak digunakan."
+
+#: ../3d_armor_ip/init.lua
+msgid "Back"
+msgstr "Kembali"
+
+#: ../3d_armor_ip/init.lua ../3d_armor_sfinv/init.lua ../3d_armor_ui/init.lua
+msgid "Armor"
+msgstr "Perisai"
+
+#: ../3d_armor_sfinv/init.lua
+msgid "3d_armor_sfinv: Mod loaded but unused."
+msgstr "3d_armor_sfinv: Mods dimuatkan tetapi tidak digunakan."
+
+#: ../3d_armor_stand/init.lua
+msgid "Armor stand top"
+msgstr "Bhg atas dirian perisai"
+
+#: ../3d_armor_stand/init.lua
+msgid "Armor stand"
+msgstr "Dirian perisai"
+
+#: ../3d_armor_stand/init.lua
+msgid "Armor Stand"
+msgstr "Dirian Perisai"
+
+#: ../3d_armor_stand/init.lua
+msgid "Locked Armor stand"
+msgstr "Dirian perisai Berkunci"
+
+#: ../3d_armor_stand/init.lua
+msgid "Armor Stand (owned by @1)"
+msgstr "Dirian Perisai (milik @1)"
+
+#: ../3d_armor_ui/init.lua
+msgid "3d_armor_ui: Mod loaded but unused."
+msgstr "3d_armor_ui: Mods dimuatkan tetapi tidak digunakan."
+
+#: ../3d_armor_ui/init.lua
+msgid "3d Armor"
+msgstr "Perisai 3d"
+
+#: ../3d_armor_ui/init.lua
+msgid "Armor not initialized!"
+msgstr "Perisai tidak diasalkan!"
+
+#: ../hazmat_suit/init.lua
+msgid "hazmat_suit: Mod loaded but unused."
+msgstr "hazmat_suit: Mods dimuatkan tetapi tidak digunakan."
+
+#: ../hazmat_suit/init.lua
+msgid "Hazmat Helmet"
+msgstr "Helmet Keselamatan"
+
+#: ../hazmat_suit/init.lua
+msgid "Hazmat Chestplate"
+msgstr "Perisai Dada Keselamatan"
+
+#: ../hazmat_suit/init.lua
+msgid "Hazmat Sleeve"
+msgstr "Perisai Tangan Keselamatan"
+
+#: ../hazmat_suit/init.lua
+msgid "Hazmat Leggins"
+msgstr "Perisai Kaki Keselamatan"
+
+#: ../hazmat_suit/init.lua
+msgid "Hazmat Boots"
+msgstr "But Keselamatan"
+
+#: ../hazmat_suit/init.lua
+msgid "Hazmat Suit"
+msgstr "Pakaian Keselamatan"
+
+#: ../shields/init.lua
+msgid "Admin Shield"
+msgstr "Perisai Pegang Pentadbir"
+
+#: ../shields/init.lua
+msgid "Wooden Shield"
+msgstr "Perisai Pegang Kayu"
+
+#: ../shields/init.lua
+msgid "Enhanced Wood Shield"
+msgstr "Perisai Pegang Kayu Kukuh"
+
+#: ../shields/init.lua
+msgid "Cactus Shield"
+msgstr "Perisai Pegang Kaktus"
+
+#: ../shields/init.lua
+msgid "Enhanced Cactus Shield"
+msgstr "Perisai Pegang Kaktus Kukuh"
+
+#: ../shields/init.lua
+msgid "Steel Shield"
+msgstr "Perisai Pegang Keluli"
+
+#: ../shields/init.lua
+msgid "Bronze Shield"
+msgstr "Perisai Pegang Gangsa"
+
+#: ../shields/init.lua
+msgid "Diamond Shield"
+msgstr "Perisai Pegang Intan"
+
+#: ../shields/init.lua
+msgid "Gold Shield"
+msgstr "Perisai Pegang Emas"
+
+#: ../shields/init.lua
+msgid "Mithril Shield"
+msgstr "Perisai Pegang Mithril"
+
+#: ../shields/init.lua
+msgid "Crystal Shield"
+msgstr "Perisai Pegang Kristal"
+
+#: ../technic_armor/init.lua
+msgid "technic_armor: Mod loaded but unused."
+msgstr "technic_armor: Mods dimuatkan tetapi tidak digunakan."
+
+# 'Lead' here is the chemical compound so the translation is 'plumbum', not
'pimpin' (act of leading).
+#: ../technic_armor/init.lua
+msgid "Lead"
+msgstr "Plumbum"
+
+#: ../technic_armor/init.lua
+msgid "Brass"
+msgstr "Loyang"
+
+#: ../technic_armor/init.lua
+msgid "Cast Iron"
+msgstr "Besi Tuang"
+
+#: ../technic_armor/init.lua
+msgid "Carbon Steel"
+msgstr "Keluli Karbon"
+
+#: ../technic_armor/init.lua
+msgid "Stainless Steel"
+msgstr "Keluli Tahan Karat"
+
+#: ../technic_armor/init.lua
+msgid "Tin"
+msgstr "Timah"
+
+#: ../technic_armor/init.lua
+msgid "Silver"
+msgstr "Perak"
+
+#: ../technic_armor/init.lua
+msgid "Helmet"
+msgstr "Helmet"
+
+#: ../technic_armor/init.lua
+msgid "Chestplate"
+msgstr "Perisai Dada"
+
+#: ../technic_armor/init.lua
+msgid "Leggings"
+msgstr "Perisai Kaki"
+
+#: ../technic_armor/init.lua
+msgid "Boots"
+msgstr "But"
+
+#: ../technic_armor/init.lua
+msgid "Shield"
+msgstr "Perisai Pegang"
+
+#. Translators: @1 stands for material and @2 for part of the armor, so that
you could use a conjunction if in your language part name comes first then
material (e.g. in french 'Silver Boots' is translated in 'Bottes en argent' by
using '@2 en @1' as translated string)
+#: ../technic_armor/init.lua
+msgid "@1 @2"
+msgstr "@2 @1"
diff --git a/3d_armor_ip/LICENSE.txt b/3d_armor_ip/LICENSE.txt
index 6b58a7a..96ff8c3 100644
--- a/3d_armor_ip/LICENSE.txt
+++ b/3d_armor_ip/LICENSE.txt
@@ -1,5 +1,5 @@
[mod] 3d Armor integration to inventory plus [3d_armor_ip]
==========================================================
-License Source Code: (C) 2012-2017 Stuart Jones - LGPL v2.1
+License Source Code: (C) 2012-2018 Stuart Jones - LGPL v2.1
diff --git a/3d_armor_sfinv/LICENSE.txt b/3d_armor_sfinv/LICENSE.txt
index 538b950..5b4d955 100644
--- a/3d_armor_sfinv/LICENSE.txt
+++ b/3d_armor_sfinv/LICENSE.txt
@@ -1,5 +1,5 @@
[mod] 3d Armor sfinv integration [3d_armor_sfinv]
=================================================
-License Source Code: (C) 2012-2017 Stuart Jones - LGPL v2.1
+License Source Code: (C) 2012-2018 Stuart Jones - LGPL v2.1
diff --git a/3d_armor_stand/LICENSE.txt b/3d_armor_stand/LICENSE.txt
index 65f46c8..82e5de6 100644
--- a/3d_armor_stand/LICENSE.txt
+++ b/3d_armor_stand/LICENSE.txt
@@ -1,9 +1,9 @@
[mod] 3d Armor Stand [3d_armor_stand]
=====================================
-License Source Code: (C) 2016-2017 Stuart Jones - LGPL v2.1
+License Source Code: (C) 2016-2018 Stuart Jones - LGPL v2.1
-Lecense Models: (C) 2016-2017 Stuart Jones - CC BY-SA 3.0
+Lecense Models: (C) 2016-2018 Stuart Jones - CC BY-SA 3.0
UV model mapping by tobyplowy(aka toby109tt)
diff --git a/3d_armor_stand/init.lua b/3d_armor_stand/init.lua
index df4380d..6570270 100644
--- a/3d_armor_stand/init.lua
+++ b/3d_armor_stand/init.lua
@@ -321,11 +321,23 @@ minetest.register_entity("3d_armor_stand:armor_entity", {
end,
})
+minetest.register_abm({
+ nodenames = {"3d_armor_stand:locked_armor_stand",
"3d_armor_stand:armor_stand"},
+ interval = 15,
+ chance = 1,
+ action = function(pos, node, active_object_count,
active_object_count_wider)
+ local num
+ num = #minetest.get_objects_inside_radius(pos, 0.5)
+ if num > 0 then return end
+ update_entity(pos)
+ end
+})
+
minetest.register_craft({
output = "3d_armor_stand:armor_stand",
recipe = {
- {"", "default:fence_wood", ""},
- {"", "default:fence_wood", ""},
+ {"", "group:fence", ""},
+ {"", "group:fence", ""},
{"default:steel_ingot", "default:steel_ingot",
"default:steel_ingot"},
}
})
diff --git a/3d_armor_ui/LICENSE.txt b/3d_armor_ui/LICENSE.txt
index 50859b0..5dd82c8 100644
--- a/3d_armor_ui/LICENSE.txt
+++ b/3d_armor_ui/LICENSE.txt
@@ -1,5 +1,5 @@
[mod] 3d Armor integration to unified inventory [3d_armor_ui]
=============================================================
-License Source Code: (C) 2012-2017 Stuart Jones - LGPL v2.1
+License Source Code: (C) 2012-2018 Stuart Jones - LGPL v2.1
diff --git a/LICENSE.md b/LICENSE.md
index 18df885..56c93cd 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,9 +1,9 @@
3D Armor - Visible Player Armor
===============================
-License Source Code: Copyright (C) 2013-2017 Stuart Jones - LGPL v2.1
+License Source Code: Copyright (C) 2013-2018 Stuart Jones - LGPL v2.1
-Armor Textures: Copyright (C) 2017 davidthecreator - CC-BY-SA 3.0
+Armor Textures: Copyright (C) 2017-2018 davidthecreator - CC-BY-SA 3.0
Special credit to Jordach and MirceaKitsune for providing the default 3d
character model.
diff --git a/README.md b/README.md
index 9e21c6c..9cff8a0 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-Modpack - 3d Armor [0.4.10]
-==========================
+Modpack - 3d Armor [0.4.11]
+===========================
### Table of Contents
<!-- START doctoc generated TOC please keep comment here to allow auto update
-->
@@ -9,8 +9,6 @@ Modpack - 3d Armor [0.4.10]
- [[mod] Visible Player Armor [3d_armor]](#mod-visible-player-armor-3d_armor)
- [[mod] Visible Wielded Items
[wieldview]](#mod-visible-wielded-items-wieldview)
- [[mod] Shields [shields]](#mod-shields-shields)
-- [[mod] Technic Armor [technic_armor]](#mod-technic-armor-technic_armor)
-- [[mod] Hazmat Suit [hazmat_suit]](#mod-hazmat-suit-hazmat_suit)
- [[mod] 3d Armor Stand [3d_armor_stand]](#mod-3d-armor-stand-3d_armor_stand)
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
@@ -19,7 +17,7 @@ Modpack - 3d Armor [0.4.10]
[mod] Visible Player Armor [3d_armor]
-------------------------------------
-Minetest Version: 0.4.15
+Minetest Version: 0.4.16
Game: minetest_game and many derivatives
@@ -63,23 +61,6 @@ Depends: 3d_armor
Originally a part of 3d_armor, shields have been re-included as an optional
extra.
If you do not want shields then simply remove the shields folder from the
modpack.
-[mod] Technic Armor [technic_armor]
------------------------------------
-
-Depends: 3d_armor, technic_worldgen
-
-Adds tin, silver and technic materials to 3d_armor.
-Requires technic (technic_worldgen at least) mod.
-
-[mod] Hazmat Suit [hazmat_suit]
--------------------------------
-
-Depends: 3d_armor, technic
-
-Adds hazmat suit to 3d_armor. It protects rather well from fire (if enabled in
configuration) and radiation*, and it has built-in oxygen supply.
-
-Requires technic mod.
-
[mod] 3d Armor Stand [3d_armor_stand]
-------------------------------------
diff --git a/hazmat_suit/LICENSE.txt b/hazmat_suit/LICENSE.txt
deleted file mode 100644
index 62b6592..0000000
--- a/hazmat_suit/LICENSE.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-[mod] Hazmat Suit [hazmat_suit]
-===============================
-
-License Source Code: Copyright (C) 2015-2017 Stuart Jones - LGPL v2.1
-
-License Textures: HybridDog and numberZero - 2015-2017 WTFPL
-
diff --git a/hazmat_suit/README.txt b/hazmat_suit/README.txt
deleted file mode 100644
index 9f578f8..0000000
--- a/hazmat_suit/README.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-[mod] Hazmat Suit [hazmat_suit]
-===============================
-
-Adds hazmat suit to 3d_armor. It protects rather well from fire (if enabled in
configuration) and radiation*, and it has built-in oxygen supply.
-
-Requires technic mod.
-
-*Requires patched version of technic mod -
https://github.com/minetest-technic/technic/pull/275
-
-Depends: 3d_armor, technic
-
-Textures by HybridDog and numberZero
diff --git a/hazmat_suit/depends.txt b/hazmat_suit/depends.txt
deleted file mode 100644
index 773b3fe..0000000
--- a/hazmat_suit/depends.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-3d_armor
-technic?
diff --git a/hazmat_suit/description.txt b/hazmat_suit/description.txt
deleted file mode 100644
index bba80d0..0000000
--- a/hazmat_suit/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Adds hazmat suit (protects from water, fire and radiation) to 3d_armor.
diff --git a/hazmat_suit/init.lua b/hazmat_suit/init.lua
deleted file mode 100644
index 0e914c5..0000000
--- a/hazmat_suit/init.lua
+++ /dev/null
@@ -1,105 +0,0 @@
--- support for i18n
-local S = armor_i18n.gettext
-
-if not minetest.get_modpath("technic") then
- minetest.log("warning", S("hazmat_suit: Mod loaded but unused."))
- return
-end
-
-minetest.register_craftitem("hazmat_suit:helmet_hazmat", {
- description = S("Hazmat Helmet"),
- inventory_image = "hazmat_suit_inv_helmet_hazmat.png",
- stack_max = 1,
-})
-
-minetest.register_craftitem("hazmat_suit:chestplate_hazmat", {
- description = S("Hazmat Chestplate"),
- inventory_image = "hazmat_suit_inv_chestplate_hazmat.png",
- stack_max = 1,
-})
-
-minetest.register_craftitem("hazmat_suit:sleeve_hazmat", {
- description = S("Hazmat Sleeve"),
- inventory_image = "hazmat_suit_inv_sleeve_hazmat.png",
- stack_max = 1,
-})
-
-minetest.register_craftitem("hazmat_suit:leggings_hazmat", {
- description = S("Hazmat Leggins"),
- inventory_image = "hazmat_suit_inv_leggings_hazmat.png",
- stack_max = 1,
-})
-
-minetest.register_craftitem("hazmat_suit:boots_hazmat", {
- description = S("Hazmat Boots"),
- inventory_image = "hazmat_suit_inv_boots_hazmat.png",
- stack_max = 1,
-})
-
-armor:register_armor("hazmat_suit:suit_hazmat", {
- description = S("Hazmat Suit"),
- inventory_image = "hazmat_suit_inv_suit_hazmat.png",
- groups = {armor_head=1, armor_torso=1, armor_legs=1, armor_feet=1,
- armor_heal=20, armor_fire=4, armor_water=1, armor_use=1000,
- physics_jump=-0.1, physics_speed=-0.2, physics_gravity=0.1},
- armor_groups = {fleshy=35, radiation=50},
- damage_groups = {cracky=3, snappy=3, choppy=2, crumbly=2, level=1},
-})
-
-minetest.register_craft({
- output = "hazmat_suit:helmet_hazmat",
- recipe = {
- {"", "technic:stainless_steel_ingot", ""},
- {"technic:stainless_steel_ingot", "default:glass",
"technic:stainless_steel_ingot"},
- {"technic:rubber", "technic:rubber", "technic:rubber"},
- },
-})
-
-minetest.register_craft({
- output = "hazmat_suit:chestplate_hazmat",
- recipe = {
- {"technic:lead_ingot", "dye:yellow", "technic:lead_ingot"},
- {"technic:stainless_steel_ingot", "technic:lead_ingot",
"technic:stainless_steel_ingot"},
- {"technic:lead_ingot", "technic:stainless_steel_ingot",
"technic:lead_ingot"},
- },
-})
-
-minetest.register_craft({
- output = "hazmat_suit:sleeve_hazmat",
- recipe = {
- {"technic:rubber", "dye:yellow"},
- {"", "technic:stainless_steel_ingot"},
- {"", "technic:rubber"},
- },
-})
-
-minetest.register_craft({
- output = "hazmat_suit:leggings_hazmat",
- recipe = {
- {"technic:rubber", "technic:lead_ingot", "technic:rubber"},
- {"technic:stainless_steel_ingot", "technic:rubber",
"technic:stainless_steel_ingot"},
- {"technic:lead_ingot", "", "technic:lead_ingot"},
- },
-})
-
-minetest.register_craft({
- output = "hazmat_suit:boots_hazmat",
- recipe = {
- {"", "", ""},
- {"technic:rubber", "", "technic:rubber"},
- {"technic:stainless_steel_ingot", "",
"technic:stainless_steel_ingot"},
- },
-})
-
-minetest.register_craft({
- output = "hazmat_suit:suit_hazmat",
- type = "shapeless",
- recipe = {
- "hazmat_suit:helmet_hazmat",
- "hazmat_suit:chestplate_hazmat",
- "hazmat_suit:leggings_hazmat",
- "hazmat_suit:boots_hazmat",
- "hazmat_suit:sleeve_hazmat",
- "hazmat_suit:sleeve_hazmat",
- },
-})
diff --git a/hazmat_suit/textures/hazmat_suit_inv_boots_hazmat.png
b/hazmat_suit/textures/hazmat_suit_inv_boots_hazmat.png
deleted file mode 100644
index f4afb67..0000000
Binary files a/hazmat_suit/textures/hazmat_suit_inv_boots_hazmat.png and
/dev/null differ
diff --git a/hazmat_suit/textures/hazmat_suit_inv_chestplate_hazmat.png
b/hazmat_suit/textures/hazmat_suit_inv_chestplate_hazmat.png
deleted file mode 100644
index b6b83a5..0000000
Binary files a/hazmat_suit/textures/hazmat_suit_inv_chestplate_hazmat.png and
/dev/null differ
diff --git a/hazmat_suit/textures/hazmat_suit_inv_helmet_hazmat.png
b/hazmat_suit/textures/hazmat_suit_inv_helmet_hazmat.png
deleted file mode 100644
index b8e3132..0000000
Binary files a/hazmat_suit/textures/hazmat_suit_inv_helmet_hazmat.png and
/dev/null differ
diff --git a/hazmat_suit/textures/hazmat_suit_inv_leggings_hazmat.png
b/hazmat_suit/textures/hazmat_suit_inv_leggings_hazmat.png
deleted file mode 100644
index 9bd2247..0000000
Binary files a/hazmat_suit/textures/hazmat_suit_inv_leggings_hazmat.png and
/dev/null differ
diff --git a/hazmat_suit/textures/hazmat_suit_inv_sleeve_hazmat.png
b/hazmat_suit/textures/hazmat_suit_inv_sleeve_hazmat.png
deleted file mode 100644
index 771fa07..0000000
Binary files a/hazmat_suit/textures/hazmat_suit_inv_sleeve_hazmat.png and
/dev/null differ
diff --git a/hazmat_suit/textures/hazmat_suit_inv_suit_hazmat.png
b/hazmat_suit/textures/hazmat_suit_inv_suit_hazmat.png
deleted file mode 100644
index df9838e..0000000
Binary files a/hazmat_suit/textures/hazmat_suit_inv_suit_hazmat.png and
/dev/null differ
diff --git a/hazmat_suit/textures/hazmat_suit_suit_hazmat.png
b/hazmat_suit/textures/hazmat_suit_suit_hazmat.png
deleted file mode 100644
index 421cd60..0000000
Binary files a/hazmat_suit/textures/hazmat_suit_suit_hazmat.png and /dev/null
differ
diff --git a/hazmat_suit/textures/hazmat_suit_suit_hazmat_preview.png
b/hazmat_suit/textures/hazmat_suit_suit_hazmat_preview.png
deleted file mode 100644
index bc1c5df..0000000
Binary files a/hazmat_suit/textures/hazmat_suit_suit_hazmat_preview.png and
/dev/null differ
diff --git a/hazmat_suit/textures/preview_index.txt
b/hazmat_suit/textures/preview_index.txt
deleted file mode 100644
index bc6f4d4..0000000
--- a/hazmat_suit/textures/preview_index.txt
+++ /dev/null
@@ -1 +0,0 @@
-hazmat_suit/textures/hazmat_suit_suit_hazmat.png:all
diff --git a/shields/LICENSE.txt b/shields/LICENSE.txt
index 316bc89..15e2345 100644
--- a/shields/LICENSE.txt
+++ b/shields/LICENSE.txt
@@ -1,8 +1,8 @@
[mod] Shields [shields]
=======================
-License Source Code: Copyright (C) 2013-2017 Stuart Jones - LGPL v2.1
+License Source Code: Copyright (C) 2013-2018 Stuart Jones - LGPL v2.1
-License Textures: Copyright (C) 2017 davidthecreator - CC-BY-SA 3.0
+License Textures: Copyright (C) 2017-2018 davidthecreator - CC-BY-SA 3.0
https://github.com/daviddoesminetest/3d-armors-new-textures
diff --git a/technic_armor/LICENSE.txt b/technic_armor/LICENSE.txt
deleted file mode 100644
index 2402dac..0000000
--- a/technic_armor/LICENSE.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-[mod] Technic Armor [technic_armor]
-===================================
-
-License Source Code: Copyright (C) 2013-2017 Stuart Jones - LGPL v2.1
-
-License Textures: poet.nohit and numberZero - 2015-2017 WTFPL
-
diff --git a/technic_armor/README.txt b/technic_armor/README.txt
deleted file mode 100644
index 76a88eb..0000000
--- a/technic_armor/README.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-[mod] Technic Armor [technic_armor]
-===================================
-
-Adds tin, silver and technic materials to 3d_armor.
-Requires technic (technic_worldgen at least) mod.
-
-Depends: 3d_armor, technic_worldgen
-
-Textures by poet.nohit and numberZero
diff --git a/technic_armor/depends.txt b/technic_armor/depends.txt
deleted file mode 100644
index 9ccefed..0000000
--- a/technic_armor/depends.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-3d_armor
-technic_worldgen?
-moreores?
diff --git a/technic_armor/description.txt b/technic_armor/description.txt
deleted file mode 100644
index 5738c4f..0000000
--- a/technic_armor/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Adds tin, silver and technic materials to 3d_armor.
diff --git a/technic_armor/init.lua b/technic_armor/init.lua
deleted file mode 100644
index ddbaad9..0000000
--- a/technic_armor/init.lua
+++ /dev/null
@@ -1,66 +0,0 @@
--- support for i18n
-local S = armor_i18n.gettext
-local F = armor_i18n.fgettext
-
-if not minetest.get_modpath("technic_worldgen") then
- minetest.log("warning", S("technic_armor: Mod loaded but unused."))
- return
-end
-
-local stats = {
- lead = { name=S("Lead"), material="technic:lead_ingot", armor=1.6,
heal=0, use=500, radiation=80*1.1 },
- brass = { name=S("Brass"), material="technic:brass_ingot", armor=1.8,
heal=0, use=650, radiation=43 },
- cast = { name=S("Cast Iron"), material="technic:cast_iron_ingot",
armor=2.5, heal=8, use=200, radiation=40 },
- carbon = { name=S("Carbon Steel"),
material="technic:carbon_steel_ingot", armor=2.7, heal=10, use=100,
radiation=40 },
- stainless = { name=S("Stainless Steel"),
material="technic:stainless_steel_ingot", armor=2.7, heal=10, use=75,
radiation=40 },
-}
-if minetest.get_modpath("moreores") then
- stats.tin = { name=S("Tin"), material="moreores:tin_ingot", armor=1.6,
heal=0, use=750, radiation=37 }
- stats.silver = { name=S("Silver"), material="moreores:silver_ingot",
armor=1.8, heal=6, use=650, radiation=53 }
-end
-
-local parts = {
- helmet = { place="head", name=S("Helmet"), level=5, radlevel = 0.10,
craft={{1,1,1},{1,0,1}} },
- chestplate = { place="torso", name=S("Chestplate"), level=8, radlevel =
0.35, craft={{1,0,1},{1,1,1},{1,1,1}} },
- leggings = { place="legs", name=S("Leggings"), level=7, radlevel =
0.15, craft={{1,1,1},{1,0,1},{1,0,1}} },
- boots = { place="feet", name=S("Boots"), level=4, radlevel = 0.10,
craft={{1,0,1},{1,0,1}} },
-}
-if minetest.get_modpath("shields") then
- parts.shield = { place="shield", name=S("Shield"), level=5,
radlevel=0.00, craft={{1,1,1},{1,1,1},{0,1,0}} }
-end
-
--- Makes a craft recipe based on a template
--- template is a recipe-like table but indices are used instead of actual item
names:
--- 0 means nothing, everything else is treated as an index in the materials
table
-local function make_recipe(template, materials)
- local recipe = {}
- for j, trow in ipairs(template) do
- local rrow = {}
- for i, tcell in ipairs(trow) do
- if tcell == 0 then
- rrow[i] = ""
- else
- rrow[i] = materials[tcell]
- end
- end
- recipe[j] = rrow
- end
- return recipe
-end
-
-for key, armor in pairs(stats) do
- for partkey, part in pairs(parts) do
- local partname = "technic_armor:"..partkey.."_"..key
- minetest.register_tool(partname, {
- -- Translators: @1 stands for material and @2 for part
of the armor, so that you could use a conjunction if in your language part name
comes first then material (e.g. in french 'Silver Boots' is translated in
'Bottes en argent' by using '@2 en @1' as translated string)
- description = S("@1 @2", armor.name, part.name),
- inventory_image =
"technic_armor_inv_"..partkey.."_"..key..".png",
- groups =
{["armor_"..part.place]=math.floor(part.level*armor.armor),
armor_heal=armor.heal, armor_use=armor.use,
armor_radiation=math.floor(part.radlevel*armor.radiation)},
- wear = 0,
- })
- minetest.register_craft({
- output = partname,
- recipe = make_recipe(part.craft, {armor.material}),
- })
- end
-end
diff --git a/technic_armor/textures/preview_index.txt
b/technic_armor/textures/preview_index.txt
deleted file mode 100644
index e39a0b6..0000000
--- a/technic_armor/textures/preview_index.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-technic_armor/textures/technic_armor_helmet_brass.png:head
-technic_armor/textures/technic_armor_chestplate_brass.png:torso
-technic_armor/textures/technic_armor_leggings_brass.png:legs
-technic_armor/textures/technic_armor_boots_brass.png:feet
-technic_armor/textures/technic_armor_shield_brass.png:shield
-
-technic_armor/textures/technic_armor_helmet_cast.png:head
-technic_armor/textures/technic_armor_chestplate_cast.png:torso
-technic_armor/textures/technic_armor_leggings_cast.png:legs
-technic_armor/textures/technic_armor_boots_cast.png:feet
-technic_armor/textures/technic_armor_shield_cast.png:shield
-
-technic_armor/textures/technic_armor_helmet_stainless.png:head
-technic_armor/textures/technic_armor_chestplate_stainless.png:torso
-technic_armor/textures/technic_armor_leggings_stainless.png:legs
-technic_armor/textures/technic_armor_boots_stainless.png:feet
-technic_armor/textures/technic_armor_shield_stainless.png:shield
-
-technic_armor/textures/technic_armor_helmet_tin.png:head
-technic_armor/textures/technic_armor_chestplate_tin.png:torso
-technic_armor/textures/technic_armor_leggings_tin.png:legs
-technic_armor/textures/technic_armor_boots_tin.png:feet
-technic_armor/textures/technic_armor_shield_tin.png:shield
-
-technic_armor/textures/technic_armor_helmet_lead.png:head
-technic_armor/textures/technic_armor_chestplate_lead.png:torso
-technic_armor/textures/technic_armor_leggings_lead.png:legs
-technic_armor/textures/technic_armor_boots_lead.png:feet
-technic_armor/textures/technic_armor_shield_lead.png:shield
-
-technic_armor/textures/technic_armor_helmet_carbon.png:head
-technic_armor/textures/technic_armor_chestplate_carbon.png:torso
-technic_armor/textures/technic_armor_leggings_carbon.png:legs
-technic_armor/textures/technic_armor_boots_carbon.png:feet
-technic_armor/textures/technic_armor_shield_carbon.png:shield
-
-technic_armor/textures/technic_armor_helmet_silver.png:head
-technic_armor/textures/technic_armor_chestplate_silver.png:torso
-technic_armor/textures/technic_armor_leggings_silver.png:legs
-technic_armor/textures/technic_armor_boots_silver.png:feet
-technic_armor/textures/technic_armor_shield_silver.png:shield
diff --git a/technic_armor/textures/technic_armor_boots_brass.png
b/technic_armor/textures/technic_armor_boots_brass.png
deleted file mode 100644
index 0f6e822..0000000
Binary files a/technic_armor/textures/technic_armor_boots_brass.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_boots_brass_preview.png
b/technic_armor/textures/technic_armor_boots_brass_preview.png
deleted file mode 100644
index 0f9f6f7..0000000
Binary files a/technic_armor/textures/technic_armor_boots_brass_preview.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_boots_carbon.png
b/technic_armor/textures/technic_armor_boots_carbon.png
deleted file mode 100644
index 0002401..0000000
Binary files a/technic_armor/textures/technic_armor_boots_carbon.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_boots_carbon_preview.png
b/technic_armor/textures/technic_armor_boots_carbon_preview.png
deleted file mode 100644
index 98dfe59..0000000
Binary files a/technic_armor/textures/technic_armor_boots_carbon_preview.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_boots_cast.png
b/technic_armor/textures/technic_armor_boots_cast.png
deleted file mode 100644
index b0bfd55..0000000
Binary files a/technic_armor/textures/technic_armor_boots_cast.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_boots_cast_preview.png
b/technic_armor/textures/technic_armor_boots_cast_preview.png
deleted file mode 100644
index 2a1cdba..0000000
Binary files a/technic_armor/textures/technic_armor_boots_cast_preview.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_boots_lead.png
b/technic_armor/textures/technic_armor_boots_lead.png
deleted file mode 100644
index 05eff68..0000000
Binary files a/technic_armor/textures/technic_armor_boots_lead.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_boots_lead_preview.png
b/technic_armor/textures/technic_armor_boots_lead_preview.png
deleted file mode 100644
index fde3271..0000000
Binary files a/technic_armor/textures/technic_armor_boots_lead_preview.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_boots_silver.png
b/technic_armor/textures/technic_armor_boots_silver.png
deleted file mode 100644
index 18b296e..0000000
Binary files a/technic_armor/textures/technic_armor_boots_silver.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_boots_silver_preview.png
b/technic_armor/textures/technic_armor_boots_silver_preview.png
deleted file mode 100644
index a1c56ed..0000000
Binary files a/technic_armor/textures/technic_armor_boots_silver_preview.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_boots_stainless.png
b/technic_armor/textures/technic_armor_boots_stainless.png
deleted file mode 100644
index e35dc42..0000000
Binary files a/technic_armor/textures/technic_armor_boots_stainless.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_boots_stainless_preview.png
b/technic_armor/textures/technic_armor_boots_stainless_preview.png
deleted file mode 100644
index 500c8ad..0000000
Binary files a/technic_armor/textures/technic_armor_boots_stainless_preview.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_boots_tin.png
b/technic_armor/textures/technic_armor_boots_tin.png
deleted file mode 100644
index bd19ee1..0000000
Binary files a/technic_armor/textures/technic_armor_boots_tin.png and /dev/null
differ
diff --git a/technic_armor/textures/technic_armor_boots_tin_preview.png
b/technic_armor/textures/technic_armor_boots_tin_preview.png
deleted file mode 100644
index 52763fa..0000000
Binary files a/technic_armor/textures/technic_armor_boots_tin_preview.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_chestplate_brass.png
b/technic_armor/textures/technic_armor_chestplate_brass.png
deleted file mode 100644
index 09acd52..0000000
Binary files a/technic_armor/textures/technic_armor_chestplate_brass.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_chestplate_brass_preview.png
b/technic_armor/textures/technic_armor_chestplate_brass_preview.png
deleted file mode 100644
index 5f8c044..0000000
Binary files
a/technic_armor/textures/technic_armor_chestplate_brass_preview.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_chestplate_carbon.png
b/technic_armor/textures/technic_armor_chestplate_carbon.png
deleted file mode 100644
index 581d5d7..0000000
Binary files a/technic_armor/textures/technic_armor_chestplate_carbon.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_chestplate_carbon_preview.png
b/technic_armor/textures/technic_armor_chestplate_carbon_preview.png
deleted file mode 100644
index 73fd662..0000000
Binary files
a/technic_armor/textures/technic_armor_chestplate_carbon_preview.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_chestplate_cast.png
b/technic_armor/textures/technic_armor_chestplate_cast.png
deleted file mode 100644
index 3e5f743..0000000
Binary files a/technic_armor/textures/technic_armor_chestplate_cast.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_chestplate_cast_preview.png
b/technic_armor/textures/technic_armor_chestplate_cast_preview.png
deleted file mode 100644
index e4c85d8..0000000
Binary files a/technic_armor/textures/technic_armor_chestplate_cast_preview.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_chestplate_lead.png
b/technic_armor/textures/technic_armor_chestplate_lead.png
deleted file mode 100644
index 1b39c9f..0000000
Binary files a/technic_armor/textures/technic_armor_chestplate_lead.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_chestplate_lead_preview.png
b/technic_armor/textures/technic_armor_chestplate_lead_preview.png
deleted file mode 100644
index 2142d2e..0000000
Binary files a/technic_armor/textures/technic_armor_chestplate_lead_preview.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_chestplate_silver.png
b/technic_armor/textures/technic_armor_chestplate_silver.png
deleted file mode 100644
index 4b6f0fa..0000000
Binary files a/technic_armor/textures/technic_armor_chestplate_silver.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_chestplate_silver_preview.png
b/technic_armor/textures/technic_armor_chestplate_silver_preview.png
deleted file mode 100644
index 1ae19e7..0000000
Binary files
a/technic_armor/textures/technic_armor_chestplate_silver_preview.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_chestplate_stainless.png
b/technic_armor/textures/technic_armor_chestplate_stainless.png
deleted file mode 100644
index 802aaa6..0000000
Binary files a/technic_armor/textures/technic_armor_chestplate_stainless.png
and /dev/null differ
diff --git
a/technic_armor/textures/technic_armor_chestplate_stainless_preview.png
b/technic_armor/textures/technic_armor_chestplate_stainless_preview.png
deleted file mode 100644
index f63ea19..0000000
Binary files
a/technic_armor/textures/technic_armor_chestplate_stainless_preview.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_chestplate_tin.png
b/technic_armor/textures/technic_armor_chestplate_tin.png
deleted file mode 100644
index 907725b..0000000
Binary files a/technic_armor/textures/technic_armor_chestplate_tin.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_chestplate_tin_preview.png
b/technic_armor/textures/technic_armor_chestplate_tin_preview.png
deleted file mode 100644
index 6732b18..0000000
Binary files a/technic_armor/textures/technic_armor_chestplate_tin_preview.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_helmet_brass.png
b/technic_armor/textures/technic_armor_helmet_brass.png
deleted file mode 100644
index 3e3e378..0000000
Binary files a/technic_armor/textures/technic_armor_helmet_brass.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_helmet_brass_preview.png
b/technic_armor/textures/technic_armor_helmet_brass_preview.png
deleted file mode 100644
index 8afdabf..0000000
Binary files a/technic_armor/textures/technic_armor_helmet_brass_preview.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_helmet_carbon.png
b/technic_armor/textures/technic_armor_helmet_carbon.png
deleted file mode 100644
index dbbd5f7..0000000
Binary files a/technic_armor/textures/technic_armor_helmet_carbon.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_helmet_carbon_preview.png
b/technic_armor/textures/technic_armor_helmet_carbon_preview.png
deleted file mode 100644
index 243770d..0000000
Binary files a/technic_armor/textures/technic_armor_helmet_carbon_preview.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_helmet_cast.png
b/technic_armor/textures/technic_armor_helmet_cast.png
deleted file mode 100644
index 2fffc0d..0000000
Binary files a/technic_armor/textures/technic_armor_helmet_cast.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_helmet_cast_preview.png
b/technic_armor/textures/technic_armor_helmet_cast_preview.png
deleted file mode 100644
index 12867ac..0000000
Binary files a/technic_armor/textures/technic_armor_helmet_cast_preview.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_helmet_lead.png
b/technic_armor/textures/technic_armor_helmet_lead.png
deleted file mode 100644
index dee6eec..0000000
Binary files a/technic_armor/textures/technic_armor_helmet_lead.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_helmet_lead_preview.png
b/technic_armor/textures/technic_armor_helmet_lead_preview.png
deleted file mode 100644
index 4fb5c27..0000000
Binary files a/technic_armor/textures/technic_armor_helmet_lead_preview.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_helmet_silver.png
b/technic_armor/textures/technic_armor_helmet_silver.png
deleted file mode 100644
index 7244f69..0000000
Binary files a/technic_armor/textures/technic_armor_helmet_silver.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_helmet_silver_preview.png
b/technic_armor/textures/technic_armor_helmet_silver_preview.png
deleted file mode 100644
index 7639027..0000000
Binary files a/technic_armor/textures/technic_armor_helmet_silver_preview.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_helmet_stainless.png
b/technic_armor/textures/technic_armor_helmet_stainless.png
deleted file mode 100644
index e662b7e..0000000
Binary files a/technic_armor/textures/technic_armor_helmet_stainless.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_helmet_stainless_preview.png
b/technic_armor/textures/technic_armor_helmet_stainless_preview.png
deleted file mode 100644
index ae20233..0000000
Binary files
a/technic_armor/textures/technic_armor_helmet_stainless_preview.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_helmet_tin.png
b/technic_armor/textures/technic_armor_helmet_tin.png
deleted file mode 100644
index d12c593..0000000
Binary files a/technic_armor/textures/technic_armor_helmet_tin.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_helmet_tin_preview.png
b/technic_armor/textures/technic_armor_helmet_tin_preview.png
deleted file mode 100644
index 1f5c040..0000000
Binary files a/technic_armor/textures/technic_armor_helmet_tin_preview.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_boots_brass.png
b/technic_armor/textures/technic_armor_inv_boots_brass.png
deleted file mode 100644
index 386a0b4..0000000
Binary files a/technic_armor/textures/technic_armor_inv_boots_brass.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_boots_carbon.png
b/technic_armor/textures/technic_armor_inv_boots_carbon.png
deleted file mode 100644
index 0ec5008..0000000
Binary files a/technic_armor/textures/technic_armor_inv_boots_carbon.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_boots_cast.png
b/technic_armor/textures/technic_armor_inv_boots_cast.png
deleted file mode 100644
index 7f05b93..0000000
Binary files a/technic_armor/textures/technic_armor_inv_boots_cast.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_boots_lead.png
b/technic_armor/textures/technic_armor_inv_boots_lead.png
deleted file mode 100644
index 6b98300..0000000
Binary files a/technic_armor/textures/technic_armor_inv_boots_lead.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_boots_silver.png
b/technic_armor/textures/technic_armor_inv_boots_silver.png
deleted file mode 100644
index 595a138..0000000
Binary files a/technic_armor/textures/technic_armor_inv_boots_silver.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_boots_stainless.png
b/technic_armor/textures/technic_armor_inv_boots_stainless.png
deleted file mode 100644
index f3c0832..0000000
Binary files a/technic_armor/textures/technic_armor_inv_boots_stainless.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_boots_tin.png
b/technic_armor/textures/technic_armor_inv_boots_tin.png
deleted file mode 100644
index 17dd7d9..0000000
Binary files a/technic_armor/textures/technic_armor_inv_boots_tin.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_chestplate_brass.png
b/technic_armor/textures/technic_armor_inv_chestplate_brass.png
deleted file mode 100644
index f37c441..0000000
Binary files a/technic_armor/textures/technic_armor_inv_chestplate_brass.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_chestplate_carbon.png
b/technic_armor/textures/technic_armor_inv_chestplate_carbon.png
deleted file mode 100644
index b65a494..0000000
Binary files a/technic_armor/textures/technic_armor_inv_chestplate_carbon.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_chestplate_cast.png
b/technic_armor/textures/technic_armor_inv_chestplate_cast.png
deleted file mode 100644
index ab07e33..0000000
Binary files a/technic_armor/textures/technic_armor_inv_chestplate_cast.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_chestplate_lead.png
b/technic_armor/textures/technic_armor_inv_chestplate_lead.png
deleted file mode 100644
index 5d996b7..0000000
Binary files a/technic_armor/textures/technic_armor_inv_chestplate_lead.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_chestplate_silver.png
b/technic_armor/textures/technic_armor_inv_chestplate_silver.png
deleted file mode 100644
index 989f66a..0000000
Binary files a/technic_armor/textures/technic_armor_inv_chestplate_silver.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_chestplate_stainless.png
b/technic_armor/textures/technic_armor_inv_chestplate_stainless.png
deleted file mode 100644
index 792782e..0000000
Binary files
a/technic_armor/textures/technic_armor_inv_chestplate_stainless.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_chestplate_tin.png
b/technic_armor/textures/technic_armor_inv_chestplate_tin.png
deleted file mode 100644
index 3218188..0000000
Binary files a/technic_armor/textures/technic_armor_inv_chestplate_tin.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_helmet_brass.png
b/technic_armor/textures/technic_armor_inv_helmet_brass.png
deleted file mode 100644
index 1538cd1..0000000
Binary files a/technic_armor/textures/technic_armor_inv_helmet_brass.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_helmet_carbon.png
b/technic_armor/textures/technic_armor_inv_helmet_carbon.png
deleted file mode 100644
index 0556bdc..0000000
Binary files a/technic_armor/textures/technic_armor_inv_helmet_carbon.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_helmet_cast.png
b/technic_armor/textures/technic_armor_inv_helmet_cast.png
deleted file mode 100644
index b01edbc..0000000
Binary files a/technic_armor/textures/technic_armor_inv_helmet_cast.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_helmet_lead.png
b/technic_armor/textures/technic_armor_inv_helmet_lead.png
deleted file mode 100644
index 28d0237..0000000
Binary files a/technic_armor/textures/technic_armor_inv_helmet_lead.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_helmet_silver.png
b/technic_armor/textures/technic_armor_inv_helmet_silver.png
deleted file mode 100644
index 07464a6..0000000
Binary files a/technic_armor/textures/technic_armor_inv_helmet_silver.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_helmet_stainless.png
b/technic_armor/textures/technic_armor_inv_helmet_stainless.png
deleted file mode 100644
index 32e0064..0000000
Binary files a/technic_armor/textures/technic_armor_inv_helmet_stainless.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_helmet_tin.png
b/technic_armor/textures/technic_armor_inv_helmet_tin.png
deleted file mode 100644
index d691d27..0000000
Binary files a/technic_armor/textures/technic_armor_inv_helmet_tin.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_leggings_brass.png
b/technic_armor/textures/technic_armor_inv_leggings_brass.png
deleted file mode 100644
index 9457cf1..0000000
Binary files a/technic_armor/textures/technic_armor_inv_leggings_brass.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_leggings_carbon.png
b/technic_armor/textures/technic_armor_inv_leggings_carbon.png
deleted file mode 100644
index e18bcc2..0000000
Binary files a/technic_armor/textures/technic_armor_inv_leggings_carbon.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_leggings_cast.png
b/technic_armor/textures/technic_armor_inv_leggings_cast.png
deleted file mode 100644
index 612a4b6..0000000
Binary files a/technic_armor/textures/technic_armor_inv_leggings_cast.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_leggings_lead.png
b/technic_armor/textures/technic_armor_inv_leggings_lead.png
deleted file mode 100644
index c8bb05e..0000000
Binary files a/technic_armor/textures/technic_armor_inv_leggings_lead.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_leggings_silver.png
b/technic_armor/textures/technic_armor_inv_leggings_silver.png
deleted file mode 100644
index 995f137..0000000
Binary files a/technic_armor/textures/technic_armor_inv_leggings_silver.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_leggings_stainless.png
b/technic_armor/textures/technic_armor_inv_leggings_stainless.png
deleted file mode 100644
index 81ba007..0000000
Binary files a/technic_armor/textures/technic_armor_inv_leggings_stainless.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_leggings_tin.png
b/technic_armor/textures/technic_armor_inv_leggings_tin.png
deleted file mode 100644
index dab14cf..0000000
Binary files a/technic_armor/textures/technic_armor_inv_leggings_tin.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_shield_brass.png
b/technic_armor/textures/technic_armor_inv_shield_brass.png
deleted file mode 100644
index 42e9fea..0000000
Binary files a/technic_armor/textures/technic_armor_inv_shield_brass.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_shield_carbon.png
b/technic_armor/textures/technic_armor_inv_shield_carbon.png
deleted file mode 100644
index 9fe96b0..0000000
Binary files a/technic_armor/textures/technic_armor_inv_shield_carbon.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_shield_cast.png
b/technic_armor/textures/technic_armor_inv_shield_cast.png
deleted file mode 100644
index f359686..0000000
Binary files a/technic_armor/textures/technic_armor_inv_shield_cast.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_shield_lead.png
b/technic_armor/textures/technic_armor_inv_shield_lead.png
deleted file mode 100644
index 633528f..0000000
Binary files a/technic_armor/textures/technic_armor_inv_shield_lead.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_shield_silver.png
b/technic_armor/textures/technic_armor_inv_shield_silver.png
deleted file mode 100644
index 4efbac6..0000000
Binary files a/technic_armor/textures/technic_armor_inv_shield_silver.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_shield_stainless.png
b/technic_armor/textures/technic_armor_inv_shield_stainless.png
deleted file mode 100644
index 40dddb5..0000000
Binary files a/technic_armor/textures/technic_armor_inv_shield_stainless.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_inv_shield_tin.png
b/technic_armor/textures/technic_armor_inv_shield_tin.png
deleted file mode 100644
index 1d559f9..0000000
Binary files a/technic_armor/textures/technic_armor_inv_shield_tin.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_leggings_brass.png
b/technic_armor/textures/technic_armor_leggings_brass.png
deleted file mode 100644
index 4fdea7a..0000000
Binary files a/technic_armor/textures/technic_armor_leggings_brass.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_leggings_brass_preview.png
b/technic_armor/textures/technic_armor_leggings_brass_preview.png
deleted file mode 100644
index adad003..0000000
Binary files a/technic_armor/textures/technic_armor_leggings_brass_preview.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_leggings_carbon.png
b/technic_armor/textures/technic_armor_leggings_carbon.png
deleted file mode 100644
index 1925292..0000000
Binary files a/technic_armor/textures/technic_armor_leggings_carbon.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_leggings_carbon_preview.png
b/technic_armor/textures/technic_armor_leggings_carbon_preview.png
deleted file mode 100644
index b65d7a6..0000000
Binary files a/technic_armor/textures/technic_armor_leggings_carbon_preview.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_leggings_cast.png
b/technic_armor/textures/technic_armor_leggings_cast.png
deleted file mode 100644
index 91f3f48..0000000
Binary files a/technic_armor/textures/technic_armor_leggings_cast.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_leggings_cast_preview.png
b/technic_armor/textures/technic_armor_leggings_cast_preview.png
deleted file mode 100644
index 4d9f723..0000000
Binary files a/technic_armor/textures/technic_armor_leggings_cast_preview.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_leggings_lead.png
b/technic_armor/textures/technic_armor_leggings_lead.png
deleted file mode 100644
index d15b560..0000000
Binary files a/technic_armor/textures/technic_armor_leggings_lead.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_leggings_lead_preview.png
b/technic_armor/textures/technic_armor_leggings_lead_preview.png
deleted file mode 100644
index e2bd330..0000000
Binary files a/technic_armor/textures/technic_armor_leggings_lead_preview.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_leggings_silver.png
b/technic_armor/textures/technic_armor_leggings_silver.png
deleted file mode 100644
index 22518e4..0000000
Binary files a/technic_armor/textures/technic_armor_leggings_silver.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_leggings_silver_preview.png
b/technic_armor/textures/technic_armor_leggings_silver_preview.png
deleted file mode 100644
index ebe8914..0000000
Binary files a/technic_armor/textures/technic_armor_leggings_silver_preview.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_leggings_stainless.png
b/technic_armor/textures/technic_armor_leggings_stainless.png
deleted file mode 100644
index 7b9c43c..0000000
Binary files a/technic_armor/textures/technic_armor_leggings_stainless.png and
/dev/null differ
diff --git
a/technic_armor/textures/technic_armor_leggings_stainless_preview.png
b/technic_armor/textures/technic_armor_leggings_stainless_preview.png
deleted file mode 100644
index 7224231..0000000
Binary files
a/technic_armor/textures/technic_armor_leggings_stainless_preview.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_leggings_tin.png
b/technic_armor/textures/technic_armor_leggings_tin.png
deleted file mode 100644
index 9ad2e74..0000000
Binary files a/technic_armor/textures/technic_armor_leggings_tin.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_leggings_tin_preview.png
b/technic_armor/textures/technic_armor_leggings_tin_preview.png
deleted file mode 100644
index 244c321..0000000
Binary files a/technic_armor/textures/technic_armor_leggings_tin_preview.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_shield_brass.png
b/technic_armor/textures/technic_armor_shield_brass.png
deleted file mode 100644
index 85e7f55..0000000
Binary files a/technic_armor/textures/technic_armor_shield_brass.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_shield_brass_preview.png
b/technic_armor/textures/technic_armor_shield_brass_preview.png
deleted file mode 100644
index dffd356..0000000
Binary files a/technic_armor/textures/technic_armor_shield_brass_preview.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_shield_carbon.png
b/technic_armor/textures/technic_armor_shield_carbon.png
deleted file mode 100644
index 1a16c8c..0000000
Binary files a/technic_armor/textures/technic_armor_shield_carbon.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_shield_carbon_preview.png
b/technic_armor/textures/technic_armor_shield_carbon_preview.png
deleted file mode 100644
index 0fe4cdc..0000000
Binary files a/technic_armor/textures/technic_armor_shield_carbon_preview.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_shield_cast.png
b/technic_armor/textures/technic_armor_shield_cast.png
deleted file mode 100644
index f41e9a2..0000000
Binary files a/technic_armor/textures/technic_armor_shield_cast.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_shield_cast_preview.png
b/technic_armor/textures/technic_armor_shield_cast_preview.png
deleted file mode 100644
index 9820ce9..0000000
Binary files a/technic_armor/textures/technic_armor_shield_cast_preview.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_shield_lead.png
b/technic_armor/textures/technic_armor_shield_lead.png
deleted file mode 100644
index 89d9fdb..0000000
Binary files a/technic_armor/textures/technic_armor_shield_lead.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_shield_lead_preview.png
b/technic_armor/textures/technic_armor_shield_lead_preview.png
deleted file mode 100644
index 6520808..0000000
Binary files a/technic_armor/textures/technic_armor_shield_lead_preview.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_shield_silver.png
b/technic_armor/textures/technic_armor_shield_silver.png
deleted file mode 100644
index 42cc5b1..0000000
Binary files a/technic_armor/textures/technic_armor_shield_silver.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_shield_silver_preview.png
b/technic_armor/textures/technic_armor_shield_silver_preview.png
deleted file mode 100644
index 446fdee..0000000
Binary files a/technic_armor/textures/technic_armor_shield_silver_preview.png
and /dev/null differ
diff --git a/technic_armor/textures/technic_armor_shield_stainless.png
b/technic_armor/textures/technic_armor_shield_stainless.png
deleted file mode 100644
index f7878f9..0000000
Binary files a/technic_armor/textures/technic_armor_shield_stainless.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_shield_stainless_preview.png
b/technic_armor/textures/technic_armor_shield_stainless_preview.png
deleted file mode 100644
index 6bba8d4..0000000
Binary files
a/technic_armor/textures/technic_armor_shield_stainless_preview.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_shield_tin.png
b/technic_armor/textures/technic_armor_shield_tin.png
deleted file mode 100644
index 0538e51..0000000
Binary files a/technic_armor/textures/technic_armor_shield_tin.png and
/dev/null differ
diff --git a/technic_armor/textures/technic_armor_shield_tin_preview.png
b/technic_armor/textures/technic_armor_shield_tin_preview.png
deleted file mode 100644
index ef32164..0000000
Binary files a/technic_armor/textures/technic_armor_shield_tin_preview.png and
/dev/null differ
diff --git a/wieldview/LICENSE.txt b/wieldview/LICENSE.txt
index 4e8d524..fff42d8 100644
--- a/wieldview/LICENSE.txt
+++ b/wieldview/LICENSE.txt
@@ -1,5 +1,5 @@
[mod] visible wielded items [wieldview]
=======================================
-License Source Code: Copyright (C) 2013-2017 Stuart Jones - LGPL v2.1
+License Source Code: Copyright (C) 2013-2018 Stuart Jones - LGPL v2.1
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/minetest-mod-3d-armor.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
