Merge pull request 'last-min-july-2024' (#17) from Seirdy/pleroma-custom:last-min-july-2024 into master

Reviewed-on: https://git.envs.net/envs/pleroma-custom/pulls/17

README.md

@@ -95,10 +95,11 @@ includes also emojis from:
 - Neodog_extra: <https://github.com/olivvybee/emojis>
 - Neodlr: <https://github.com/olivvybee/emojis>
 - Frieren: <https://outerheaven.club/objects/533281dc-ecda-45d1-8e04-91ae25a329d6>
-- BlobCats: <https://github.com/DuckOfDisorder/BlobCats> (curated from various sources, see its README)
+- BlobCats: <https://github.com/DuckOfDisorder/BlobCats> (curated from various sources, see its README). Fluffy variants have unknown authorship.
 - Dragn: <https://github.com/chr-1x/dragn-emoji>
 - Sylveon: <https://git.gay/sugar/sylveon-emotes>
 - Vinnybox: <https://ko-fi.com/vinnybox>
+- Spinny: <https://gitlab.com/renere/spinny_blobs>
 
 #### notice
 

static/emoji/blobcats/emoji.txt

@@ -143,6 +143,13 @@ BlobCat_FistBumpL, /emoji/blobcats/BlobCat_FistBumpL.png
 BlobCat_FistBumpR, /emoji/blobcats/BlobCat_FistBumpR.png
 BlobCat_Flirty, /emoji/blobcats/BlobCat_Flirty.png
 BlobCat_Flower, /emoji/blobcats/BlobCat_Flower.png
+BlobCat_FluffyAngry, /emoji/blobcats/BlobCat_FluffyAngry.png
+BlobCat_FluffyEvil, /emoji/blobcats/BlobCat_FluffyEvil.png
+BlobCat_FluffyHappy, /emoji/blobcats/BlobCat_FluffyHappy.png
+BlobCat_FluffyOwo, /emoji/blobcats/BlobCat_FluffyOwo.png
+BlobCat_FluffyPats, /emoji/blobcats/BlobCat_FluffyPats.png
+BlobCat_FluffyPout, /emoji/blobcats/BlobCat_FluffyPout.png
+BlobCat_FluffyTail, /emoji/blobcats/BlobCat_FluffyTail.png
 BlobCat_Frown, /emoji/blobcats/BlobCat_Frown.png
 BlobCat_GhostIce, /emoji/blobcats/BlobCat_GhostIce.png
 BlobCat_GhostTilt, /emoji/blobcats/BlobCat_GhostTilt.png

static/emoji/neofox_extra/emoji.txt

@@ -86,6 +86,9 @@ neofox_kiss, /emoji/neofox_extra/neofox_kiss.png
 neofox_loss, /emoji/neofox_extra/neofox_loss.png
 neofox_nom_verified_neutral, /emoji/neofox_extra/neofox_nom_verified_neutral.png
 neofox_oh, /emoji/neofox_extra/neofox_oh.png
+neofox_ohio, /emoji/neofox_extra/neofox_ohio.png
+neofox_ohio_pleading, /emoji/neofox_extra/neofox_ohio_pleading.png
+neofox_ohio_woozy, /emoji/neofox_extra/neofox_ohio_woozy.png
 neofox_pat_evil, /emoji/neofox_extra/neofox_pat_evil.png
 neofox_pat_floof_googly_woozy, /emoji/neofox_extra/neofox_pat_floof_googly_woozy.png
 neofox_pleading_nb, /emoji/neofox_extra/neofox_pleading_nb.png

static/emoji/spinny/emoji.txt

@@ -0,0 +1,59 @@
+spinny_cat_ace, /emoji/spinny/spinny_cat_ace.gif
+spinny_cat_agender, /emoji/spinny/spinny_cat_agender.gif
+spinny_cat_ambiamorous, /emoji/spinny/spinny_cat_ambiamorous.gif
+spinny_cat_androgyne, /emoji/spinny/spinny_cat_androgyne.gif
+spinny_cat_aroace, /emoji/spinny/spinny_cat_aroace.gif
+spinny_cat_aro, /emoji/spinny/spinny_cat_aro.gif
+spinny_cat_bi, /emoji/spinny/spinny_cat_bi.gif
+spinny_cat_bigender, /emoji/spinny/spinny_cat_bigender.gif
+spinny_cat_blacktrans, /emoji/spinny/spinny_cat_blacktrans.gif
+spinny_cat_demiboy, /emoji/spinny/spinny_cat_demiboy.gif
+spinny_cat_demigirl, /emoji/spinny/spinny_cat_demigirl.gif
+spinny_cat_demilesbian, /emoji/spinny/spinny_cat_demilesbian.gif
+spinny_cat_demisexual, /emoji/spinny/spinny_cat_demisexual.gif
+spinny_cat_disability, /emoji/spinny/spinny_cat_disability.gif
+spinny_cat, /emoji/spinny/spinny_cat.gif
+spinny_cat_gay, /emoji/spinny/spinny_cat_gay.gif
+spinny_cat_genderfluid, /emoji/spinny/spinny_cat_genderfluid.gif
+spinny_cat_intersex, /emoji/spinny/spinny_cat_intersex.gif
+spinny_cat_lesbian, /emoji/spinny/spinny_cat_lesbian.gif
+spinny_cat_nb, /emoji/spinny/spinny_cat_nb.gif
+spinny_cat_omnisexual, /emoji/spinny/spinny_cat_omnisexual.gif
+spinny_cat_pan, /emoji/spinny/spinny_cat_pan.gif
+spinny_cat_plural, /emoji/spinny/spinny_cat_plural.gif
+spinny_cat_polyam, /emoji/spinny/spinny_cat_polyam.gif
+spinny_cat_sapho_lesbian, /emoji/spinny/spinny_cat_sapho_lesbian.gif
+spinny_cat_trans, /emoji/spinny/spinny_cat_trans.gif
+spinny_cat_transfemme, /emoji/spinny/spinny_cat_transfemme.gif
+spinny_cat_transmasc, /emoji/spinny/spinny_cat_transmasc.gif
+spinny_cat_woem, /emoji/spinny/spinny_cat_woem.gif
+spinny_fox_ace, /emoji/spinny/spinny_fox_ace.gif
+spinny_fox_agender, /emoji/spinny/spinny_fox_agender.gif
+spinny_fox_ambiamorous, /emoji/spinny/spinny_fox_ambiamorous.gif
+spinny_fox_androgyne, /emoji/spinny/spinny_fox_androgyne.gif
+spinny_fox_aroace, /emoji/spinny/spinny_fox_aroace.gif
+spinny_fox_aro, /emoji/spinny/spinny_fox_aro.gif
+spinny_fox_bi, /emoji/spinny/spinny_fox_bi.gif
+spinny_fox_bigender, /emoji/spinny/spinny_fox_bigender.gif
+spinny_fox_blacktrans, /emoji/spinny/spinny_fox_blacktrans.gif
+spinny_fox_demiboy, /emoji/spinny/spinny_fox_demiboy.gif
+spinny_fox_demigirl, /emoji/spinny/spinny_fox_demigirl.gif
+spinny_fox_demilesbian, /emoji/spinny/spinny_fox_demilesbian.gif
+spinny_fox_demisexual, /emoji/spinny/spinny_fox_demisexual.gif
+spinny_fox_disability, /emoji/spinny/spinny_fox_disability.gif
+spinny_fox, /emoji/spinny/spinny_fox.gif
+spinny_fox_gay, /emoji/spinny/spinny_fox_gay.gif
+spinny_fox_genderfluid, /emoji/spinny/spinny_fox_genderfluid.gif
+spinny_fox_intersex, /emoji/spinny/spinny_fox_intersex.gif
+spinny_fox_lesbian, /emoji/spinny/spinny_fox_lesbian.gif
+spinny_fox_nb, /emoji/spinny/spinny_fox_nb.gif
+spinny_fox_omnisexual, /emoji/spinny/spinny_fox_omnisexual.gif
+spinny_fox_pan, /emoji/spinny/spinny_fox_pan.gif
+spinny_fox_plural, /emoji/spinny/spinny_fox_plural.gif
+spinny_fox_polyam, /emoji/spinny/spinny_fox_polyam.gif
+spinny_fox_sappho_lesbian, /emoji/spinny/spinny_fox_sappho_lesbian.gif
+spinny_fox_trans, /emoji/spinny/spinny_fox_trans.gif
+spinny_fox_transfemme, /emoji/spinny/spinny_fox_transfemme.gif
+spinny_fox_transmasc, /emoji/spinny/spinny_fox_transmasc.gif
+spinny_neocat, /emoji/spinny/spinny_neocat.gif
+spinny_neofox, /emoji/spinny/spinny_neofox.gif