634 lines
12 KiB
Diff
634 lines
12 KiB
Diff
diff -crB -x dist -x res -x build com.discord-832-base/assets/data/emojis.json com.discord-832/assets/data/emojis.json
|
|
*** com.discord-832-base/assets/data/emojis.json 2019-01-19 04:41:50.983097375 +0300
|
|
--- com.discord-832/assets/data/emojis.json 2019-01-19 04:43:43.043646700 +0300
|
|
***************
|
|
*** 1469,1474 ****
|
|
--- 1469,1677 ----
|
|
],
|
|
"surrogates": "🤞",
|
|
"hasDiversity": true
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "pilot"
|
|
+ ],
|
|
+ "hasDiversity": true,
|
|
+ "surrogates": "🧑✈"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "health_worker"
|
|
+ ],
|
|
+ "hasDiversity": true,
|
|
+ "surrogates": "🧑⚕"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "firefighter"
|
|
+ ],
|
|
+ "hasDiversity": true,
|
|
+ "surrogates": "🧑🥢"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "astronaut"
|
|
+ ],
|
|
+ "hasDiversity": true,
|
|
+ "surrogates": "🧑🚀"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "scientist"
|
|
+ ],
|
|
+ "hasDiversity": true,
|
|
+ "surrogates": "🧑🔬"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "mechanic"
|
|
+ ],
|
|
+ "hasDiversity": true,
|
|
+ "surrogates": "🧑🔧"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "technologist"
|
|
+ ],
|
|
+ "hasDiversity": true,
|
|
+ "surrogates": "🧑💻"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "chef"
|
|
+ ],
|
|
+ "hasDiversity": true,
|
|
+ "surrogates": "🧑🍳"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "monocle"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🧐"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "pleading"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🥺"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "cold"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🥶"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "hot"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🥵"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "woozy"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🥴"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "party_face"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🥳"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "smile_hearts"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🥰"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "mind_blown"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🤯"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "vomiting"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🤮"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "hand_over_mouth"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🤭"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "swearing"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🤬"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "shush"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🤫"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "crazy"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🤪"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "starry_eyes"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🤩"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "raised_eyebrow"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🤨"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "detective"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🕵"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "massage"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "💆"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "tipping_hand"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "💁"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "hot_shit"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "headpats"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "merperson"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🧜"
|
|
}
|
|
],
|
|
"nature": [
|
|
***************
|
|
*** 2453,2458 ****
|
|
--- 2656,2724 ----
|
|
"squid"
|
|
],
|
|
"surrogates": "🦑"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "furry_pride",
|
|
+ "rainbow_paw"
|
|
+ ],
|
|
+ "surrogates": "🌈"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "paw"
|
|
+ ],
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "awoo"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "dont_awoo",
|
|
+ "no_awoo"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "elf"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🧝"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "raccoon"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🦝"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "parrot"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🦜"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "peacock"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🦚"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "demon"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
}
|
|
],
|
|
"food": [
|
|
***************
|
|
*** 2980,2985 ****
|
|
--- 3246,3258 ----
|
|
"pancakes"
|
|
],
|
|
"surrogates": "🥞"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "cannabis_leaf"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
}
|
|
],
|
|
"activity": [
|
|
***************
|
|
*** 4163,4168 ****
|
|
--- 4436,4526 ----
|
|
"kayak"
|
|
],
|
|
"surrogates": "🛶"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "queer_100"
|
|
+ ],
|
|
+ "surrogates": "💯🌈"
|
|
+ },
|
|
+ {
|
|
+ "names": ["dont_at", "no_at", "no_mention", "dont_mention"],
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": ["neuter_symbol"],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "⚲"
|
|
+ },
|
|
+ {
|
|
+ "names": ["androgyne_symbol"],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "⚨"
|
|
+ },
|
|
+ {
|
|
+ "names": ["transgender_symbol"],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "⚧"
|
|
+ },
|
|
+ {
|
|
+ "names": ["male_female_symbol"],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "⚥"
|
|
+ },
|
|
+ {
|
|
+ "names": ["male_and_female_symbol"],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "⚤"
|
|
+ },
|
|
+ {
|
|
+ "names": ["two_male_symbols"],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "⚣"
|
|
+ },
|
|
+ {
|
|
+ "names": ["two_female_symbols"],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "⚢"
|
|
+ },
|
|
+ {
|
|
+ "names": ["red_heart"],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "♴"
|
|
+ },
|
|
+ {
|
|
+ "names": ["male_symbol"],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "♂"
|
|
+ },
|
|
+ {
|
|
+ "names": ["female_symbol"],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "♀"
|
|
+ },
|
|
+ {
|
|
+ "names": ["orange_heart"],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🧡"
|
|
+ },
|
|
+ {
|
|
+ "names": ["labrys_symbol"],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": ["bisexual_triangles"],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": ["black_triangle"],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": ["pink_triangle"],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
}
|
|
],
|
|
"objects": [
|
|
***************
|
|
*** 5271,5276 ****
|
|
--- 5629,5697 ----
|
|
"shopping_trolley"
|
|
],
|
|
"surrogates": "🛒"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "toilet_paper"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🧻"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "brick"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🧱"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "firecracker"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🧨"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "bone"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🦴"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "d20"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "d12"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "d10"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "d8"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "d4"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
}
|
|
],
|
|
"symbols": [
|
|
***************
|
|
*** 8629,8638 ****
|
|
},
|
|
{
|
|
"names": [
|
|
! "gay_pride_flag",
|
|
! "rainbow_flag"
|
|
],
|
|
"surrogates": "🏳️🌈"
|
|
}
|
|
]
|
|
}
|
|
\ No newline at end of file
|
|
--- 9050,9199 ----
|
|
},
|
|
{
|
|
"names": [
|
|
! "rainbow_flag",
|
|
! "gay_pride_flag"
|
|
],
|
|
"surrogates": "🏳️🌈"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "pirate_flag"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": "🏴️"
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "transgender_flag"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "polysexual_flag"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "polyamory_flag"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "pansexual_flag"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "nonbinary_flag"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "neutrois_flag"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "intersex_flag"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "genderqueer_flag"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "genderfluid_flag"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "deminonbinary_flag"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "demigirl_flag"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "demiguy_flag"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "bisexual_flag"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "bigender_flag"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "bear_flag"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "asexual_flag"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "aromantic_flag"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "agender_flag"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
+ },
|
|
+ {
|
|
+ "names": [
|
|
+ "lesbian_flag"
|
|
+ ],
|
|
+ "hasDiversity": false,
|
|
+ "surrogates": ""
|
|
}
|
|
]
|
|
}
|
|
\ No newline at end of file
|