Finally fixed git issues. Hopefully.
Merge branch 'herbmerge' of https://github.com/Ivorforce/Psychedelicraft into herbmerge