Ydle Next generation
fixes conflicts
Merge branch 'Shine-neko-assets'