merge weirdness conflict

This commit is contained in:
Peter Maloney 2015-09-12 10:56:22 +02:00
commit 88d9e92f18

View File

@ -66,16 +66,6 @@ local function forceload_on_flposes(want_flposes, meta)
end end
technic.forceload_on_flposes = forceload_on_flposes technic.forceload_on_flposes = forceload_on_flposes
-- computes the forceload positions (using compute_forceload_positions) and tries to force load all of them, and records them in meta "forceloaded"
-- pos - position of the anchor node
-- meta - contains "radius" (to be read) and "forceloaded" (to be written)
local function forceload_on(pos, meta)
local want_flposes = compute_forceload_positions(pos, meta)
forceload_on_flposes(want_flposes, meta)
return
end
technic.forceload_on_flposes = forceload_on_flposes
-- computes the forceload positions (using compute_forceload_positions) and tries to force load all of them, and records them in meta "forceloaded" -- computes the forceload positions (using compute_forceload_positions) and tries to force load all of them, and records them in meta "forceloaded"
-- pos - position of the anchor node -- pos - position of the anchor node
-- meta - contains "radius" (to be read) and "forceloaded" (to be written) -- meta - contains "radius" (to be read) and "forceloaded" (to be written)