From a4bc167bd01fa83607957bdacb22e35ab2a87afc Mon Sep 17 00:00:00 2001 From: mckaygerhard Date: Thu, 12 Jan 2023 22:45:49 -0400 Subject: [PATCH] rename mod as 3d_armor_technic and retunrn to the modpack * the mod was splited in the past due the dependencies.. but now the new code determines if are loaded or not, and also manages if the dependency are satifased or no.. this is just a only one init lua file so manage in external repo its nonsense.. * remove stupid things of luacheck provided by BuckarooBanzay not necesary for a simple mod --- .github/workflows/luacheck.yml | 13 ------------- .luacheckrc | 4 ---- LICENSE.txt | 2 ++ README.md | 6 +++--- description.txt | 2 +- init.lua | 4 ++-- mod.conf | 2 +- 7 files changed, 9 insertions(+), 24 deletions(-) delete mode 100644 .github/workflows/luacheck.yml delete mode 100644 .luacheckrc diff --git a/.github/workflows/luacheck.yml b/.github/workflows/luacheck.yml deleted file mode 100644 index b251ab5..0000000 --- a/.github/workflows/luacheck.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: luacheck -on: [push, pull_request] -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@main - - 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/.luacheckrc b/.luacheckrc deleted file mode 100644 index 4950c49..0000000 --- a/.luacheckrc +++ /dev/null @@ -1,4 +0,0 @@ -globals = { - "armor", - "minetest", -} diff --git a/LICENSE.txt b/LICENSE.txt index 7980686..ea661b6 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,6 @@ License Source Code: Copyright (C) 2013-2018 Stuart Jones - LGPL v2.1 +License Source Code: Copyright (C) 2023 mckayerhard CC-BY-SA-NC + License Textures: poet-nohit and numberZero - 2015-2018 WTFPL diff --git a/README.md b/README.md index 0a99dd5..10eb091 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -minetest mod technic_armor +minetest mod 3d_armor_technic ============================ ARMOR from procesed materials @@ -13,8 +13,8 @@ Adds armor made from lead, brass, cast iron, carbon steel, stainless steel, tin Technical information --------------------- -This mod is named `technic_armor` and was part of the `3d_armor`, -it was slited since version 0.4.11 of `3d_armor` +This mod is named `3d_armor_technic` and is(was) part of the `3d_armor`, +it was slited since version 0.4.11 of `3d_armor` now in minenux flavor merged again #### Depends diff --git a/description.txt b/description.txt index b09849a..009bc90 100644 --- a/description.txt +++ b/description.txt @@ -1 +1 @@ -Adds armor made from lead, brass, cast iron, carbon steel, stainless steel, tin and silver +ARMOR TECH made from lead, brass, cast iron, carbon steel, stainless steel, tin and silver diff --git a/init.lua b/init.lua index 51a484e..f4a7eba 100644 --- a/init.lua +++ b/init.lua @@ -4,7 +4,7 @@ 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.")) + minetest.log("warning", S("[3d_armor_technic]: Mod loaded but unused.")) return end @@ -136,7 +136,7 @@ end for material, m in pairs(materials) do for part, p in pairs(parts) do - local name = "technic_armor:"..part.."_"..material + local name = ":3d_armor:"..part.."_"..material armor:register_armor(name, { description = S("@1 @2", m.name, p.name), inventory_image = "technic_armor_inv_"..part.."_"..material..".png", diff --git a/mod.conf b/mod.conf index 6ccb1d3..fdd3c0a 100644 --- a/mod.conf +++ b/mod.conf @@ -1,5 +1,5 @@ title = technic_armor name = technic_armor -description = Adds armor made from lead, brass, cast iron, carbon steel, stainless steel, tin and silver +description = ARMOR TECH made from lead, brass, cast iron, carbon steel, stainless steel, tin and silver depends = 3d_armor optional_depends = default, moreores, technic_worldgen