Merge pull request #9 from Treer/master

author oilboi <47129783+oilboi@users.noreply.github.com>

Mon, 20 Apr 2020 13:22:34 +0000 (09:22 -0400)

committer GitHub <noreply@github.com>

Mon, 20 Apr 2020 13:22:34 +0000 (09:22 -0400)
author oilboi <47129783+oilboi@users.noreply.github.com>
Mon, 20 Apr 2020 13:22:34 +0000 (09:22 -0400)
committer GitHub <noreply@github.com>
Mon, 20 Apr 2020 13:22:34 +0000 (09:22 -0400)
diff --cc mods/main/items.lua
Simple merge
diff --cc mods/torch/init.lua
Simple merge
author	oilboi <47129783+oilboi@users.noreply.github.com>
	Mon, 20 Apr 2020 13:22:34 +0000 (09:22 -0400)
committer	GitHub <noreply@github.com>
	Mon, 20 Apr 2020 13:22:34 +0000 (09:22 -0400)
		1	2
mods/main/items.lua	patch \|	diff1 \|	diff2 \|	blob \| history
mods/torch/init.lua	patch \|	diff1 \|	diff2 \|	blob \| history