fix #833 and #834#835

lightlike wants to merge 2 commits intoVazkiiMods:masterVazkiiMods/Psi:masterfrom

lightlike:masterlightlike/Psi:masterCopy head branch name to clipboard