Fix dplus-stoneage conflict

Both changed the crafting recipe for torches.
Adapting dplus to use a merge recipe version.