Merged technic_armor into 3d_armor modpack

README.md

@@ -48,7 +48,6 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 * equipment/
 	* [airtanks][] ([MIT][lic.airtanks]) -- version: [b686694 Git][ver.airtanks] *2021-03-13* ([patched][patch.airtanks])
 	* [slingshot][] ([MIT][lic.slingshot] / [CC0][lic.cc0]) -- version [0.1][ver.slingshot] *2017-08-16*
-	* [technic_armor][] ([LGPL / WTFPL][lic.technic_armor]) -- version [694642f Git][ver.technic_armor] *2018-02-11*
     * [throwing][] ([WTFPL][lic.wtfpl]) -- version: [90bcf43 Git][ver.throwing] *2013-09-27* ([patched][patch.throwing])
 	* [xtraarmor][] ([CC BY-SA][lic.ccbysa3.0]) -- version: 0.3
 * furniture/
@@ -347,7 +346,6 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 [asm_spawneggs]: https://forum.minetest.net/viewtopic.php?t=26676
 [spectator_mode]: https://forum.minetest.net/viewtopic.php?t=13718
 [technic]: https://forum.minetest.net/viewtopic.php?t=2538
-[technic_armor]: https://github.com/stujones11/technic_armor
 [throwing]: https://forum.minetest.net/viewtopic.php?t=687
 [tnt]: https://forum.minetest.net/viewtopic.php?id=2902
 [tools_obsidian]: https://forum.minetest.net/viewtopic.php?t=14236
@@ -426,7 +424,6 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 [lic.snowdrift]: mods/weather/snowdrift/license.txt
 [lic.asm_spawneggs]: mods/spawning/asm_spawneggs/LICENSE.txt
 [lic.spectator_mode]: mods/admin/spectator_mode/LICENSE
-[lic.technic_armor]: mods/equipment/technic_armor/LICENSE.txt
 [lic.tools_obsidian]: mods/tools/tools_obsidian/README.md
 [lic.trash_can]: mods/furniture/trash_can/LICENSE.txt
 [lic.waffles]: mods/furniture/waffles/LICENSE.txt
@@ -576,7 +573,6 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 [ver.asm_spawneggs]: https://github.com/AntumMT/mod-asm_spawneggs/tree/8579eac
 [ver.spectator_mode]: https://github.com/minetest-mods/spectator_mode/tree/3648371
 [ver.technic]: https://github.com/minetest-mods/technic/tree/43acec2
-[ver.technic_armor]: https://github.com/stujones11/technic_armor/tree/694642f
 [ver.throwing]: https://github.com/PilzAdam/throwing/tree/90bcf43
 [ver.tnt]: https://github.com/PilzAdam/TNT/tree/d6a0b7d
 [ver.tools_obsidian]: https://github.com/Dragonop/tools_obsidian/releases/tag/1.0
@@ -591,7 +587,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 [ver.workbench]: https://github.com/minetest-mods/workbench/tree/bd14f59
 [ver.zombie]: https://github.com/AntumMT/mod-cmer/tree/4edb18e
 
-[patch.3d_armor]: https://github.com/AntumMT/mp-3d_armor/tree/cfba55c
+[patch.3d_armor]: https://github.com/AntumMT/mp-3d_armor/tree/269b6ae
 [patch.airtanks]: https://github.com/AntumMT/mod-airtanks/tree/8b7fd12
 [patch.amber]: https://github.com/AntumMT/mod-amber/tree/39b852a
 [patch.atm]: https://github.com/AntumMT/mod-atm/tree/7771aa0

mods/equipment/technic_armor/depends.txt

@@ -1,3 +0,0 @@
-3d_armor
-technic_worldgen?
-moreores?

mods/equipment/technic_armor/description.txt

@@ -1 +0,0 @@
-Adds tin, silver and technic materials to 3d_armor.

mods/modpacks/3d_armor/LICENSE.md

@@ -5,6 +5,8 @@ License Source Code: Copyright (C) 2013-2018 Stuart Jones - LGPL v2.1
 
 Armor Textures: Copyright (C) 2017-2018 davidthecreator - CC-BY-SA 3.0
 
+Technic Armor Textures: poet.nohit and numberZero - 2015-2018 CC0
+
 Special credit to Jordach and MirceaKitsune for providing the default 3d character model.
 
 New armor/shield textures CC-BY-SA 3.0 / davidthecreator / https://forum.minetest.net/viewtopic.php?f=11&t=4654&start=800#p356448

mods/modpacks/3d_armor/README.md

@@ -15,6 +15,7 @@ Modpack - 3d Armor [0.4.13]
 - [[mod] Visible Wielded Items [wieldview]](#mod-visible-wielded-items-wieldview)
 - [[mod] Shields [shields]](#mod-shields-shields)
 - [[mod] 3d Armor Stand [3d_armor_stand]](#mod-3d-armor-stand-3d_armor_stand)
+- [[mod] Technic Armor [technic_armor]](#mod-technic-armor-technic_armor)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
@@ -72,3 +73,12 @@ If you do not want shields then simply remove the shields folder from the modpac
 Depends: 3d_armor
 
 Adds a chest-like armor stand for armor storage and display.
+
+[mod] Technic Armor [technic_armor]
+-------------------------------------
+
+Depends: 3d_armor
+
+Optional depends: technic_worldgen, moreores
+
+Add additional armors using materials supplied by technic & moreores mods.

mods/modpacks/3d_armor/settingtypes.txt

@@ -64,6 +64,12 @@ armor_migrate_old_inventory (Migrate old armor inventories) bool true
 shields_disable_sounds (Disable shield sounds) bool false
 
 
+[technic_armor]
+
+# Enable or disable technic_armor.
+armor_enable_technic (Enable technic armor) bool true
+
+
 [wieldview]
 
 # Set number of seconds between visible wielded item updates.

mods/modpacks/3d_armor/technic_armor/LICENSE.txt

@@ -3,5 +3,5 @@
 
 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 CC0
 

mods/modpacks/3d_armor/technic_armor/init.lua

@@ -1,6 +1,10 @@
--- support for i18n
-local S = armor_i18n.gettext
-local F = armor_i18n.fgettext
+
+if not core.settings:get_bool("armor_enable_technic", true) then
+	return
+end
+
+-- support for translator
+local S = armor.get_translator
 
 if not minetest.get_modpath("technic_worldgen") then
 	minetest.log("warning", S("technic_armor: Mod loaded but unused."))

mods/modpacks/3d_armor/technic_armor/mod.conf

@@ -0,0 +1,4 @@
+name = technic_armor
+description = Adds tin, silver and technic materials to 3d_armor.
+depends = 3d_armor
+optional_depends = technic_worldgen, moreores