Merge 'New flower textures'