Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix and cleanup dependencies #224

Merged
merged 4 commits into from
Nov 1, 2021
Merged

Fix and cleanup dependencies #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
69d4f86
Remove depends.txt files
OgelGames Oct 23, 2021
f26c8b6
Fix dependencies
OgelGames Nov 1, 2021
f18b9f1
Split CNC materials into separate files
OgelGames Nov 1, 2021
9ceb4e6
Improve steel to iron overrides
OgelGames Nov 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions concrete/depends.txt
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions concrete/mod.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
name = concrete
depends = default
optional_depends = basic_materials, intllib, moreblocks
depends = default, basic_materials, technic
optional_depends = intllib, moreblocks
9 changes: 0 additions & 9 deletions extranodes/depends.txt
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions generate-mtinfo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ git clone --depth=1 https://gitlab.com/VanessaE/basic_materials.git ${WORLDMODS_
git clone --depth=1 https://gitlab.com/VanessaE/pipeworks.git ${WORLDMODS_DIR}/pipeworks
git clone --depth=1 https://gitlab.com/VanessaE/unifieddyes.git ${WORLDMODS_DIR}/unifieddyes
git clone --depth=1 https://github.com/minetest-mods/moreblocks.git ${WORLDMODS_DIR}/moreblocks
git clone --depth 1 https://github.com/minetest-mods/moreores.git ${WORLDMODS_DIR}/moreores
git clone --depth=1 https://github.com/BuckarooBanzay/mtinfo.git ${WORLDMODS_DIR}/mtinfo
cp . ${WORLDMODS_DIR}/technic -R

Expand Down
1 change: 1 addition & 0 deletions integration-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ rm -rf ${WORLDDIR}
mkdir -p ${WORLDMODDIR}
git clone --depth 1 https://gitlab.com/VanessaE/basic_materials.git ${WORLDMODDIR}/basic_materials
git clone --depth 1 https://gitlab.com/VanessaE/pipeworks.git ${WORLDMODDIR}/pipeworks
git clone --depth 1 https://github.com/minetest-mods/moreores.git ${WORLDMODDIR}/moreores

chmod 777 ${MTDIR} -R
docker run --rm -i \
Expand Down
6 changes: 5 additions & 1 deletion technic/machines/other/constructor.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,11 @@ local function make_constructor(mark, length)
allow_metadata_inventory_put = allow_inventory_put,
allow_metadata_inventory_take = technic.machine_inventory_take,
allow_metadata_inventory_move = technic.machine_inventory_move,
on_rotate = screwdriver.rotate_simple
on_rotate = function(pos, node, user, mode, new_param2)
if mode ~= 1 then
return false
end
end,
})

minetest.register_node("technic:constructor_mk"..mark.."_on", {
Expand Down
6 changes: 5 additions & 1 deletion technic/machines/register/battery_box.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,11 @@ function technic.register_battery_box(data)
technic_run = run,
on_timer = on_timer,
on_rightclick = function(pos) update_node(pos, true) end,
on_rotate = screwdriver.rotate_simple,
on_rotate = function(pos, node, user, mode, new_param2)
if mode ~= 1 then
return false
end
end,
after_place_node = data.tube and pipeworks.after_place,
after_dig_node = technic.machine_after_dig_node,
on_receive_fields = function(pos, formname, fields, player)
Expand Down
4 changes: 2 additions & 2 deletions technic/machines/register/cables.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,9 @@ function technic.register_cable(tier, size, description, prefix, override_cable,
end
def.on_rotate = function(pos, node, user, mode, new_param2)
local dir = 0
if mode == screwdriver.ROTATE_FACE then -- left-click
if mode == 1 then -- left-click
dir = 1
elseif mode == screwdriver.ROTATE_AXIS then -- right-click
elseif mode == 2 then -- right-click
dir = -1
end
local num = tonumber(node.name:sub(-1))
Expand Down
4 changes: 2 additions & 2 deletions technic/mod.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
name = technic
depends = default, pipeworks, technic_worldgen, basic_materials
optional_depends = bucket, screwdriver, mesecons, mesecons_mvps, digilines, digiline_remote, intllib, unified_inventory, vector_extras, dye, monitoring, craftguide,i3
depends = default, pipeworks, technic_worldgen, basic_materials, moreores
optional_depends = bucket, mesecons, mesecons_mvps, digilines, digiline_remote, intllib, unified_inventory, vector_extras, dye, monitoring, craftguide, i3
3 changes: 0 additions & 3 deletions technic_cnc/depends.txt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion technic_cnc/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ if use_pipeworks then technic_cnc.pipeworks = dofile(technic_cnc.modpath.."/pipe
technic_cnc.formspec = dofile(technic_cnc.modpath .. "/formspec.lua")
dofile(technic_cnc.modpath .. "/programs.lua")
dofile(technic_cnc.modpath .. "/api.lua")
dofile(technic_cnc.modpath .. "/materials.lua")
dofile(technic_cnc.modpath .. "/materials/init.lua")
dofile(technic_cnc.modpath .. "/cnc.lua")
Loading