Fixed #1560
Fixed /give amount showing in chat when less than 1
Merge branch 'master' into workshop