Merge branch 'pandorabox' of github.com:pandorabox-io/technic into pandorabox

technic/machines/HV/quarry.lua

@@ -13,7 +13,7 @@ minetest.register_craft({
 })
 
 local quarry_dig_above_nodes = 3 -- How far above the quarry we will dig nodes
-local quarry_max_depth       = 100
+local quarry_max_depth       = 30
 local quarry_demand = 10000
 local quarry_eject_dir = vector.new(0, 1, 0)
 
@@ -32,7 +32,7 @@ minetest.register_globalstep(function(dtime)
 	quota_map = {}
 
 	-- this many blocks per second
-	local init_quota = minetest.settings:get("technic.quarry.quota") or 4
+	local init_quota = minetest.settings:get("technic.quarry.quota") or 10
 
 	local players = minetest.get_connected_players()
 	for i, player in pairs(players) do
@@ -149,16 +149,15 @@ local function quarry_run(pos, node)
 
 	local digging_allowed = false
 	local quota = quota_map[owner]
-	if quota and quota > 0 then
-		-- decrement quota
-		quota = quota - 1
-		quota_map[owner] = quota
-		digging_allowed = true
-	end
-
+	digging_allowed = quota and quota > 0
 
 
 	if digging_allowed and meta:get_int("enabled") and meta:get_int("HV_EU_input") >= quarry_demand and meta:get_int("purge_on") == 0 then
+
+		-- decrement quota
+		quota = quota - 1
+		quota_map[owner] = quota
+
 		local pdir = minetest.facedir_to_dir(node.param2)
 		if pdir.y ~= 0 then
 			-- faces up or down, not valid, otherwise depth-check would run endless and hang up the server
@@ -177,7 +176,7 @@ local function quarry_run(pos, node)
 			vector.multiply(qdir, -radius))
 		local owner = meta:get_string("owner")
 		local nd = meta:get_int("dug")
-		while nd ~= diameter*diameter * (quarry_dig_above_nodes+1+quarry_max_depth) do
+		while nd < diameter*diameter * (quarry_dig_above_nodes+1+quarry_max_depth) do
 			local ry = math.floor(nd / (diameter*diameter))
 			local ndl = nd % (diameter*diameter)
 			if ry % 2 == 1 then

technic/machines/register/alloy_recipes.lua

@@ -28,6 +28,7 @@ local recipes = {
 	-- The highest volume use of carbon black is as a reinforcing filler in rubber products, especially tires.
 	-- "[Compounding a] pure gum vulcanizate … with 50% of its weight of carbon black improves its tensile strength and wear resistance …"
 	{"technic:raw_latex 4",           "technic:coal_dust 2",        "technic:rubber 6", 2},
+	{"default:ice", 		  "bucket:bucket_empty",        "bucket:bucket_water", 1 },
 }
 
 if minetest.get_modpath("ethereal") then

technic/machines/register/extractor_recipes.lua

@@ -34,10 +34,6 @@ if minetest.get_modpath("dye") then
 	end
 	
 	if minetest.get_modpath("farming") then
-		-- Cottonseed oil: a fuel and a potent fertilizer (irl: pesticide) ---
-		-- hemp oil calls for 8 seeds, but extractor recipes are normally twice as potent
-		table.insert(dye_recipes, {"farming:seed_cotton 4", "technic:cottonseed_oil"})
-		
 		-- Dyes ---
 		-- better recipes for farming's crafting methods (twice the output)
 		table.insert(dye_recipes, {"farming:chili_pepper", "dye:red 4"})