Compare commits

..

No commits in common. "mine_apocalypse" and "master" have entirely different histories.

2 changed files with 3 additions and 37 deletions

22
.gitignore vendored
View File

@ -1,22 +0,0 @@
## Files related to minetest development cycle
/*.patch
# GNU Patch reject file
*.rej
## Editors and Development environments
*~
*.swp
*.bak*
*.orig
# Vim
*.vim
# Kate
.*.kate-swp
.swp.*
# Eclipse (LDT)
.project
.settings/
.buildpath
.metadata
# Idea IDE
.idea/*

View File

@ -40,7 +40,7 @@
gravelsieve = {
}
--dofile(minetest.get_modpath("gravelsieve") .. "/hammer.lua")
dofile(minetest.get_modpath("gravelsieve") .. "/hammer.lua")
gravelsieve.ore_rarity = tonumber(minetest.setting_get("gravelsieve_ore_rarity")) or 1
@ -161,17 +161,6 @@ local function random_ore(inv, src)
for ore, probability in pairs(gravelsieve.ore_probability) do
if math.random(probability) == 1 then
local item = ItemStack(ore)
--minetest.log(dump(item:get_name()))
if item:get_name() == 'technic:uranium_lump' then
item:set_name('default:clay_lump')
elseif item:get_name() == 'technic:chromium_lump' then
item:set_name('default:sand')
elseif item:get_name() == 'technic:lead_lump' then
item:set_name('default:sand')
elseif item:get_name() == 'technic:zinc_lump' then
item:set_name('default:sand')
end
if inv:room_for_item("dst", item) then
inv:add_item("dst", item)
return true -- ore placed
@ -201,7 +190,6 @@ local function move_src2dst(meta, pos, inv, src, dst)
local res = swap_node(pos, meta, false)
if res then -- time to move one item?
if src:get_name() == "default:gravel" then -- will we find ore?
--minetest.log(dump(src:get_name()))
if not random_ore(inv, src) then -- no ore found?
add_gravel_to_dst(meta, inv)
end
@ -233,7 +221,7 @@ local function sieve_node_timer(pos, elapsed)
end
for automatic = 1,1 do
for automatic = 0,1 do
for idx = 0,4 do
local nodebox_data = {
{ -8/16, -8/16, -8/16, 8/16, 4/16, -6/16 },
@ -491,7 +479,7 @@ minetest.register_craft({
cooktime = 10,
})
--minetest.register_alias("gravelsieve:sieve", "gravelsieve:sieve3")
minetest.register_alias("gravelsieve:sieve", "gravelsieve:sieve3")
minetest.register_alias("gravelsieve:auto_sieve", "gravelsieve:auto_sieve3")
-- adaption to hopper