changed industrial:white_brick recipe to avoid recipe collision with default:stonebrick
changed recipe for gloopblocks:evil_stick because it had dependency on gloopores
Merge remote-tracking branch 'upstream/master'

Syncing the repository before doing a pull request
Merge pull request #1 from Ritchie-MT/master

merged ritchie's fixes