#2 Smol upgrades and a bug fix (Infinite potion usage)

Aperto
great_wolves wants to merge 14 commits from great_wolves/feast:master into master