diff --git a/.github/workflows/luacheck.yml b/.github/workflows/luacheck.yml new file mode 100644 index 0000000..a13efa9 --- /dev/null +++ b/.github/workflows/luacheck.yml @@ -0,0 +1,13 @@ +name: luacheck +on: [push, pull_request] +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - name: apt + run: sudo apt-get install -y luarocks + - name: luacheck install + run: luarocks install --local luacheck + - name: luacheck run + run: $HOME/.luarocks/bin/luacheck ./ diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 23de171..0000000 --- a/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -## Generic ignorable patterns and files -*~ -.*.swp -*bak* -tags -*.vim - -## Eclipse project files & directories -.project -.settings diff --git a/.luacheckrc b/.luacheckrc new file mode 100644 index 0000000..4950c49 --- /dev/null +++ b/.luacheckrc @@ -0,0 +1,4 @@ +globals = { + "armor", + "minetest", +} diff --git a/LICENSE.txt b/LICENSE.txt index 00d2545..7980686 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,7 +1,4 @@ -[mod] Technic Armor [technic_armor] -=================================== - License Source Code: Copyright (C) 2013-2018 Stuart Jones - LGPL v2.1 -License Textures: poet.nohit and numberZero - 2015-2018 WTFPL +License Textures: poet-nohit and numberZero - 2015-2018 WTFPL diff --git a/README.md b/README.md new file mode 100644 index 0000000..ee0aaee --- /dev/null +++ b/README.md @@ -0,0 +1,9 @@ +# Technic Armor [technic_armor] + +[![luacheck](https://github.com/mt-mods/technic_armor/workflows/luacheck/badge.svg)](https://github.com/mt-mods/technic_armor/actions) + +Adds armor made from lead, brass, cast iron, carbon steel, stainless steel, tin and silver. + +![](screenshot.png?raw=true) + +Textures by @poet-nohit and @numberZero diff --git a/README.txt b/README.txt deleted file mode 100644 index 76a88eb..0000000 --- a/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/depends.txt b/depends.txt deleted file mode 100644 index 9ccefed..0000000 --- a/depends.txt +++ /dev/null @@ -1,3 +0,0 @@ -3d_armor -technic_worldgen? -moreores? diff --git a/description.txt b/description.txt deleted file mode 100644 index 5738c4f..0000000 --- a/description.txt +++ /dev/null @@ -1 +0,0 @@ -Adds tin, silver and technic materials to 3d_armor. diff --git a/init.lua b/init.lua index bf52930..f5e4f46 100644 --- a/init.lua +++ b/init.lua @@ -1,66 +1,148 @@ --- support for i18n -local S = armor.get_translator -local F = minetest.formspec_escape +-- Use 3d_armor translator to take advantage of existing translations for armor parts +local S = minetest.get_translator("3d_armor") -if not minetest.get_modpath("technic_worldgen") then - minetest.log("warning", S("technic_armor: Mod loaded but unused.")) - return +local materials = {} + +if minetest.get_modpath("technic_worldgen") then + materials.lead = { + name = S("Lead"), + craft_item = "technic:lead_ingot", + armor = 1.6, + heal = 0, + use = 500, + radiation = 88 + } + materials.brass = { + name = S("Brass"), + craft_item = "technic:brass_ingot", + armor = 1.8, + heal = 0, + use = 650, + radiation = 43 + } + materials.cast = { + name = S("Cast Iron"), + craft_item = "technic:cast_iron_ingot", + armor = 2.5, + heal = 8, + use = 200, + radiation = 40 + } + materials.carbon = { + name = S("Carbon Steel"), + craft_item = "technic:carbon_steel_ingot", + armor = 2.7, + heal = 10, + use = 100, + radiation = 40 + } + materials.stainless = { + name = S("Stainless Steel"), + craft_item = "technic:stainless_steel_ingot", + armor = 2.7, + heal = 10, + use = 75, + radiation = 40 + } +end + +local tin_ingot + +if minetest.registered_items["default:tin_ingot"] then + tin_ingot = "default:tin_ingot" 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 } + tin_ingot = "moreores:tin_ingot" + materials.silver = { + name = S("Silver"), + craft_item = "moreores:silver_ingot", + armor = 1.8, + heal = 6, + use = 650, + radiation = 53 + } +end + +if tin_ingot then + materials.tin = { + name = S("Tin"), + craft_item = tin_ingot, + armor = 1.6, + heal = 0, + use = 750, + radiation = 37 + } 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}} }, + helmet = { + name = S("Helmet"), + place = "head", + level = 5, + radlevel = 0.10, + craft = {{1, 1, 1}, {1, 0, 1}} + }, + chestplate = { + name = S("Chestplate"), + place = "torso", + level = 8, + radlevel = 0.35, + craft = {{1, 0, 1}, {1, 1, 1}, {1, 1, 1}} + }, + leggings = { + name = S("Leggings"), + place = "legs", + level = 7, + radlevel = 0.15, + craft = {{1, 1, 1}, {1, 0, 1}, {1, 0, 1}} + }, + boots = { + name = S("Boots"), + place = "feet", + 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}} } + parts.shield = { + name = S("Shield"), + place = "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 function make_recipe(template, material) 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 + for i, row in ipairs(template) do + recipe[i] = {} + for j, item in ipairs(row) do + recipe[i][j] = item == 0 and "" or material 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, +for material, m in pairs(materials) do + for part, p in pairs(parts) do + local name = "technic_armor:"..part.."_"..material + armor:register_armor(name, { + description = S("@1 @2", m.name, p.name), + inventory_image = "technic_armor_inv_"..part.."_"..material..".png", + groups = { + ["armor_"..p.place] = math.floor(p.level * m.armor), + armor_heal = m.heal, + armor_use = m.use, + armor_radiation = math.floor(p.radlevel * m.radiation) + } }) minetest.register_craft({ - output = partname, - recipe = make_recipe(part.craft, {armor.material}), + output = name, + recipe = make_recipe(p.craft, m.craft_item), }) end end diff --git a/mod.conf b/mod.conf new file mode 100644 index 0000000..1cc8c00 --- /dev/null +++ b/mod.conf @@ -0,0 +1,4 @@ +name = technic_armor +description = Adds armor made from lead, brass, cast iron, carbon steel, stainless steel, tin and silver +depends = 3d_armor +optional_depends = default, moreores, technic_worldgen diff --git a/screenshot.png b/screenshot.png new file mode 100644 index 0000000..e5a6ae7 Binary files /dev/null and b/screenshot.png differ diff --git a/textures/preview_index.txt b/textures/preview_index.txt deleted file mode 100644 index e39a0b6..0000000 --- a/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/textures/technic_armor_boots_brass.png b/textures/technic_armor_boots_brass.png index 0f6e822..1bcd6a3 100644 Binary files a/textures/technic_armor_boots_brass.png and b/textures/technic_armor_boots_brass.png differ diff --git a/textures/technic_armor_boots_brass_preview.png b/textures/technic_armor_boots_brass_preview.png index 0f9f6f7..694a34a 100644 Binary files a/textures/technic_armor_boots_brass_preview.png and b/textures/technic_armor_boots_brass_preview.png differ diff --git a/textures/technic_armor_boots_carbon.png b/textures/technic_armor_boots_carbon.png index 0002401..4939bf2 100644 Binary files a/textures/technic_armor_boots_carbon.png and b/textures/technic_armor_boots_carbon.png differ diff --git a/textures/technic_armor_boots_carbon_preview.png b/textures/technic_armor_boots_carbon_preview.png index 98dfe59..ae5c1f5 100644 Binary files a/textures/technic_armor_boots_carbon_preview.png and b/textures/technic_armor_boots_carbon_preview.png differ diff --git a/textures/technic_armor_boots_cast.png b/textures/technic_armor_boots_cast.png index b0bfd55..2fbec9b 100644 Binary files a/textures/technic_armor_boots_cast.png and b/textures/technic_armor_boots_cast.png differ diff --git a/textures/technic_armor_boots_cast_preview.png b/textures/technic_armor_boots_cast_preview.png index 2a1cdba..b8b70b9 100644 Binary files a/textures/technic_armor_boots_cast_preview.png and b/textures/technic_armor_boots_cast_preview.png differ diff --git a/textures/technic_armor_boots_lead.png b/textures/technic_armor_boots_lead.png index 05eff68..55342c9 100644 Binary files a/textures/technic_armor_boots_lead.png and b/textures/technic_armor_boots_lead.png differ diff --git a/textures/technic_armor_boots_lead_preview.png b/textures/technic_armor_boots_lead_preview.png index fde3271..58d9d66 100644 Binary files a/textures/technic_armor_boots_lead_preview.png and b/textures/technic_armor_boots_lead_preview.png differ diff --git a/textures/technic_armor_boots_silver.png b/textures/technic_armor_boots_silver.png index 18b296e..4e0e701 100644 Binary files a/textures/technic_armor_boots_silver.png and b/textures/technic_armor_boots_silver.png differ diff --git a/textures/technic_armor_boots_silver_preview.png b/textures/technic_armor_boots_silver_preview.png index a1c56ed..4d046e4 100644 Binary files a/textures/technic_armor_boots_silver_preview.png and b/textures/technic_armor_boots_silver_preview.png differ diff --git a/textures/technic_armor_boots_stainless.png b/textures/technic_armor_boots_stainless.png index e35dc42..649a351 100644 Binary files a/textures/technic_armor_boots_stainless.png and b/textures/technic_armor_boots_stainless.png differ diff --git a/textures/technic_armor_boots_stainless_preview.png b/textures/technic_armor_boots_stainless_preview.png index 500c8ad..6382a41 100644 Binary files a/textures/technic_armor_boots_stainless_preview.png and b/textures/technic_armor_boots_stainless_preview.png differ diff --git a/textures/technic_armor_boots_tin.png b/textures/technic_armor_boots_tin.png index bd19ee1..c797137 100644 Binary files a/textures/technic_armor_boots_tin.png and b/textures/technic_armor_boots_tin.png differ diff --git a/textures/technic_armor_boots_tin_preview.png b/textures/technic_armor_boots_tin_preview.png index 52763fa..67f682e 100644 Binary files a/textures/technic_armor_boots_tin_preview.png and b/textures/technic_armor_boots_tin_preview.png differ diff --git a/textures/technic_armor_chestplate_brass.png b/textures/technic_armor_chestplate_brass.png index 09acd52..66cdd30 100644 Binary files a/textures/technic_armor_chestplate_brass.png and b/textures/technic_armor_chestplate_brass.png differ diff --git a/textures/technic_armor_chestplate_brass_preview.png b/textures/technic_armor_chestplate_brass_preview.png index 5f8c044..3d2e7aa 100644 Binary files a/textures/technic_armor_chestplate_brass_preview.png and b/textures/technic_armor_chestplate_brass_preview.png differ diff --git a/textures/technic_armor_chestplate_carbon.png b/textures/technic_armor_chestplate_carbon.png index 581d5d7..21747ba 100644 Binary files a/textures/technic_armor_chestplate_carbon.png and b/textures/technic_armor_chestplate_carbon.png differ diff --git a/textures/technic_armor_chestplate_carbon_preview.png b/textures/technic_armor_chestplate_carbon_preview.png index 73fd662..3e92c0e 100644 Binary files a/textures/technic_armor_chestplate_carbon_preview.png and b/textures/technic_armor_chestplate_carbon_preview.png differ diff --git a/textures/technic_armor_chestplate_cast.png b/textures/technic_armor_chestplate_cast.png index 3e5f743..409f239 100644 Binary files a/textures/technic_armor_chestplate_cast.png and b/textures/technic_armor_chestplate_cast.png differ diff --git a/textures/technic_armor_chestplate_cast_preview.png b/textures/technic_armor_chestplate_cast_preview.png index e4c85d8..3701499 100644 Binary files a/textures/technic_armor_chestplate_cast_preview.png and b/textures/technic_armor_chestplate_cast_preview.png differ diff --git a/textures/technic_armor_chestplate_lead.png b/textures/technic_armor_chestplate_lead.png index 1b39c9f..8a13373 100644 Binary files a/textures/technic_armor_chestplate_lead.png and b/textures/technic_armor_chestplate_lead.png differ diff --git a/textures/technic_armor_chestplate_lead_preview.png b/textures/technic_armor_chestplate_lead_preview.png index 2142d2e..dade321 100644 Binary files a/textures/technic_armor_chestplate_lead_preview.png and b/textures/technic_armor_chestplate_lead_preview.png differ diff --git a/textures/technic_armor_chestplate_silver.png b/textures/technic_armor_chestplate_silver.png index 4b6f0fa..0155edb 100644 Binary files a/textures/technic_armor_chestplate_silver.png and b/textures/technic_armor_chestplate_silver.png differ diff --git a/textures/technic_armor_chestplate_silver_preview.png b/textures/technic_armor_chestplate_silver_preview.png index 1ae19e7..cf99a60 100644 Binary files a/textures/technic_armor_chestplate_silver_preview.png and b/textures/technic_armor_chestplate_silver_preview.png differ diff --git a/textures/technic_armor_chestplate_stainless.png b/textures/technic_armor_chestplate_stainless.png index 802aaa6..dc6899b 100644 Binary files a/textures/technic_armor_chestplate_stainless.png and b/textures/technic_armor_chestplate_stainless.png differ diff --git a/textures/technic_armor_chestplate_stainless_preview.png b/textures/technic_armor_chestplate_stainless_preview.png index f63ea19..28362c1 100644 Binary files a/textures/technic_armor_chestplate_stainless_preview.png and b/textures/technic_armor_chestplate_stainless_preview.png differ diff --git a/textures/technic_armor_chestplate_tin.png b/textures/technic_armor_chestplate_tin.png index 907725b..20f92eb 100644 Binary files a/textures/technic_armor_chestplate_tin.png and b/textures/technic_armor_chestplate_tin.png differ diff --git a/textures/technic_armor_chestplate_tin_preview.png b/textures/technic_armor_chestplate_tin_preview.png index 6732b18..fe41eb2 100644 Binary files a/textures/technic_armor_chestplate_tin_preview.png and b/textures/technic_armor_chestplate_tin_preview.png differ diff --git a/textures/technic_armor_helmet_brass.png b/textures/technic_armor_helmet_brass.png index 3e3e378..013455f 100644 Binary files a/textures/technic_armor_helmet_brass.png and b/textures/technic_armor_helmet_brass.png differ diff --git a/textures/technic_armor_helmet_brass_preview.png b/textures/technic_armor_helmet_brass_preview.png index 8afdabf..6fa279f 100644 Binary files a/textures/technic_armor_helmet_brass_preview.png and b/textures/technic_armor_helmet_brass_preview.png differ diff --git a/textures/technic_armor_helmet_carbon.png b/textures/technic_armor_helmet_carbon.png index dbbd5f7..217a8b5 100644 Binary files a/textures/technic_armor_helmet_carbon.png and b/textures/technic_armor_helmet_carbon.png differ diff --git a/textures/technic_armor_helmet_carbon_preview.png b/textures/technic_armor_helmet_carbon_preview.png index 243770d..afa184a 100644 Binary files a/textures/technic_armor_helmet_carbon_preview.png and b/textures/technic_armor_helmet_carbon_preview.png differ diff --git a/textures/technic_armor_helmet_cast.png b/textures/technic_armor_helmet_cast.png index 2fffc0d..77ac6c6 100644 Binary files a/textures/technic_armor_helmet_cast.png and b/textures/technic_armor_helmet_cast.png differ diff --git a/textures/technic_armor_helmet_cast_preview.png b/textures/technic_armor_helmet_cast_preview.png index 12867ac..74b26ba 100644 Binary files a/textures/technic_armor_helmet_cast_preview.png and b/textures/technic_armor_helmet_cast_preview.png differ diff --git a/textures/technic_armor_helmet_lead.png b/textures/technic_armor_helmet_lead.png index dee6eec..f2f92cc 100644 Binary files a/textures/technic_armor_helmet_lead.png and b/textures/technic_armor_helmet_lead.png differ diff --git a/textures/technic_armor_helmet_lead_preview.png b/textures/technic_armor_helmet_lead_preview.png index 4fb5c27..bd3305f 100644 Binary files a/textures/technic_armor_helmet_lead_preview.png and b/textures/technic_armor_helmet_lead_preview.png differ diff --git a/textures/technic_armor_helmet_silver.png b/textures/technic_armor_helmet_silver.png index 7244f69..4248dcd 100644 Binary files a/textures/technic_armor_helmet_silver.png and b/textures/technic_armor_helmet_silver.png differ diff --git a/textures/technic_armor_helmet_silver_preview.png b/textures/technic_armor_helmet_silver_preview.png index 7639027..d165021 100644 Binary files a/textures/technic_armor_helmet_silver_preview.png and b/textures/technic_armor_helmet_silver_preview.png differ diff --git a/textures/technic_armor_helmet_stainless.png b/textures/technic_armor_helmet_stainless.png index e662b7e..7bacd46 100644 Binary files a/textures/technic_armor_helmet_stainless.png and b/textures/technic_armor_helmet_stainless.png differ diff --git a/textures/technic_armor_helmet_stainless_preview.png b/textures/technic_armor_helmet_stainless_preview.png index ae20233..7261984 100644 Binary files a/textures/technic_armor_helmet_stainless_preview.png and b/textures/technic_armor_helmet_stainless_preview.png differ diff --git a/textures/technic_armor_helmet_tin.png b/textures/technic_armor_helmet_tin.png index d12c593..b033d69 100644 Binary files a/textures/technic_armor_helmet_tin.png and b/textures/technic_armor_helmet_tin.png differ diff --git a/textures/technic_armor_helmet_tin_preview.png b/textures/technic_armor_helmet_tin_preview.png index 1f5c040..29cd5af 100644 Binary files a/textures/technic_armor_helmet_tin_preview.png and b/textures/technic_armor_helmet_tin_preview.png differ diff --git a/textures/technic_armor_inv_boots_brass.png b/textures/technic_armor_inv_boots_brass.png index 386a0b4..c0adffc 100644 Binary files a/textures/technic_armor_inv_boots_brass.png and b/textures/technic_armor_inv_boots_brass.png differ diff --git a/textures/technic_armor_inv_boots_carbon.png b/textures/technic_armor_inv_boots_carbon.png index 0ec5008..0e4dc76 100644 Binary files a/textures/technic_armor_inv_boots_carbon.png and b/textures/technic_armor_inv_boots_carbon.png differ diff --git a/textures/technic_armor_inv_boots_cast.png b/textures/technic_armor_inv_boots_cast.png index 7f05b93..c944f08 100644 Binary files a/textures/technic_armor_inv_boots_cast.png and b/textures/technic_armor_inv_boots_cast.png differ diff --git a/textures/technic_armor_inv_boots_lead.png b/textures/technic_armor_inv_boots_lead.png index 6b98300..f18ae14 100644 Binary files a/textures/technic_armor_inv_boots_lead.png and b/textures/technic_armor_inv_boots_lead.png differ diff --git a/textures/technic_armor_inv_boots_silver.png b/textures/technic_armor_inv_boots_silver.png index 595a138..0b2e39b 100644 Binary files a/textures/technic_armor_inv_boots_silver.png and b/textures/technic_armor_inv_boots_silver.png differ diff --git a/textures/technic_armor_inv_boots_stainless.png b/textures/technic_armor_inv_boots_stainless.png index f3c0832..1088d24 100644 Binary files a/textures/technic_armor_inv_boots_stainless.png and b/textures/technic_armor_inv_boots_stainless.png differ diff --git a/textures/technic_armor_inv_boots_tin.png b/textures/technic_armor_inv_boots_tin.png index 17dd7d9..ecedc8c 100644 Binary files a/textures/technic_armor_inv_boots_tin.png and b/textures/technic_armor_inv_boots_tin.png differ diff --git a/textures/technic_armor_inv_chestplate_brass.png b/textures/technic_armor_inv_chestplate_brass.png index f37c441..9ec16b6 100644 Binary files a/textures/technic_armor_inv_chestplate_brass.png and b/textures/technic_armor_inv_chestplate_brass.png differ diff --git a/textures/technic_armor_inv_chestplate_carbon.png b/textures/technic_armor_inv_chestplate_carbon.png index b65a494..b0576da 100644 Binary files a/textures/technic_armor_inv_chestplate_carbon.png and b/textures/technic_armor_inv_chestplate_carbon.png differ diff --git a/textures/technic_armor_inv_chestplate_cast.png b/textures/technic_armor_inv_chestplate_cast.png index ab07e33..c42a6b4 100644 Binary files a/textures/technic_armor_inv_chestplate_cast.png and b/textures/technic_armor_inv_chestplate_cast.png differ diff --git a/textures/technic_armor_inv_chestplate_lead.png b/textures/technic_armor_inv_chestplate_lead.png index 5d996b7..257bfe4 100644 Binary files a/textures/technic_armor_inv_chestplate_lead.png and b/textures/technic_armor_inv_chestplate_lead.png differ diff --git a/textures/technic_armor_inv_chestplate_silver.png b/textures/technic_armor_inv_chestplate_silver.png index 989f66a..46bbf0b 100644 Binary files a/textures/technic_armor_inv_chestplate_silver.png and b/textures/technic_armor_inv_chestplate_silver.png differ diff --git a/textures/technic_armor_inv_chestplate_stainless.png b/textures/technic_armor_inv_chestplate_stainless.png index 792782e..4d3a95c 100644 Binary files a/textures/technic_armor_inv_chestplate_stainless.png and b/textures/technic_armor_inv_chestplate_stainless.png differ diff --git a/textures/technic_armor_inv_chestplate_tin.png b/textures/technic_armor_inv_chestplate_tin.png index 3218188..4a9771e 100644 Binary files a/textures/technic_armor_inv_chestplate_tin.png and b/textures/technic_armor_inv_chestplate_tin.png differ diff --git a/textures/technic_armor_inv_helmet_brass.png b/textures/technic_armor_inv_helmet_brass.png index 1538cd1..e45a32b 100644 Binary files a/textures/technic_armor_inv_helmet_brass.png and b/textures/technic_armor_inv_helmet_brass.png differ diff --git a/textures/technic_armor_inv_helmet_carbon.png b/textures/technic_armor_inv_helmet_carbon.png index 0556bdc..7495cf0 100644 Binary files a/textures/technic_armor_inv_helmet_carbon.png and b/textures/technic_armor_inv_helmet_carbon.png differ diff --git a/textures/technic_armor_inv_helmet_cast.png b/textures/technic_armor_inv_helmet_cast.png index b01edbc..34d3d96 100644 Binary files a/textures/technic_armor_inv_helmet_cast.png and b/textures/technic_armor_inv_helmet_cast.png differ diff --git a/textures/technic_armor_inv_helmet_lead.png b/textures/technic_armor_inv_helmet_lead.png index 28d0237..2e568fb 100644 Binary files a/textures/technic_armor_inv_helmet_lead.png and b/textures/technic_armor_inv_helmet_lead.png differ diff --git a/textures/technic_armor_inv_helmet_silver.png b/textures/technic_armor_inv_helmet_silver.png index 07464a6..4d050d4 100644 Binary files a/textures/technic_armor_inv_helmet_silver.png and b/textures/technic_armor_inv_helmet_silver.png differ diff --git a/textures/technic_armor_inv_helmet_stainless.png b/textures/technic_armor_inv_helmet_stainless.png index 32e0064..79730dd 100644 Binary files a/textures/technic_armor_inv_helmet_stainless.png and b/textures/technic_armor_inv_helmet_stainless.png differ diff --git a/textures/technic_armor_inv_helmet_tin.png b/textures/technic_armor_inv_helmet_tin.png index d691d27..65fbabd 100644 Binary files a/textures/technic_armor_inv_helmet_tin.png and b/textures/technic_armor_inv_helmet_tin.png differ diff --git a/textures/technic_armor_inv_leggings_brass.png b/textures/technic_armor_inv_leggings_brass.png index 9457cf1..050130c 100644 Binary files a/textures/technic_armor_inv_leggings_brass.png and b/textures/technic_armor_inv_leggings_brass.png differ diff --git a/textures/technic_armor_inv_leggings_carbon.png b/textures/technic_armor_inv_leggings_carbon.png index e18bcc2..fd3c670 100644 Binary files a/textures/technic_armor_inv_leggings_carbon.png and b/textures/technic_armor_inv_leggings_carbon.png differ diff --git a/textures/technic_armor_inv_leggings_cast.png b/textures/technic_armor_inv_leggings_cast.png index 612a4b6..bf8851b 100644 Binary files a/textures/technic_armor_inv_leggings_cast.png and b/textures/technic_armor_inv_leggings_cast.png differ diff --git a/textures/technic_armor_inv_leggings_lead.png b/textures/technic_armor_inv_leggings_lead.png index c8bb05e..8681ab2 100644 Binary files a/textures/technic_armor_inv_leggings_lead.png and b/textures/technic_armor_inv_leggings_lead.png differ diff --git a/textures/technic_armor_inv_leggings_silver.png b/textures/technic_armor_inv_leggings_silver.png index 995f137..fce7956 100644 Binary files a/textures/technic_armor_inv_leggings_silver.png and b/textures/technic_armor_inv_leggings_silver.png differ diff --git a/textures/technic_armor_inv_leggings_stainless.png b/textures/technic_armor_inv_leggings_stainless.png index 81ba007..d321b45 100644 Binary files a/textures/technic_armor_inv_leggings_stainless.png and b/textures/technic_armor_inv_leggings_stainless.png differ diff --git a/textures/technic_armor_inv_leggings_tin.png b/textures/technic_armor_inv_leggings_tin.png index dab14cf..d30c5fd 100644 Binary files a/textures/technic_armor_inv_leggings_tin.png and b/textures/technic_armor_inv_leggings_tin.png differ diff --git a/textures/technic_armor_inv_shield_brass.png b/textures/technic_armor_inv_shield_brass.png index 42e9fea..8f98432 100644 Binary files a/textures/technic_armor_inv_shield_brass.png and b/textures/technic_armor_inv_shield_brass.png differ diff --git a/textures/technic_armor_inv_shield_carbon.png b/textures/technic_armor_inv_shield_carbon.png index 9fe96b0..2f2fd6d 100644 Binary files a/textures/technic_armor_inv_shield_carbon.png and b/textures/technic_armor_inv_shield_carbon.png differ diff --git a/textures/technic_armor_inv_shield_cast.png b/textures/technic_armor_inv_shield_cast.png index f359686..2e662c1 100644 Binary files a/textures/technic_armor_inv_shield_cast.png and b/textures/technic_armor_inv_shield_cast.png differ diff --git a/textures/technic_armor_inv_shield_lead.png b/textures/technic_armor_inv_shield_lead.png index 633528f..9d0ea35 100644 Binary files a/textures/technic_armor_inv_shield_lead.png and b/textures/technic_armor_inv_shield_lead.png differ diff --git a/textures/technic_armor_inv_shield_silver.png b/textures/technic_armor_inv_shield_silver.png index 4efbac6..a497fe6 100644 Binary files a/textures/technic_armor_inv_shield_silver.png and b/textures/technic_armor_inv_shield_silver.png differ diff --git a/textures/technic_armor_inv_shield_stainless.png b/textures/technic_armor_inv_shield_stainless.png index 40dddb5..46122ac 100644 Binary files a/textures/technic_armor_inv_shield_stainless.png and b/textures/technic_armor_inv_shield_stainless.png differ diff --git a/textures/technic_armor_inv_shield_tin.png b/textures/technic_armor_inv_shield_tin.png index 1d559f9..03137bb 100644 Binary files a/textures/technic_armor_inv_shield_tin.png and b/textures/technic_armor_inv_shield_tin.png differ diff --git a/textures/technic_armor_leggings_brass.png b/textures/technic_armor_leggings_brass.png index 4fdea7a..d93c8f6 100644 Binary files a/textures/technic_armor_leggings_brass.png and b/textures/technic_armor_leggings_brass.png differ diff --git a/textures/technic_armor_leggings_brass_preview.png b/textures/technic_armor_leggings_brass_preview.png index adad003..2393ab4 100644 Binary files a/textures/technic_armor_leggings_brass_preview.png and b/textures/technic_armor_leggings_brass_preview.png differ diff --git a/textures/technic_armor_leggings_carbon.png b/textures/technic_armor_leggings_carbon.png index 1925292..c803285 100644 Binary files a/textures/technic_armor_leggings_carbon.png and b/textures/technic_armor_leggings_carbon.png differ diff --git a/textures/technic_armor_leggings_carbon_preview.png b/textures/technic_armor_leggings_carbon_preview.png index b65d7a6..1ca9412 100644 Binary files a/textures/technic_armor_leggings_carbon_preview.png and b/textures/technic_armor_leggings_carbon_preview.png differ diff --git a/textures/technic_armor_leggings_cast.png b/textures/technic_armor_leggings_cast.png index 91f3f48..f77e1be 100644 Binary files a/textures/technic_armor_leggings_cast.png and b/textures/technic_armor_leggings_cast.png differ diff --git a/textures/technic_armor_leggings_cast_preview.png b/textures/technic_armor_leggings_cast_preview.png index 4d9f723..4966281 100644 Binary files a/textures/technic_armor_leggings_cast_preview.png and b/textures/technic_armor_leggings_cast_preview.png differ diff --git a/textures/technic_armor_leggings_lead.png b/textures/technic_armor_leggings_lead.png index d15b560..2d3394f 100644 Binary files a/textures/technic_armor_leggings_lead.png and b/textures/technic_armor_leggings_lead.png differ diff --git a/textures/technic_armor_leggings_lead_preview.png b/textures/technic_armor_leggings_lead_preview.png index e2bd330..ed1dd37 100644 Binary files a/textures/technic_armor_leggings_lead_preview.png and b/textures/technic_armor_leggings_lead_preview.png differ diff --git a/textures/technic_armor_leggings_silver.png b/textures/technic_armor_leggings_silver.png index 22518e4..5ed134d 100644 Binary files a/textures/technic_armor_leggings_silver.png and b/textures/technic_armor_leggings_silver.png differ diff --git a/textures/technic_armor_leggings_silver_preview.png b/textures/technic_armor_leggings_silver_preview.png index ebe8914..d0a1e4e 100644 Binary files a/textures/technic_armor_leggings_silver_preview.png and b/textures/technic_armor_leggings_silver_preview.png differ diff --git a/textures/technic_armor_leggings_stainless.png b/textures/technic_armor_leggings_stainless.png index 7b9c43c..f1e643d 100644 Binary files a/textures/technic_armor_leggings_stainless.png and b/textures/technic_armor_leggings_stainless.png differ diff --git a/textures/technic_armor_leggings_stainless_preview.png b/textures/technic_armor_leggings_stainless_preview.png index 7224231..b41df67 100644 Binary files a/textures/technic_armor_leggings_stainless_preview.png and b/textures/technic_armor_leggings_stainless_preview.png differ diff --git a/textures/technic_armor_leggings_tin.png b/textures/technic_armor_leggings_tin.png index 9ad2e74..6906a62 100644 Binary files a/textures/technic_armor_leggings_tin.png and b/textures/technic_armor_leggings_tin.png differ diff --git a/textures/technic_armor_leggings_tin_preview.png b/textures/technic_armor_leggings_tin_preview.png index 244c321..ef38901 100644 Binary files a/textures/technic_armor_leggings_tin_preview.png and b/textures/technic_armor_leggings_tin_preview.png differ diff --git a/textures/technic_armor_shield_brass.png b/textures/technic_armor_shield_brass.png index 85e7f55..d88e7b3 100644 Binary files a/textures/technic_armor_shield_brass.png and b/textures/technic_armor_shield_brass.png differ diff --git a/textures/technic_armor_shield_brass_preview.png b/textures/technic_armor_shield_brass_preview.png index dffd356..4eb2af6 100644 Binary files a/textures/technic_armor_shield_brass_preview.png and b/textures/technic_armor_shield_brass_preview.png differ diff --git a/textures/technic_armor_shield_carbon.png b/textures/technic_armor_shield_carbon.png index 1a16c8c..3a5aa08 100644 Binary files a/textures/technic_armor_shield_carbon.png and b/textures/technic_armor_shield_carbon.png differ diff --git a/textures/technic_armor_shield_carbon_preview.png b/textures/technic_armor_shield_carbon_preview.png index 0fe4cdc..cd75eed 100644 Binary files a/textures/technic_armor_shield_carbon_preview.png and b/textures/technic_armor_shield_carbon_preview.png differ diff --git a/textures/technic_armor_shield_cast.png b/textures/technic_armor_shield_cast.png index f41e9a2..c2b4fd6 100644 Binary files a/textures/technic_armor_shield_cast.png and b/textures/technic_armor_shield_cast.png differ diff --git a/textures/technic_armor_shield_cast_preview.png b/textures/technic_armor_shield_cast_preview.png index 9820ce9..db0aee0 100644 Binary files a/textures/technic_armor_shield_cast_preview.png and b/textures/technic_armor_shield_cast_preview.png differ diff --git a/textures/technic_armor_shield_lead.png b/textures/technic_armor_shield_lead.png index 89d9fdb..318fdd6 100644 Binary files a/textures/technic_armor_shield_lead.png and b/textures/technic_armor_shield_lead.png differ diff --git a/textures/technic_armor_shield_lead_preview.png b/textures/technic_armor_shield_lead_preview.png index 6520808..831821f 100644 Binary files a/textures/technic_armor_shield_lead_preview.png and b/textures/technic_armor_shield_lead_preview.png differ diff --git a/textures/technic_armor_shield_silver.png b/textures/technic_armor_shield_silver.png index 42cc5b1..bdd8038 100644 Binary files a/textures/technic_armor_shield_silver.png and b/textures/technic_armor_shield_silver.png differ diff --git a/textures/technic_armor_shield_silver_preview.png b/textures/technic_armor_shield_silver_preview.png index 446fdee..16f725a 100644 Binary files a/textures/technic_armor_shield_silver_preview.png and b/textures/technic_armor_shield_silver_preview.png differ diff --git a/textures/technic_armor_shield_stainless.png b/textures/technic_armor_shield_stainless.png index f7878f9..3dc2dd7 100644 Binary files a/textures/technic_armor_shield_stainless.png and b/textures/technic_armor_shield_stainless.png differ diff --git a/textures/technic_armor_shield_stainless_preview.png b/textures/technic_armor_shield_stainless_preview.png index 6bba8d4..ced3e9e 100644 Binary files a/textures/technic_armor_shield_stainless_preview.png and b/textures/technic_armor_shield_stainless_preview.png differ diff --git a/textures/technic_armor_shield_tin.png b/textures/technic_armor_shield_tin.png index 0538e51..e005ef2 100644 Binary files a/textures/technic_armor_shield_tin.png and b/textures/technic_armor_shield_tin.png differ diff --git a/textures/technic_armor_shield_tin_preview.png b/textures/technic_armor_shield_tin_preview.png index ef32164..e707df2 100644 Binary files a/textures/technic_armor_shield_tin_preview.png and b/textures/technic_armor_shield_tin_preview.png differ