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
3 changed files with 3 additions and 3 deletions
Showing only changes of commit f5294d4fce - Show all commits

View File

@@ -60,7 +60,7 @@ local Browser = UI.Page {
{ text = 'Hidden ^h', event = 'toggle_hidden' },
{ text = 'Dir Size ^s', event = 'toggle_dirSize' },
} },
{ text = '\206',
{ text = '\187',
x = -3,
dropdown = {
{ text = 'Associations', event = 'associate' },

View File

@@ -45,7 +45,7 @@ local page = UI.Page {
} },
{ text = 'Help', event = 'help', noCheck = true },
{
text = '\206',
text = '\187',
x = -3,
dropdown = {
{ text = 'Show all', event = 'show_all', noCheck = true },

View File

@@ -802,7 +802,7 @@ function turtle.has(item, count)
return slot and slot.count >= (count or 1)
end
local slot = turtle.getSlot(item)
return slot and slot.count > 0
return slot and slot.count >= (count or 1)
end
function turtle.getFilledSlots(startSlot)