Merge master to 1.11 & update Forge to recommended 2188.

Created by: Koward

Merge work from master to 1.11 and update Forge to recommended build 2188. (There are many listed commits because I merged instead or rebased (mistake). It has no effect on final result, but the git history looks bad, I'm still looking at what I could do.)