Merge branch 'FewQuernFixes' of github.com:emris/TFCraft into emris-FewQuernFixes

Conflicts:
	TFC_Shared/src/TFC/Blocks/Devices/BlockQuern.java
	TFC_Shared/src/TFC/Render/Blocks/RenderQuern.java
Merge branch 'master' of github.com:Deadrik/TFCraft