[ethereal] Upgrade to version 'd0b896e Git' (tenplus1) & patch from
version '2714ad4 Git' (antum).master
AntumDeluge
parent
ca5c803df3
commit
3d7e387208
|
|
@ -111,7 +111,9 @@ The game includes the mods from the default [minetest_game](https://github.com/m
|
|||
* [mywoodslopes][] ([DWYWPL][lic.mywoodslopes]) -- version: [3a1b531 Git][ver.mywoodslopes]
|
||||
* world/
|
||||
* [bedrock2][] ([WTFPL][lic.bedrock2]) -- version [1.2.0-0378b61 Git][ver.bedrock2]
|
||||
* [ethereal][] ([WTFPL](mods/world/ethereal/license.txt))
|
||||
* [ethereal][] ([WTFPL][lic.ethereal])
|
||||
* base version: [d0b896e Git][ver.ethereal]
|
||||
* patched version: [2714ad4 Git][ver.ethereal.patched]
|
||||
* [glow][] (GPL)
|
||||
* [nether][] ([WTFPL / CC BY-SA](mods/world/nether/README.md))
|
||||
* [worldedge][] ([DWYWPL](mods/world/worldedge/licence.txt))
|
||||
|
|
@ -306,6 +308,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
|
|||
[lic.cme]: mods/mp_cme/LICENSE.txt
|
||||
[lic.coloredwood]: mods/wood/coloredwood/LICENSE
|
||||
[lic.creeper]: mods/mobs_aggressive/creeper/LICENSE.md
|
||||
[lic.ethereal]: mods/world/ethereal/license.txt
|
||||
[lic.homedecor]: mods/homedecor_modpack/LICENSE
|
||||
[lic.ilights]: mods/lighting/ilights/init.lua
|
||||
[lic.invisibility]: mods/player_visuals/invisibility/license.txt
|
||||
|
|
@ -333,6 +336,8 @@ The game includes the mods from the default [minetest_game](https://github.com/m
|
|||
[ver.cme]: https://github.com/BlockMen/cme/tree/e3502a1
|
||||
[ver.coloredwood]: https://github.com/minetest-mods/coloredwood/tree/7b177f3
|
||||
[ver.creeper]: https://github.com/Rui-Minetest/creeper/tree/036666e
|
||||
[ver.ethereal]: https://github.com/tenplus1/ethereal/tree/d0b896e
|
||||
[ver.ethereal.patched]: https://github.com/AntumDeluge/minetest-mod-ethereal/commit/2714ad4
|
||||
[ver.home_gui]: https://github.com/cornernote/minetest-home_gui/tree/f6b5001
|
||||
[ver.homedecor]: https://github.com/minetest-mods/homedecor_modpack/tree/02a4d14
|
||||
[ver.ilights]: https://github.com/minetest-mods/ilights/tree/d5f6900
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ Ethereal Mapgen mod for Minetest (works on all except v6)
|
|||
- Saplings need clear space above to grow (depending on height of tree)
|
||||
- Bonemeal changes to suit new sapling growth
|
||||
- Fixes and tweaks
|
||||
- Added default Abm overrides
|
||||
|
||||
### 1.20
|
||||
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@ local ethereal_bone = 'ethereal:bone'
|
|||
if minetest.get_modpath('animalmaterials') then
|
||||
ethereal_bone = 'animalmaterials:bone'
|
||||
else
|
||||
minetest.register_craftitem("ethereal:bone", {
|
||||
description = S("Bone"),
|
||||
inventory_image = "bone.png",
|
||||
minetest.register_craftitem('ethereal:bone', {
|
||||
description = S('Bone'),
|
||||
inventory_image = 'bone.png',
|
||||
})
|
||||
end
|
||||
|
||||
|
|
@ -16,34 +16,33 @@ end
|
|||
minetest.register_craftitem("ethereal:bonemeal", {
|
||||
description = S("Bone Meal"),
|
||||
inventory_image = "bonemeal.png",
|
||||
|
||||
|
||||
on_use = function(itemstack, user, pointed_thing)
|
||||
|
||||
|
||||
if pointed_thing.type == "node" then
|
||||
|
||||
-- Check if node protected
|
||||
if minetest.is_protected(pointed_thing.under, user:get_player_name()) then
|
||||
return
|
||||
|
||||
-- Check if node protected
|
||||
if minetest.is_protected(pointed_thing.under, user:get_player_name()) then
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
if not minetest.setting_getbool("creative_mode") then
|
||||
|
||||
|
||||
local item = user:get_wielded_item()
|
||||
|
||||
|
||||
item:take_item()
|
||||
user:set_wielded_item(item)
|
||||
end
|
||||
|
||||
|
||||
growth(pointed_thing)
|
||||
|
||||
|
||||
itemstack:take_item()
|
||||
|
||||
|
||||
return itemstack
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
||||
|
||||
-- bonemeal recipes
|
||||
minetest.register_craft({
|
||||
type = "shapeless",
|
||||
|
|
@ -229,10 +228,8 @@ local function growth(pointed_thing)
|
|||
elseif node.name == "default:pine_sapling"
|
||||
and enough_height(pos, 11) then
|
||||
|
||||
if #minetest.find_nodes_in_area(
|
||||
{x = pos.x - 1, y = pos.y - 1, z = pos.z - 1},
|
||||
{x = pos.x + 1, y = pos.y + 1, z = pos.z + 1},
|
||||
{"default:snow", "default:snowblock", "default:dirt_with_snow"}) > 0 then
|
||||
if minetest.find_node_near(pos, 1,
|
||||
{"default:snow", "default:snowblock", "default:dirt_with_snow"}) then
|
||||
|
||||
default.grow_new_snowy_pine_tree(pos)
|
||||
else
|
||||
|
|
|
|||
|
|
@ -6,4 +6,4 @@ doors
|
|||
bakedclay?
|
||||
moreblocks?
|
||||
intllib?
|
||||
animalmaterials?
|
||||
animalmaterials?
|
||||
|
|
@ -44,17 +44,17 @@ minetest.register_craft({
|
|||
|
||||
-- X pattern craft recipes (5x 'a' in X pattern gives 5 of 'b')
|
||||
local cheat = {
|
||||
{"default:cobble", "default:gravel"},
|
||||
{"default:gravel", "default:dirt"},
|
||||
{"default:dirt", "default:sand"},
|
||||
{"default:ice", "default:snow"},
|
||||
{"ethereal:dry_dirt", "default:desert_sand"},
|
||||
{"default:cobble", "default:gravel", 5},
|
||||
{"default:gravel", "default:dirt", 5},
|
||||
{"default:dirt", "default:sand", 5},
|
||||
{"default:ice", "default:snow", 20},
|
||||
{"ethereal:dry_dirt", "default:desert_sand", 5},
|
||||
}
|
||||
|
||||
for n = 1, #cheat do
|
||||
|
||||
minetest.register_craft({
|
||||
output = cheat[n][2] .. " 5",
|
||||
output = cheat[n][2] .. " " .. cheat[n][3],
|
||||
recipe = {
|
||||
{cheat[n][1], "", cheat[n][1]},
|
||||
{"", cheat[n][1], ""},
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ minetest.register_craftitem("ethereal:fishing_rod_baited", {
|
|||
|
||||
inv:add_item("main", {name = type})
|
||||
|
||||
return {name = "ethereal:fishing_rod"}
|
||||
return ItemStack("ethereal:fishing_rod")
|
||||
else
|
||||
minetest.chat_send_player(user:get_player_name(),
|
||||
S("Inventory full, Fish Got Away!"))
|
||||
|
|
|
|||
|
|
@ -1,14 +1,21 @@
|
|||
The MIT License (MIT)
|
||||
|
||||
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
|
||||
Version 2, December 2004
|
||||
Copyright (c) 2016 TenPlus1
|
||||
|
||||
Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
|
||||
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:
|
||||
|
||||
Everyone is permitted to copy and distribute verbatim or modified
|
||||
copies of this license document, and changing it is allowed as long
|
||||
as the name is changed.
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. You just DO WHAT THE FUCK YOU WANT TO.
|
||||
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.
|
||||
|
|
|
|||
Loading…
Reference in New Issue