[antum (mp)] Update to Git commit 2c731af:

https://github.com/AntumMT/mp-antum/tree/2c731af

README.md

@@ -17,7 +17,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
     * [privs][] ([CC0][lic.cc0])
     * [spectator_mode][] ([WTFPL][lic.spectator_mode]) -- version: [7d68bec Git][ver.spectator_mode] *2017-03-30*
 * [awards][] ([LGPL][lic.lgpl2.1]) -- version: [096fe16 Git][ver.awards] *2017-02-25* ([patched][patch.awards]) ***UPDATE***
-* [antum][] ([MIT][lic.antum]) -- version: [7e6851d Git][ver.antum] *2017-08-07*
+* [antum][] ([MIT][lic.antum]) -- version: [2c731af Git][ver.antum] *2017-08-07*
 * buildings/
     * [bridges][] ([GPL][lic.gpl3.0]) -- version: [5b5f475 Git][ver.bridges] *2015-08-23* ([patched][patch.bridges])
     * [christmas][] ([MIT][lic.christmas]) -- version [d3bd872 Git][ver.christmas] *2013-01-11* ([patched][patch.christmas])
@@ -415,7 +415,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 [ver.animals]: https://github.com/sapier/animals_modpack/tree/b9d0172
 [ver.animals_aggressive]: https://github.com/AntumMT/mp-animals_aggressive/tree/2c913bb
 [ver.animals_passive]: https://github.com/AntumMT/mp-animals_passive/tree/4b87615
-[ver.antum]: https://github.com/AntumMT/mp-antum/tree/7e6851d
+[ver.antum]: https://github.com/AntumMT/mp-antum/tree/2c731af
 [ver.areas]: https://github.com/ShadowNinja/areas/tree/289d0e6
 [ver.awards]: https://github.com/minetest-mods/awards/tree/096fe16
 [ver.away]: https://github.com/kahrl/minetest-mod-away/tree/4c1e5a9

mods/antum/override/api.lua

@@ -24,12 +24,16 @@ function override.replaceItems(items, target)
 		override.logDebug('Overriding item "' .. items .. '" with "' .. target .. '"')
 		
 		core.unregister_item(items)
-		core.register_alias(items, target)
+		if items ~= target then
+			core.register_alias(items, target)
+		end
 	else
 		for i, it in ipairs(items) do
 			override.logDebug('Overriding item "' .. it .. '" with "' .. target .. '"')
 			core.unregister_item(it)
-			core.register_alias(it, target)
+			if it ~= target then
+				core.register_alias(it, target)
+			end
 		end
 	end
 end
@@ -47,8 +51,8 @@ function override.overrideItems(name, def)
 	local overrides = def.overrides
 	def.overrides = nil
 	
-	core.register_craftitem(name, def)
 	override.replaceItems(overrides, name)
+	core.register_craftitem(name, def)
 end
 
 --- Item definition table for *override.overrideItems*

mods/antum/overrides/depends.txt

@@ -12,6 +12,7 @@ farming_plus?
 flowers?
 helicopter?
 invisibility?
+mob_sheep?
 mobs?
 moreblocks?
 simple_protection?

mods/antum/overrides/items/mobs.lua

@@ -49,3 +49,20 @@ core.register_craftitem(":mobs:leather", {
 	inventory_image = "mobs_leather.png",
 	groups = {fur = 1},
 })
+
+
+-- Shears
+if antum.dependsSatisfied({'mob_sheep', 'mobs',}) or antum.dependsSatisfied({'sheep', 'mobs',}) then
+	override.overrideItems(':creatures:shears', {
+		overrides = {'creatures:shears', 'mobs:shears'},
+		description = 'Shears',
+		inventory_image = 'mobs_shears.png',
+		stack_max = 1,
+	})
+	core.clear_craft({
+		output = 'mobs:shears',
+	})
+	
+	-- FIXME: Not being registered in overrideItems
+	core.register_alias('mobs:shears', 'creatures:shears')
+end