Merge remote-tracking branch 'origin/upstream'

This commit is contained in:
BuckarooBanzay
2020-06-16 09:56:52 +02:00
29 changed files with 119 additions and 101 deletions

View File

@ -72,7 +72,6 @@ else
end
end
local shape = {}
local onesize_products = {
slope = 2,
slope_edge = 1,

View File

@ -237,7 +237,7 @@ technic_cnc.programs = {
type = "fixed",
fixed = {
{ 4/16, -8/16, 4/16, 8/16, 8/16, 8/16 },
{ 0, -8/16, 0, 4/16, 8/16, 8/16 },
{ 0, -8/16, 0, 4/16, 8/16, 8/16 },
{ -4/16, -8/16, -4/16, 0, 8/16, 8/16 },
{ -8/16, -8/16, -8/16, -4/16, 8/16, 8/16 }
}
@ -257,7 +257,7 @@ technic_cnc.programs = {
}
}
},
}
-- Allow disabling certain programs for some node. Default is allowing all types for all nodes