Dynamic Quarry in 6.1.x

Resolved Conflicts PR #1803 by @undergroundminer3