[antum (mp)] Update to Git commit 69b39a4:
https://github.com/AntumMT/mp-antum/tree/69b39a4
This commit is contained in:
Jordan Irwin
parent
46c164c88f
commit
93073b7782
@ -19,7 +19,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
|
||||
* [spectator_mode][] ([WTFPL][lic.spectator_mode]) -- version: [7d68bec Git][ver.spectator_mode] *2017-03-30*
|
||||
* [whitelist][] ([CC0][lic.cc0]) -- version [0.1 (b813b19 Git)][ver.whitelist] *2017-08-18*
|
||||
* [awards][] ([LGPL][lic.lgpl2.1]) -- version: [096fe16 Git][ver.awards] *2017-02-25* ([patched][patch.awards]) ***UPDATE***
|
||||
* [antum][] ([MIT][lic.antum]) -- version: [372fe26 Git][ver.antum] *2017-08-29*
|
||||
* [antum][] ([MIT][lic.antum]) -- version: [69b39a4 Git][ver.antum] *2017-08-30*
|
||||
* 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])
|
||||
@ -375,7 +375,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
|
||||
[ver.amber]: https://github.com/theraven262/amber/tree/21637e8
|
||||
[ver.animals_aggressive]: https://github.com/AntumMT/mp-animals_aggressive/tree/4eede4d
|
||||
[ver.animals_harmless]: https://github.com/AntumMT/mp-animals_harmless/tree/e9b02a8
|
||||
[ver.antum]: https://github.com/AntumMT/mp-antum/tree/372fe26
|
||||
[ver.antum]: https://github.com/AntumMT/mp-antum/tree/69b39a4
|
||||
[ver.awards]: https://github.com/minetest-mods/awards/tree/096fe16
|
||||
[ver.away]: https://github.com/kahrl/minetest-mod-away/tree/4c1e5a9
|
||||
[ver.bags]: https://github.com/cornernote/minetest-bags/tree/1626535
|
||||
|
||||
@ -26,11 +26,8 @@
|
||||
|
||||
|
||||
local modoverrides = {
|
||||
'animalmaterials',
|
||||
'cooking',
|
||||
'farming_plus',
|
||||
'mobs',
|
||||
'simple_protection',
|
||||
}
|
||||
|
||||
for I in pairs(modoverrides) do
|
||||
|
||||
@ -1,98 +0,0 @@
|
||||
--[[ LICENSE HEADER
|
||||
|
||||
MIT License
|
||||
|
||||
Copyright © 2017 Jordan Irwin
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
this software and associated documentation files (the "Software"), to deal in
|
||||
the Software without restriction, including without limitation the rights to
|
||||
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
||||
of the Software, and to permit persons to whom the Software is furnished to do
|
||||
so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
|
||||
--]]
|
||||
|
||||
|
||||
-- Boilerplate to support localized strings if intllib mod is installed.
|
||||
local S
|
||||
if core.global_exists("intllib") then
|
||||
dofile(core.get_modpath("intllib").."/intllib.lua")
|
||||
if intllib.make_gettext_pair then
|
||||
S = intllib.make_gettext_pair("animalmaterials")
|
||||
else
|
||||
S = intllib.Getter("animalmaterials")
|
||||
end
|
||||
else
|
||||
S = function ( s ) return s end
|
||||
end
|
||||
|
||||
|
||||
-- ITEMS THAT SHOULD NOT BE AVAILABLE IN ANTUM GAME
|
||||
|
||||
local delete_items = {
|
||||
'feather',
|
||||
}
|
||||
|
||||
for I in pairs(delete_items) do
|
||||
core.unregister_item('animalmaterials:' .. delete_items[I])
|
||||
end
|
||||
|
||||
|
||||
-- OVERRIDING CRAFT ITEMS
|
||||
|
||||
|
||||
-- Fish
|
||||
|
||||
core.register_craftitem(':animalmaterials:fish_bluewhite', {
|
||||
description = 'Raw Bluewhite Fish',
|
||||
image = 'fish_raw.png',
|
||||
on_use = core.item_eat(1),
|
||||
groups = { meat=1, eatable=1 },
|
||||
stack_max = 25
|
||||
})
|
||||
core.register_alias('fish_bluewhite_raw', 'animalmaterials:fish_bluewhite')
|
||||
|
||||
core.register_craftitem(':animalmaterials:fish_clownfish', {
|
||||
description = 'Raw Clownfish',
|
||||
image = 'fish_raw.png',
|
||||
on_use = core.item_eat(1),
|
||||
groups = { meat=1, eatable=1 },
|
||||
stack_max = 25
|
||||
})
|
||||
core.register_alias('clownfish_raw', 'animalmaterials:fish_clownfish')
|
||||
|
||||
|
||||
-- Fur group
|
||||
|
||||
core.register_craftitem(":animalmaterials:fur", {
|
||||
description = S("Fur"),
|
||||
image = "animalmaterials_fur.png",
|
||||
stack_max=25,
|
||||
groups = {fur = 1},
|
||||
})
|
||||
|
||||
core.register_craftitem(":animalmaterials:fur_deer", {
|
||||
description = S("Deer fur"),
|
||||
image = "animalmaterials_deer_fur.png",
|
||||
stack_max=10,
|
||||
groups = {fur = 1},
|
||||
})
|
||||
|
||||
core.register_craftitem(":animalmaterials:coat_cattle", {
|
||||
description = S("Cattle coat"),
|
||||
image = "animalmaterials_cattle_coat.png",
|
||||
stack_max=10,
|
||||
groups = {fur = 1},
|
||||
})
|
||||
@ -1,13 +0,0 @@
|
||||
--[[ LICENSE HEADER
|
||||
|
||||
MIT Licensing
|
||||
|
||||
Copyright © 2017 Jordan Irwin
|
||||
|
||||
See: LICENSE.txt
|
||||
--]]
|
||||
|
||||
|
||||
if antum.dependsSatisfied({'farming_plus', 'ethereal',}) then
|
||||
override.replaceItems('farming_plus:strawberry_item', 'ethereal:strawberry')
|
||||
end
|
||||
@ -1,32 +0,0 @@
|
||||
--[[ LICENSE HEADER
|
||||
|
||||
MIT License
|
||||
|
||||
Copyright © 2017 Jordan Irwin
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
this software and associated documentation files (the "Software"), to deal in
|
||||
the Software without restriction, including without limitation the rights to
|
||||
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
|
||||
of the Software, and to permit persons to whom the Software is furnished to do
|
||||
so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
|
||||
--]]
|
||||
|
||||
|
||||
local sp = 'simple_protection'
|
||||
local sp_claim = sp .. ':claim'
|
||||
|
||||
core.register_alias(sp .. ':claim_stick', sp_claim)
|
||||
core.register_alias('claim_stick', sp_claim)
|
||||
Loading…
x
Reference in New Issue
Block a user