Develop 1.8 #20

Merged
Kan18 merged 242 commits from develop-1.8 into master-1.8 2019-11-10 20:52:08 -05:00
2 changed files with 18 additions and 0 deletions
Showing only changes of commit 8cfeaad061 - Show all commits

View File

@@ -1490,6 +1490,7 @@ end
function UI.Grid:drawHeadings()
local x = 1
local sb = UI.StringBuffer(self.width)
for _,col in ipairs(self.columns) do
local ind = ' '
if col.key == self.sortColumn then
@@ -1499,13 +1500,17 @@ function UI.Grid:drawHeadings()
ind = self.sortIndicator
end
end
sb:insert(ind .. col.heading, col.cw + 1)
--[[
self:write(x,
1,
Util.widthify(ind .. col.heading, col.cw + 1),
self.headerBackgroundColor,
col.key == self.sortColumn and self.headerSortColor or self.headerTextColor)
x = x + col.cw + 1
]]
end
self:write(1, 1, sb:get(), self.headerBackgroundColor, self.headerTextColor)
end
function UI.Grid:sortCompare(a, b)

View File

@@ -935,6 +935,13 @@ function turtle.isEquipped(item)
end
end
function turtle.unequip(side)
if not turtle.selectSlotWithQuantity(0) then
return false, 'No slots available'
end
return turtle.equip(side)
end
-- [[ ]] --
function turtle.run(fn, ...)
local args = { ... }
@@ -980,6 +987,12 @@ function turtle.addWorldBlock(pt)
Pathing.addBlock(pt)
end
function turtle.addWorldBlocks(pts)
Util.each(pts, function(pt)
Pathing.addBlock(pt)
end)
end
local movementStrategy = turtle.pathfind
function turtle.setMovementStrategy(strategy)