Commit 79ee8d2d authored by Milan's avatar Milan
Browse files

resolve mergeconflicts #2

parents 45ce1a8e 03ab06ef

src/workbench.lua

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ function workbench.put(_, listname, _, stack) 
	if (listname == "tool" and stack:get_wear() > 0 and

	    workbench:repairable(stackname)) or

	   (listname == "input" and registered_nodes[stackname.."_cube"]) or

	   (listname == "hammer" and stackname == "xdecor:hammer") or

	   (listname == "hammer" and stackname == "cottages:hammer") or

	    listname == "storage" then

		return stack:get_count()

	end