From 05f2f79e0dee56220951ff19c0c0e4ac6d735f3d Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Fri, 5 Aug 2022 16:34:00 -0400 Subject: [PATCH] Update EHTags list --- .../tachiyomi/source/online/all/EHentai.kt | 4 +- app/src/main/java/exh/eh/EHTags.kt | 11 +- app/src/main/java/exh/eh/tags/Artist.kt | 335 +++++++------- app/src/main/java/exh/eh/tags/Artist2.kt | 322 +++++++++++++- app/src/main/java/exh/eh/tags/Character.kt | 183 +++++++- app/src/main/java/exh/eh/tags/Cosplayer.kt | 79 +++- app/src/main/java/exh/eh/tags/Female.kt | 77 +++- app/src/main/java/exh/eh/tags/Group.kt | 415 +++--------------- app/src/main/java/exh/eh/tags/Group2.kt | 342 +++++++++++++++ app/src/main/java/exh/eh/tags/Language.kt | 2 +- app/src/main/java/exh/eh/tags/Male.kt | 138 +++++- app/src/main/java/exh/eh/tags/Mixed.kt | 4 +- app/src/main/java/exh/eh/tags/Other.kt | 8 +- app/src/main/java/exh/eh/tags/Parody.kt | 75 +++- .../exh/eh/tags/{ReClass.kt => Reclass.kt} | 5 +- app/src/main/java/exh/eh/tags/TagList.kt | 5 +- 16 files changed, 1436 insertions(+), 569 deletions(-) create mode 100644 app/src/main/java/exh/eh/tags/Group2.kt rename app/src/main/java/exh/eh/tags/{ReClass.kt => Reclass.kt} (78%) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt index 08d3d7dae..1de8aed8d 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt @@ -853,8 +853,8 @@ class EHentai( ) }, AutoCompleteTags( - EHTags.getNamespaces0Tags().map { "$it:" } + EHTags.getAllTags(), - EHTags.getNamespaces0Tags().map { "$it:" }, + EHTags.getNamespaces().map { "$it:" } + EHTags.getAllTags(), + EHTags.getNamespaces().map { "$it:" }, excludePrefix, ), if (preferences.exhWatchedListDefaultState().get()) { diff --git a/app/src/main/java/exh/eh/EHTags.kt b/app/src/main/java/exh/eh/EHTags.kt index dbc777d7f..310c6fb55 100644 --- a/app/src/main/java/exh/eh/EHTags.kt +++ b/app/src/main/java/exh/eh/EHTags.kt @@ -6,31 +6,32 @@ import exh.eh.tags.Character import exh.eh.tags.Cosplayer import exh.eh.tags.Female import exh.eh.tags.Group +import exh.eh.tags.Group2 import exh.eh.tags.Language import exh.eh.tags.Male import exh.eh.tags.Mixed import exh.eh.tags.Other import exh.eh.tags.Parody -import exh.eh.tags.ReClass +import exh.eh.tags.Reclass object EHTags { - - fun getAllTags() = listOf( + fun getAllTags(): List = listOf( Female.getTags(), Male.getTags(), Language.getTags(), - ReClass.getTags(), + Reclass.getTags(), Mixed.getTags(), Other.getTags(), Cosplayer.getTags(), Parody.getTags(), Character.getTags(), Group.getTags(), + Group2.getTags(), Artist.getTags(), Artist2.getTags(), ).flatten().flatten() - fun getNamespaces0Tags() = listOf( + fun getNamespaces(): List = listOf( "reclass", "language", "parody", diff --git a/app/src/main/java/exh/eh/tags/Artist.kt b/app/src/main/java/exh/eh/tags/Artist.kt index 2406aba94..a7b7aead2 100644 --- a/app/src/main/java/exh/eh/tags/Artist.kt +++ b/app/src/main/java/exh/eh/tags/Artist.kt @@ -1,14 +1,15 @@ package exh.eh.tags object Artist : TagList { - - override fun getTags1() = listOf( + override fun getTags1(): List = listOf( "artist:-helic-", "artist:.357-inch", "artist:.less", "artist:007", + "artist:03", "artist:0rang3", "artist:0uka", + "artist:0w0wer", "artist:1 equals 2", "artist:1 tsu o", "artist:1-gou", @@ -48,7 +49,9 @@ object Artist : TagList { "artist:33297", "artist:348", "artist:34san", + "artist:35 machi", "artist:360", + "artist:38", "artist:39rou", "artist:3dcaptor", "artist:3e", @@ -94,8 +97,10 @@ object Artist : TagList { "artist:a.s. hermes", "artist:a.sou", "artist:a1", + "artist:a20", "artist:a5w", "artist:a6", + "artist:aa", "artist:aaa", "artist:aapon", "artist:aaron", @@ -135,12 +140,14 @@ object Artist : TagList { "artist:achumuchi", "artist:acid-lsd", "artist:acidapluvia", + "artist:acrobatic-sala", "artist:adachi cloud", "artist:adachi himiko", "artist:adachi ken", "artist:adachi kizoku", "artist:adachi mitsuru", "artist:adachi takumi", + "artist:adam ellis", "artist:adam wan", "artist:addis abeba", "artist:addyredragon", @@ -174,11 +181,13 @@ object Artist : TagList { "artist:agemo agm", "artist:agemon", "artist:agent red girl", + "artist:agent ss", "artist:agent tygress", "artist:aggro badger", "artist:agitype", "artist:agm", "artist:agroantirrhopus", + "artist:aguni-yunta", "artist:agurecchi", "artist:ahashima", "artist:ahcuna k bartista", @@ -195,6 +204,7 @@ object Artist : TagList { "artist:aida ruki", "artist:aida yu", "artist:aidans", + "artist:aihara", "artist:aihara shouta", "artist:aikawa ruru", "artist:aikawa ryou", @@ -303,6 +313,7 @@ object Artist : TagList { "artist:akikusa peperon", "artist:akimori akira", "artist:akimoto karma", + "artist:akimoto nigou", "artist:akimoto osamu", "artist:akimoto ryo", "artist:akinaie", @@ -395,6 +406,7 @@ object Artist : TagList { "artist:alfonso azpiri", "artist:alfort", "artist:alfre-tori", + "artist:alfredo pons rubio", "artist:alicecrazy", "artist:alicegawa chisato", "artist:alien1452", @@ -410,6 +422,7 @@ object Artist : TagList { "artist:alonzis dryke", "artist:alorok", "artist:alpha alf layla", + "artist:alphabravo", "artist:alpine", "artist:altereggo", "artist:alterinku", @@ -447,6 +460,7 @@ object Artist : TagList { "artist:amanatsu mero", "artist:amanda conner", "artist:amane hasuhito", + "artist:amane hayabusa", "artist:amane hiwo", "artist:amane toumei-do", "artist:amano ameno", @@ -635,6 +649,7 @@ object Artist : TagList { "artist:aono keita", "artist:aono rokugou", "artist:aono3", + "artist:aonosuke", "artist:aotsu umihito", "artist:aoume kaito", "artist:aox", @@ -648,6 +663,7 @@ object Artist : TagList { "artist:apart", "artist:apeiron-macro", "artist:aper", + "artist:aphrodos", "artist:apocalypse 3dx", "artist:apri", "artist:apulaz", @@ -727,6 +743,7 @@ object Artist : TagList { "artist:arne cooper", "artist:arno", "artist:aro hiroshi", + "artist:aro usagi", "artist:arobiro", "artist:arofa tamahn", "artist:aroma sensei", @@ -751,6 +768,7 @@ object Artist : TagList { "artist:aru tera", "artist:aruginin", "artist:arukime desu", + "artist:arukuno troy", "artist:arumamai ayuka plus", "artist:aruman", "artist:aruto naruto", @@ -798,6 +816,7 @@ object Artist : TagList { "artist:ashely", "artist:ashibi", "artist:ashimoto yoika", + "artist:ashina mellow", "artist:ashinano hitoshi", "artist:ashiomi masato", "artist:ashisyun", @@ -814,6 +833,7 @@ object Artist : TagList { "artist:assley", "artist:astarael abhorsen", "artist:aster crowley", + "artist:astraea-r", "artist:astroguy2", "artist:asuka yumiki", "artist:asuka111", @@ -824,6 +844,7 @@ object Artist : TagList { "artist:at2.", "artist:ataka atsushi", "artist:atamae", + "artist:atamajakusha", "artist:atari hiroyuki", "artist:atari-mitsuku", "artist:atatata-p", @@ -910,6 +931,7 @@ object Artist : TagList { "artist:azuma tesshin", "artist:azuma yuki", "artist:azumamituki", + "artist:azumaya manju", "artist:azumi amane", "artist:azumi asami", "artist:azumi tohru", @@ -946,6 +968,7 @@ object Artist : TagList { "artist:bajinappo", "artist:bajou takurou", "artist:bak hyeong jun", + "artist:bakemonoy", "artist:bakerboi", "artist:baku p", "artist:balakir", @@ -969,6 +992,7 @@ object Artist : TagList { "artist:barascrawls", "artist:barasui", "artist:barbara canepa", + "artist:barbarian takamoto", "artist:bard", "artist:bareisho", "artist:barlun", @@ -981,6 +1005,7 @@ object Artist : TagList { "artist:basnip", "artist:bastien vives", "artist:basuke", + "artist:basyosyo", "artist:batako", "artist:bathgate21", "artist:battle franky", @@ -1010,11 +1035,13 @@ object Artist : TagList { "artist:belka dog", "artist:bellendviii", "artist:bellsuke", + "artist:bellum", "artist:bemannen", "artist:ben 10mil", "artist:ben987", "artist:bendzz", "artist:benhxgx", + "artist:beniamino delvecchio", "artist:benico", "artist:benishouga", "artist:benisuzume", @@ -1086,6 +1113,7 @@ object Artist : TagList { "artist:blackwhiplash", "artist:blacnovasfm", "artist:blakknight08", + "artist:blanclauz", "artist:blargsnarf", "artist:bleedingpervert", "artist:blink3r", @@ -1094,6 +1122,7 @@ object Artist : TagList { "artist:blondevelvet", "artist:blood asp", "artist:bloomer hogero", + "artist:blox", "artist:blu3danny", "artist:bludraconoid", "artist:blue gk", @@ -1129,6 +1158,7 @@ object Artist : TagList { "artist:bon curry", "artist:bon-3000", "artist:bonaparte gohan", + "artist:bonerbob", "artist:bones", "artist:bonnie", "artist:bonriki honten", @@ -1140,9 +1170,12 @@ object Artist : TagList { "artist:boobsterprime", "artist:boogsburr", "artist:bookmoun10", + "artist:boole", + "artist:boon", "artist:bootyelectric", "artist:borba", "artist:bored user", + "artist:boris alien", "artist:borisu", "artist:born-to-die", "artist:borscht", @@ -1176,6 +1209,7 @@ object Artist : TagList { "artist:bronxden", "artist:brother pierrot", "artist:brother-tico", + "artist:brulee", "artist:bruno coq", "artist:bruno di sano", "artist:bruno diaz", @@ -1192,6 +1226,7 @@ object Artist : TagList { "artist:bunapi 397 yen", "artist:burbur", "artist:buredo", + "artist:burgers n shakes", "artist:buriburi gakko", "artist:buriteri", "artist:burst 1", @@ -1239,8 +1274,10 @@ object Artist : TagList { "artist:campbell gichou", "artist:campyo master", "artist:camwoo", + "artist:cancerdoge", "artist:candle", "artist:candychameleon", + "artist:candyfoxy", "artist:cang ye ji", "artist:canon-thought", "artist:capgrolarbear", @@ -1291,6 +1328,7 @@ object Artist : TagList { "artist:cerberus", "artist:cerberuslives", "artist:cerbskies", + "artist:cesar carpio", "artist:cesar rolando lopez castaneda", "artist:cesium", "artist:cevoy", @@ -1306,6 +1344,7 @@ object Artist : TagList { "artist:chalo", "artist:cham22", "artist:chameleon", + "artist:chamu", "artist:chaney su", "artist:chango-tan", "artist:chanpon miyabi", @@ -1317,9 +1356,9 @@ object Artist : TagList { "artist:charie", "artist:charles williams", "artist:charmal", - "artist:chat bleu", "artist:chat noir", "artist:chataro", + "artist:chatbleu3dx", "artist:chauvel", "artist:chawanmushi", "artist:chcrumbles", @@ -1327,6 +1366,7 @@ object Artist : TagList { "artist:cheeky nuttybuns", "artist:cheesy-pie", "artist:cheezyweapon", + "artist:chelodoy", "artist:chemicq", "artist:cherry-gig", "artist:chery in the sun", @@ -1399,6 +1439,7 @@ object Artist : TagList { "artist:chomoyama", "artist:choney", "artist:choomnivoro", + "artist:chou amaki", "artist:chou creme", "artist:chou shippaisaku", "artist:chouchin ankou", @@ -1412,6 +1453,7 @@ object Artist : TagList { "artist:chris3000", "artist:christian darasse", "artist:christian de metter", + "artist:christian godard", "artist:christian paty", "artist:christian zanier", "artist:chujiao", @@ -1485,9 +1527,11 @@ object Artist : TagList { "artist:convard", "artist:cookie lovey", "artist:cool kyou shinja", + "artist:cor369", "artist:cornnell clarke", "artist:corruptking", "artist:corvus pointer", + "artist:cosbi", "artist:cosine", "artist:cosmic", "artist:cosmic vanellope", @@ -1547,6 +1591,7 @@ object Artist : TagList { "artist:cureeper", "artist:curlytopzas", "artist:curvesector", + "artist:custotem", "artist:cuzukago", "artist:cwodrex", "artist:cy.nicism", @@ -1612,11 +1657,13 @@ object Artist : TagList { "artist:daniels k.", "artist:danilo barozzi", "artist:danilo correa", + "artist:dankestofdans", "artist:danp", "artist:danrenji", "artist:dantesward", "artist:dantetsu", "artist:dany", + "artist:daram", "artist:darius-kun", "artist:dark aldebaran", "artist:dark creaturez", @@ -1624,6 +1671,7 @@ object Artist : TagList { "artist:dark molestia", "artist:dark ryev", "artist:dark violet", + "artist:dark-rasp", "artist:darkchibishadow", "artist:darkdp", "artist:darker eve", @@ -1641,7 +1689,6 @@ object Artist : TagList { "artist:darkstardirewolf", "artist:darkuro 27", "artist:darkwaters", - "artist:darth haylee", "artist:darth wave", "artist:daruak", "artist:daruton", @@ -1681,6 +1728,7 @@ object Artist : TagList { "artist:decca19", "artist:dee", "artist:deep purple 72", + "artist:defaultz", "artist:deilan12", "artist:dekamarasu shirokko", "artist:dekosuke 18gou", @@ -1697,6 +1745,7 @@ object Artist : TagList { "artist:denbu momo", "artist:denchi", "artist:denden taiko", + "artist:dendoro kakariya", "artist:denis merezette", "artist:denizen", "artist:denjiryoku", @@ -1770,12 +1819,14 @@ object Artist : TagList { "artist:doahdm", "artist:dobunezumi", "artist:doburocky", + "artist:doco", "artist:doctor", "artist:doctor ellios", "artist:doctor masube", "artist:doctor proxy", "artist:dodai shouji", "artist:dodemoiee", + "artist:dodo-bot", "artist:dodomeiro mayonnaise", "artist:dodomesu3sei", "artist:dogezaemon", @@ -1790,12 +1841,14 @@ object Artist : TagList { "artist:doku corne", "artist:doku-chan", "artist:dokukinokozin", + "artist:dokuneko noil", "artist:dokurosan", "artist:doldolphin", "artist:doll", "artist:doll suke", "artist:dolphin", "artist:dom03", + "artist:domingo roberto mandrafina", "artist:domingues horacio", "artist:dominique saint-marc", "artist:dominique vallet", @@ -1803,7 +1856,6 @@ object Artist : TagList { "artist:donald rust", "artist:donaught", "artist:donkey", - "artist:donnaloli", "artist:donovan mallory", "artist:doobutsu no kodomo", "artist:doom ghost", @@ -1820,6 +1872,7 @@ object Artist : TagList { "artist:doro doneru", "artist:dorota bou", "artist:doru", + "artist:dossei junai", "artist:doublepines", "artist:douglas kim", "artist:douglo", @@ -1828,6 +1881,7 @@ object Artist : TagList { "artist:doyachii", "artist:dpc", "artist:dr badenov", + "artist:dr nihilismo", "artist:dr rex", "artist:dr. comet", "artist:dr. edgar slam", @@ -1846,6 +1900,7 @@ object Artist : TagList { "artist:dragoon tequila", "artist:dragoon-rekka", "artist:drake m. ohkami", + "artist:drake powers", "artist:dramus", "artist:drawmj", "artist:dreadknight0", @@ -1883,6 +1938,7 @@ object Artist : TagList { "artist:e equals mc2", "artist:e-eji", "artist:e-musu aki", + "artist:e. c. segar", "artist:e. e. davis", "artist:e.j. morges", "artist:e.m. ton", @@ -1893,6 +1949,7 @@ object Artist : TagList { "artist:eb110ss", "artist:ebdc", "artist:ebenezer slime", + "artist:ebi riiko", "artist:ebi193", "artist:ebidou", "artist:ebifly", @@ -1918,6 +1975,7 @@ object Artist : TagList { "artist:eddy belly", "artist:edgar sandoval", "artist:edika", + "artist:edkas", "artist:edo nova", "artist:edo shigezu", "artist:edogawa gabal", @@ -1944,6 +2002,9 @@ object Artist : TagList { "artist:eitaisa", "artist:eitchna", "artist:ekakibit", + ) + + override fun getTags2(): List = listOf( "artist:ekataraf", "artist:el at tewi", "artist:el bondage", @@ -1958,6 +2019,7 @@ object Artist : TagList { "artist:elis 120 percent", "artist:eliskalti", "artist:ello", + "artist:elocca", "artist:elsevilla", "artist:eltole", "artist:elton portilho", @@ -1986,6 +2048,7 @@ object Artist : TagList { "artist:endy vatriano", "artist:enigma", "artist:enka shiahara", + "artist:ennmedoo", "artist:eno", "artist:eno akira", "artist:eno yukimi", @@ -2003,9 +2066,6 @@ object Artist : TagList { "artist:epic donburi", "artist:eqamrd", "artist:equidna", - ) - - override fun getTags2() = listOf( "artist:era", "artist:eraanthe", "artist:erbenkranz", @@ -2077,6 +2137,7 @@ object Artist : TagList { "artist:evulchibi", "artist:ewr-115", "artist:ex-buster-wolf", + "artist:exa takahito", "artist:exile factory", "artist:expand-blurples", "artist:extreme", @@ -2132,6 +2193,7 @@ object Artist : TagList { "artist:feuh", "artist:fey tas", "artist:fidchell", + "artist:fiftyfifthfleet", "artist:figgot", "artist:figgylicious", "artist:fight fight chiharu", @@ -2151,6 +2213,8 @@ object Artist : TagList { "artist:fleatrollus", "artist:flick", "artist:flicker show", + "artist:flor", + "artist:flowersimh", "artist:flt", "artist:fluff kevlar", "artist:fluffy pokemon", @@ -2201,6 +2265,7 @@ object Artist : TagList { "artist:fred perry", "artist:frederic bezian", "artist:fredo j", + "artist:fredricton3d", "artist:fredrik k.t. andersson", "artist:free style", "artist:freecree", @@ -2222,6 +2287,7 @@ object Artist : TagList { "artist:fudou ran", "artist:fuetakishi", "artist:fugetsu taku", + "artist:fugubarakun", "artist:fuguri sensen", "artist:fuhma misaki", "artist:fuji katsupiko", @@ -2250,7 +2316,9 @@ object Artist : TagList { "artist:fujimoto gou", "artist:fujimoto haruki", "artist:fujimoto hideaki", + "artist:fujinaga eri", "artist:fujinasu taka", + "artist:fujine yuki", "artist:fujino tobi", "artist:fujino yoshika", "artist:fujinomiya yuu", @@ -2304,10 +2372,12 @@ object Artist : TagList { "artist:furanshisu", "artist:furball", "artist:furburner", + "artist:furfeathertickling", "artist:furipa", "artist:furisuku", "artist:furlana", "artist:furoneka", + "artist:furrpurrv", "artist:furry pinups", "artist:furrymoan", "artist:furu-furu", @@ -2320,6 +2390,7 @@ object Artist : TagList { "artist:fusataka sikibu", "artist:fushigi usagi", "artist:fushiki", + "artist:fushitas", "artist:fusisya o", "artist:futa", "artist:futaba masumi", @@ -2353,6 +2424,7 @@ object Artist : TagList { "artist:g-wara", "artist:g. pinto", "artist:g.b onodera", + "artist:g1", "artist:g13d", "artist:g3ida", "artist:ga one", @@ -2392,6 +2464,8 @@ object Artist : TagList { "artist:gatchapowa", "artist:gatery", "artist:gatorade panda", + "artist:gaz-knightofnylrac", + "artist:geabull", "artist:geekyguy28", "artist:gege-san", "artist:gei oji", @@ -2402,9 +2476,9 @@ object Artist : TagList { "artist:gelatin", "artist:gelmaga", "artist:gemurax", - "artist:genda shou", "artist:gene bilbrew", "artist:genen", + "artist:general-butch", "artist:genha", "artist:genn", "artist:genral sci", @@ -2497,7 +2571,6 @@ object Artist : TagList { "artist:gorilla m", "artist:gorima tsuchio", "artist:goriwednesday", - "artist:goro", "artist:goro ichi", "artist:gorohati", "artist:gorou naoki", @@ -2630,7 +2703,7 @@ object Artist : TagList { "artist:hagane soushi", "artist:hagane tetsu", "artist:hagane type", - "artist:haganef", + "artist:hagane.f", "artist:haganemaru kennosuke", "artist:hagen wolfhowl", "artist:hagetaka", @@ -2692,6 +2765,7 @@ object Artist : TagList { "artist:hanainu", "artist:hanamaki kaeru", "artist:hanamizawa q-tarou", + "artist:hanamoto ari", "artist:hanamura torirou", "artist:hanao.", "artist:hanas", @@ -2719,6 +2793,7 @@ object Artist : TagList { "artist:hara tetsuo", "artist:hara yui", "artist:haracock", + "artist:harada shigemitsu", "artist:harada takehito", "artist:harapeko kakko-nemumari", "artist:harazaki takuma", @@ -2779,6 +2854,7 @@ object Artist : TagList { "artist:hatakeyama tohya", "artist:hataraki ari", "artist:hatch", + "artist:hatikumo rin", "artist:hatimoto", "artist:hato", "artist:hatokonro", @@ -2816,6 +2892,7 @@ object Artist : TagList { "artist:hayato rikin", "artist:haymaker", "artist:hazaki", + "artist:hazama null", "artist:hazuki aoi", "artist:hazuki ayanosuke", "artist:hazuki kai", @@ -2835,6 +2912,7 @@ object Artist : TagList { "artist:heigani", "artist:heijitu", "artist:heiqing langjun", + "artist:hellap", "artist:hellonearth-iii", "artist:helmut kruger", "artist:henkuma", @@ -2888,8 +2966,10 @@ object Artist : TagList { "artist:higashizukihi sei", "artist:hige nii", "artist:higenamuchi", + "artist:higeneko", "artist:higgy", "artist:high heeled jill", + "artist:high-bear", "artist:highfive", "artist:highlow", "artist:highonfairydust", @@ -2977,6 +3057,7 @@ object Artist : TagList { "artist:hirose rika", "artist:hirose souji", "artist:hiroshiki", + "artist:hirota shimaguni", "artist:hirotake awataka", "artist:hirotti", "artist:hiru-kun no ami", @@ -3055,6 +3136,7 @@ object Artist : TagList { "artist:hori airi", "artist:hori hiraki", "artist:hori hiroaki", + "artist:hori kimitsu", "artist:horibe hiderou", "artist:horie tankei", "artist:horihone saizou", @@ -3093,6 +3175,7 @@ object Artist : TagList { "artist:hotei kazuha", "artist:hotkeke", "artist:hotred", + "artist:hotter daimon", "artist:hou", "artist:houjoh akira", "artist:houmatu awa", @@ -3234,6 +3317,7 @@ object Artist : TagList { "artist:ilya kuvshinov", "artist:imaajfpstnfo", "artist:imada hidehito", + "artist:imajin kouji", "artist:imaki hitotose", "artist:imazon", "artist:imilios", @@ -3242,6 +3326,7 @@ object Artist : TagList { "artist:imofuki", "artist:imomushi", "artist:imortal", + "artist:imp underneath", "artist:imsmexyftw", "artist:ina harakiri", "artist:inaba cozy", @@ -3288,6 +3373,7 @@ object Artist : TagList { "artist:inoue tommy", "artist:inoue yoshihisa", "artist:inseki 3gou", + "artist:instanttnoodle", "artist:interstellar", "artist:intoxicatedsquid", "artist:intrigue3d", @@ -3302,6 +3388,7 @@ object Artist : TagList { "artist:inui haruka", "artist:inui nuinu", "artist:inui sekihiko", + "artist:inui slash byte.", "artist:inukami", "artist:inukami inoji", "artist:inukon geek.", @@ -3337,6 +3424,8 @@ object Artist : TagList { "artist:isako rokuroh", "artist:isamatu", "artist:isami nozomi", + "artist:isashii miyo", + "artist:isashinkiro", "artist:isawa nohri", "artist:iseki shuuichi", "artist:ishida sui", @@ -3348,7 +3437,9 @@ object Artist : TagList { "artist:ishii miring", "artist:ishii takamori", "artist:ishii takashi", + "artist:ishikawa akihito", "artist:ishikawa hirodi", + "artist:ishikawa sadahal", "artist:ishikei", "artist:ishimura", "artist:ishinomori kotomi", @@ -3362,6 +3453,7 @@ object Artist : TagList { "artist:isobe toast", "artist:isorashi", "artist:isse", + "artist:isshiki fuji", "artist:issi-13", "artist:issue 69", "artist:isz janeway", @@ -3430,9 +3522,11 @@ object Artist : TagList { "artist:izumi mahiru", "artist:izumi nanase", "artist:izumi rei", + "artist:izumi rion", "artist:izumi sai", "artist:izumi shiina", "artist:izumi tsubasu", + "artist:izumi yakumo", "artist:izumi yayoi", "artist:izumi yuujiro", "artist:izumimori mana", @@ -3459,6 +3553,7 @@ object Artist : TagList { "artist:jack jadson", "artist:jack staller", "artist:jackalope", + "artist:jackarydraws", "artist:jackasss", "artist:jacket freak", "artist:jackie kameyama", @@ -3532,6 +3627,7 @@ object Artist : TagList { "artist:jeibee", "artist:jellytits7", "artist:jenigata", + "artist:jeremy bastian", "artist:jeremy bernal", "artist:jerry t.n. thompson", "artist:jess fink", @@ -3602,10 +3698,12 @@ object Artist : TagList { "artist:john m. pound", "artist:john martello", "artist:john persons", + "artist:john prengaman", "artist:john shinjiro", "artist:john sitch-oh", "artist:johngate", "artist:johnny2dix", + "artist:johnofalltrades", "artist:joixxx", "artist:jojoart", "artist:jolly jack", @@ -3639,6 +3737,7 @@ object Artist : TagList { "artist:joseph caesar s.d.", "artist:joseph farrel", "artist:joseph michael linsner", + "artist:josh the tiger", "artist:josie purr", "artist:josieokami", "artist:josukespimphand", @@ -3660,8 +3759,10 @@ object Artist : TagList { "artist:judas mieko", "artist:judith karla", "artist:judy jong", + "artist:jugganaut", "artist:jul3d", "artist:jules de bruycker", + "artist:julio ribera", "artist:julius zimmerman", "artist:junex2", "artist:junji ito", @@ -3670,6 +3771,7 @@ object Artist : TagList { "artist:junny", "artist:junqspace", "artist:junsui na fujunbutsu", + "artist:junyoh maru", "artist:justin b. addison", "artist:justin long", "artist:justmegabenewell", @@ -3703,6 +3805,7 @@ object Artist : TagList { "artist:kabuki homewood", "artist:kaburagi chiyu", "artist:kacho", + "artist:kada buriko", "artist:kadan", "artist:kadokura miya", "artist:kadomaki shinnosuke", @@ -3770,6 +3873,7 @@ object Artist : TagList { "artist:kakashi asahiro", "artist:kakashi dragon", "artist:kakashichi", + "artist:kakei kei", "artist:kakenashi", "artist:kakeru", "artist:kakimoto kenjirou", @@ -3814,6 +3918,7 @@ object Artist : TagList { "artist:kamiyama aya", "artist:kamogawa tanuki", "artist:kamonari", + "artist:kamoshika ryo", "artist:kamotama", "artist:kamoto", "artist:kamudragon", @@ -3876,6 +3981,7 @@ object Artist : TagList { "artist:kanou seisaku", "artist:kanou soukyuu", "artist:kanoue hiji", + "artist:kanpancake", "artist:kanra karakara", "artist:kanroame", "artist:kantamaki yui", @@ -3899,6 +4005,9 @@ object Artist : TagList { "artist:karasuuri", "artist:karateka value", "artist:karen", + ) + + override fun getTags3(): List = listOf( "artist:karen kyuu", "artist:kari", "artist:karino hasumi", @@ -3929,6 +4038,7 @@ object Artist : TagList { "artist:kashiwamori tama", "artist:kasose", "artist:kassandra leigh purcell", + "artist:kasstt", "artist:kasukabe akira", "artist:kasukabe taro", "artist:kasuki masato", @@ -3989,6 +4099,8 @@ object Artist : TagList { "artist:kawai kenji", "artist:kawai roh", "artist:kawai tamaran", + "artist:kawaii jiro", + "artist:kawajili", "artist:kawakami takashi", "artist:kawamori misaki", "artist:kawamoto hiroshi", @@ -4006,9 +4118,6 @@ object Artist : TagList { "artist:kawatsu kenjiro", "artist:kawazuko chouji", "artist:kawazukuu", - ) - - override fun getTags3() = listOf( "artist:kaya", "artist:kayabanashi", "artist:kayama kifumi", @@ -4019,6 +4128,7 @@ object Artist : TagList { "artist:kayzer", "artist:kazabuki poni", "artist:kazamitiu", + "artist:kazan meu", "artist:kazan no you", "artist:kazasuzu", "artist:kazehaya sora", @@ -4166,6 +4276,7 @@ object Artist : TagList { "artist:kimuti", "artist:kin no tamamushi", "artist:kinbara1099", + "artist:kincyaku tamago", "artist:kindatsu", "artist:kinema tenka", "artist:king of nymphs", @@ -4207,6 +4318,7 @@ object Artist : TagList { "artist:kirimochi nie", "artist:kirimomi shoot", "artist:kirimoto yuuji", + "artist:kirimu latte", "artist:kirin kakeru", "artist:kirinada", "artist:kirino mokutan", @@ -4371,6 +4483,7 @@ object Artist : TagList { "artist:kokujin", "artist:kokuko", "artist:kokumotsu", + "artist:kokumotu suiren", "artist:kokuryuugan", "artist:kokyo k", "artist:komagata", @@ -4398,6 +4511,7 @@ object Artist : TagList { "artist:konata hyuura", "artist:konbu plus", "artist:kondas peter", + "artist:kondoh rururu", "artist:konecha", "artist:konjou natsumi", "artist:konkichi", @@ -4520,6 +4634,7 @@ object Artist : TagList { "artist:kuloamaki", "artist:kuma hachi", "artist:kuma-chan", + "artist:kuma-x", "artist:kumada", "artist:kumada kazushi", "artist:kumamoto aichi", @@ -4534,6 +4649,7 @@ object Artist : TagList { "artist:kumiko", "artist:kumoi takashi", "artist:kumon ryuu", + "artist:kunaboto", "artist:kunaixx", "artist:kunieda saika", "artist:kunitsu takeshi", @@ -4659,8 +4775,10 @@ object Artist : TagList { "artist:kusano kouichi", "artist:kusano takayuki", "artist:kusatsu terunyo", + "artist:kusi zaki", "artist:kusnoha kaede", "artist:kusoniku yokichi", + "artist:kusothumu", "artist:kusoyaza", "artist:kusshii", "artist:kusui aruta", @@ -4760,11 +4878,14 @@ object Artist : TagList { "artist:lento", "artist:leo", "artist:leo fontan", + "artist:leobo", "artist:leonardo 16sei", "artist:leons-7", + "artist:lestart", "artist:leta", "artist:letdie", "artist:lettuce rice", + "artist:lewd saiga", "artist:lewdcactus64", "artist:lewdstuff", "artist:lewis", @@ -4785,6 +4906,7 @@ object Artist : TagList { "artist:linbo", "artist:linda", "artist:link", + "artist:linkz artz", "artist:lionel", "artist:lionel bret", "artist:liquid n", @@ -4799,6 +4921,7 @@ object Artist : TagList { "artist:liveis watanabe", "artist:liver sashi", "artist:lizardbeth", + "artist:lizardlars", "artist:ljrmr", "artist:lock-master", "artist:lockheart", @@ -4844,6 +4967,7 @@ object Artist : TagList { "artist:ls", "artist:luberne", "artist:luca tarlazzi", + "artist:luccatoasty", "artist:lucio filippucci", "artist:lucusold", "artist:lucy fuchs", @@ -4862,6 +4986,7 @@ object Artist : TagList { "artist:lunarez", "artist:lunch", "artist:luolan", + "artist:luxu", "artist:luxurious blue", "artist:lvl3toaster", "artist:lvzergide", @@ -4906,6 +5031,7 @@ object Artist : TagList { "artist:mad rupert", "artist:mad-project", "artist:mada tarou", + "artist:madana", "artist:madbunny", "artist:made from lazers", "artist:madeinheaven", @@ -4931,8 +5057,10 @@ object Artist : TagList { "artist:magaska", "artist:magenta", "artist:maggi", + "artist:magic a2", "artist:magical bandai", "artist:magifuro konnyaku", + "artist:magister", "artist:magnificent arsehole", "artist:magnificent sexy gals", "artist:magnolia-baillon", @@ -4941,6 +5069,7 @@ object Artist : TagList { "artist:maguro teikoku", "artist:mahan.", "artist:mahanmyou", + "artist:mahiru", "artist:mahiruno kagerou", "artist:maicu", "artist:maigleco", @@ -4975,6 +5104,7 @@ object Artist : TagList { "artist:makko reader", "artist:mako", "artist:mako kujira", + "artist:mako3d", "artist:makoto", "artist:makuma ikeru", "artist:malcolm.x", @@ -5022,6 +5152,7 @@ object Artist : TagList { "artist:mara iafew", "artist:marble soda", "artist:marc brunet", + "artist:marc sibel", "artist:marcel gotlib", "artist:marcelo mueller", "artist:marcelo sosa", @@ -5056,6 +5187,7 @@ object Artist : TagList { "artist:marsminer", "artist:martan", "artist:marthasays", + "artist:marti riera", "artist:martin frei", "artist:martincorps", "artist:maru dasshu", @@ -5103,6 +5235,7 @@ object Artist : TagList { "artist:masugitsune", "artist:masujima kensue", "artist:mataaro", + "artist:matanuki", "artist:matashita kintama", "artist:materiarucou", "artist:maternal-reads", @@ -5117,6 +5250,7 @@ object Artist : TagList { "artist:matsu-sensei", "artist:matsuba", "artist:matsubayashi nagana", + "artist:matsuda val", "artist:matsudo aya", "artist:matsue", "artist:matsuka", @@ -5141,6 +5275,7 @@ object Artist : TagList { "artist:matsurika youko", "artist:matsurino naginata", "artist:matsurioka hideyuki", + "artist:matsuriuta", "artist:matsuryu", "artist:matsusaka takeshi", "artist:matsushima namio", @@ -5162,9 +5297,11 @@ object Artist : TagList { "artist:mattro", "artist:matumoto kei", "artist:matuokanili", + "artist:mauricio santoro", "artist:mauro masi", "artist:mavis rooder", "artist:maws-paws", + "artist:max bunker", "artist:max cabanes", "artist:max giwa", "artist:maxblackrabbit", @@ -5207,6 +5344,7 @@ object Artist : TagList { "artist:meguro linu", "artist:meguro sankichi", "artist:mehlewds", + "artist:meima", "artist:meisamu", "artist:mekabu aji max", "artist:mekakushi 490", @@ -5247,6 +5385,7 @@ object Artist : TagList { "artist:mhk", "artist:mi", "artist:mia", + "artist:mianno", "artist:miaspice", "artist:mibry", "artist:mibu natsuki", @@ -5286,8 +5425,10 @@ object Artist : TagList { "artist:miduki monica", "artist:miduki sho", "artist:miduno kenshi", + "artist:miduta nashiko", "artist:mifune seijirou", "artist:migi rider", + "artist:miginer", "artist:miginohito mitsuru", "artist:mignon", "artist:miguel aldasoro", @@ -5421,6 +5562,7 @@ object Artist : TagList { "artist:miranda leigh", "artist:mirco cabbia", "artist:mirin fu-ka", + "artist:mirka andolfo", "artist:mirka lugosi", "artist:miro", "artist:mirror stage", @@ -5597,6 +5739,7 @@ object Artist : TagList { "artist:mmmnomu", "artist:mncncr", "artist:mo", + "artist:mo oku", "artist:moa caret", "artist:moai tentyou", "artist:mocchi au lait", @@ -5637,6 +5780,9 @@ object Artist : TagList { "artist:molokonomi", "artist:molta", "artist:molybdenumgp03", + "artist:momi oji", + "artist:momia hair", + "artist:momitu", "artist:momizi inori", "artist:momizi-kei", "artist:momo inu", @@ -5650,6 +5796,7 @@ object Artist : TagList { "artist:momoi ryouta", "artist:momoiro manjiru", "artist:momoiro-kun", + "artist:momoko", "artist:momonashi potato", "artist:momono yuuca", "artist:momonohito", @@ -5739,6 +5886,7 @@ object Artist : TagList { "artist:motolog", "artist:motozaki akira", "artist:motsuaki", + "artist:motto and notto", "artist:moulin brush", "artist:mountain gori", "artist:mousou-kun", @@ -5757,6 +5905,7 @@ object Artist : TagList { "artist:mr professor", "artist:mr scrambled", "artist:mr synnerster", + "artist:mr unlucky", "artist:mr. 32", "artist:mr. estella", "artist:mr. got", @@ -5777,6 +5926,7 @@ object Artist : TagList { "artist:mrsmancuspia", "artist:mrswindle94", "artist:mrwes", + "artist:mrzapster", "artist:ms-john", "artist:ms-seven0", "artist:msl", @@ -5784,6 +5934,8 @@ object Artist : TagList { "artist:mt", "artist:mtno", "artist:mu-inu475", + "artist:mu-q", + "artist:mubi juno", "artist:mucchiri chanbon", "artist:mucco", "artist:mucha", @@ -5792,6 +5944,7 @@ object Artist : TagList { "artist:muffinmajima", "artist:mugen no ossan", "artist:mugen-dai", + "artist:mugicya world", "artist:muhboobz", "artist:muhny", "artist:muichimon", @@ -5855,159 +6008,5 @@ object Artist : TagList { "artist:mutsuki", "artist:mutsuki lime", "artist:mutsuki ooyashima", - "artist:mutsuki tsutomu", - "artist:mutsutake", - "artist:mutuki shin", - "artist:mutumi", - "artist:mutunari", - "artist:mv", - "artist:mw", - "artist:mx2j", - "artist:myanie", - "artist:myanko64", - "artist:mydirtydrawings", - "artist:myheartpumpspiss", - "artist:myke greywolf", - "artist:mylf3d", - "artist:myohjin tsubasa", - "artist:myrage", - "artist:myrho", - "artist:mysterious joe", - "artist:myuk", - "artist:myuratch", - "artist:mz09", - "artist:n. dofline", - "artist:n.o. chachamaru", - "artist:n.w.f.", - "artist:n0ncanon", - "artist:n6str6m6", - "artist:n820", - "artist:na-nu", - "artist:nabakaine", - "artist:nabeshiki", - "artist:nabeshima mike", - "artist:nabriales the majestic", - "artist:nacho fernandez", - "artist:nadaka harutsugu", - "artist:nadareishi", - "artist:nadzuka", - "artist:naga", - "artist:nagai go", - "artist:nagai wataru", - "artist:nagaikusa", - "artist:nagano akane", - "artist:nagano mamoru", - "artist:nagao yamahiko", - "artist:nagaraya", - "artist:nagare", - "artist:nagare hyo-go", - "artist:nagareboshi", - "artist:nagasaki biidoro", - "artist:nagase haruhito", - "artist:nagase rurio", - "artist:nagashima chosuke", - "artist:nagasio", - "artist:nagatoro sei", - "artist:nagatsuki futsuka", - "artist:nagatsuki misoka", - "artist:nagayama yuunon", - "artist:nagi haruka", - "artist:nagi ichi", - "artist:nagisano usagi", - "artist:nagisawa you", - "artist:nagita tooko", - "artist:naglfar", - "artist:nago nayuta", - "artist:nago.k", - "artist:nagominto", - "artist:nagoyacochin", - "artist:nagumo haruka", - "artist:naha 78", - "artist:nai al", - "artist:naito loveca", - "artist:naito tomoaki", - "artist:naitou gura", - "artist:naitou ryuu", - "artist:naitou satoshi", - "artist:najiga nameta", - "artist:najima keiji", - "artist:naka shinobu", - "artist:nakadera akira", - "artist:nakaduki yuuna", - "artist:nakafusa momo", - "artist:nakagawa you", - "artist:nakagomi", - "artist:nakahara yozy", - "artist:nakahira masahiko", - "artist:nakajima akihiko", - "artist:nakajima atsuko", - "artist:nakajima fumio", - "artist:nakajima rei", - "artist:nakajima tomoki", - "artist:nakajima yuka", - "artist:nakakawa a", - "artist:nakamori itto", - "artist:nakamura hirofumi", - "artist:nakamura hisashi", - "artist:nakamura kafka", - "artist:nakamura nishiki", - "artist:nakamura regura", - "artist:nakamura sakyou", - "artist:nakamura subaru", - "artist:nakamura touya", - "artist:nakamura uzuki", - "artist:nakamura zeus", - "artist:nakano sora", - "artist:nakano tomokazu", - "artist:nakanoo kei", - "artist:nakao hamu", - "artist:nakata mitsuru", - "artist:nakata modem", - "artist:nakata shunpei", - "artist:nakata yumi", - "artist:nakatani nio", - "artist:nakatsu kenji", - "artist:nakatsukasa shou", - "artist:nakayama masaaki", - "artist:nakayama miyuki", - "artist:nakayama tetsugaku", - "artist:nakazato ameri", - "artist:nako mameta", - "artist:nakoudo", - "artist:nakta", - "artist:nakura yasuhiro", - "artist:namae renraku", - "artist:namagaki okami", - "artist:namahagure", - "artist:namakura makibishi", - "artist:namaman", - "artist:namamo nanase", - "artist:namauni", - "artist:namboku", - "artist:name john", - "artist:name runao", - "artist:namekata tubame", - "artist:nameless", - "artist:nameless peasant", - "artist:nami", - "artist:namiyosi", - "artist:nana gawa no ramu", - "artist:nana shinshi", - "artist:nanaca mai", - "artist:nanae", - "artist:nanae akio", - "artist:nanagami you", - "artist:nanahara fuyuki", - "artist:nanahoshi akari", - "artist:nanakagi satoshi", - "artist:nanakawa roduka", - "artist:nanaki seijyu", - "artist:nanakichi", - "artist:nanamatsu kenji", - "artist:nanami natuki", - "artist:nanami shizuka", - "artist:nanamiya 723", - "artist:nanao anzu", - "artist:nanao naru", ) } diff --git a/app/src/main/java/exh/eh/tags/Artist2.kt b/app/src/main/java/exh/eh/tags/Artist2.kt index 030eea9d4..01c4ffa9a 100644 --- a/app/src/main/java/exh/eh/tags/Artist2.kt +++ b/app/src/main/java/exh/eh/tags/Artist2.kt @@ -1,8 +1,164 @@ package exh.eh.tags object Artist2 : TagList { - - override fun getTags1() = listOf( + override fun getTags1(): List = listOf( + "artist:mutsuki tsutomu", + "artist:mutsutake", + "artist:mutuki shin", + "artist:mutumi", + "artist:mutunari", + "artist:mv", + "artist:mw", + "artist:mx2j", + "artist:myanie", + "artist:myanko64", + "artist:mydirtydrawings", + "artist:myheartpumpspiss", + "artist:myke greywolf", + "artist:mylf3d", + "artist:myohjin tsubasa", + "artist:myrage", + "artist:myrho", + "artist:mysterious joe", + "artist:myuk", + "artist:myuratch", + "artist:mz09", + "artist:n. dofline", + "artist:n.o. chachamaru", + "artist:n.w.f.", + "artist:n0ncanon", + "artist:n6str6m6", + "artist:n820", + "artist:na-nu", + "artist:nabakaine", + "artist:nabeshiki", + "artist:nabeshima mike", + "artist:nabriales the majestic", + "artist:nacho fernandez", + "artist:nadaka harutsugu", + "artist:nadareishi", + "artist:nadzuka", + "artist:naga", + "artist:nagai go", + "artist:nagai wataru", + "artist:nagaikusa", + "artist:nagano akane", + "artist:nagano mamoru", + "artist:nagao yamahiko", + "artist:nagaraya", + "artist:nagare", + "artist:nagare hyo-go", + "artist:nagareboshi", + "artist:nagasaki biidoro", + "artist:nagase haruhito", + "artist:nagase rurio", + "artist:nagashima chosuke", + "artist:nagasio", + "artist:nagatoro sei", + "artist:nagatsuki futsuka", + "artist:nagatsuki misoka", + "artist:nagayama yuunon", + "artist:nagi haruka", + "artist:nagi ichi", + "artist:nagio", + "artist:nagisano usagi", + "artist:nagisawa you", + "artist:nagita tooko", + "artist:naglfar", + "artist:nago nayuta", + "artist:nago.k", + "artist:nagominto", + "artist:nagoyacochin", + "artist:nagumo haruka", + "artist:naha 78", + "artist:nai al", + "artist:naikoji", + "artist:naito loveca", + "artist:naito tomoaki", + "artist:naitou gura", + "artist:naitou ryuu", + "artist:naitou satoshi", + "artist:najiga nameta", + "artist:najima keiji", + "artist:naka shinobu", + "artist:nakadera akira", + "artist:nakaduki yuuna", + "artist:nakafusa momo", + "artist:nakagawa you", + "artist:nakagomi", + "artist:nakahara yozy", + "artist:nakahira masahiko", + "artist:nakajima akihiko", + "artist:nakajima atsuko", + "artist:nakajima fumio", + "artist:nakajima rei", + "artist:nakajima tomoki", + "artist:nakajima yuka", + "artist:nakakawa a", + "artist:nakamori itto", + "artist:nakamura hirofumi", + "artist:nakamura hisashi", + "artist:nakamura kafka", + "artist:nakamura nishiki", + "artist:nakamura regura", + "artist:nakamura sakyou", + "artist:nakamura subaru", + "artist:nakamura touya", + "artist:nakamura uzuki", + "artist:nakamura zeus", + "artist:nakano sora", + "artist:nakano tomokazu", + "artist:nakanoo kei", + "artist:nakao hamu", + "artist:nakata mitsuru", + "artist:nakata modem", + "artist:nakata shunpei", + "artist:nakata yumi", + "artist:nakatani nio", + "artist:nakatsu kenji", + "artist:nakatsukasa shou", + "artist:nakayama masaaki", + "artist:nakayama miyuki", + "artist:nakayama tetsugaku", + "artist:nakazato ameri", + "artist:nakimayo", + "artist:nako mameta", + "artist:nakoudo", + "artist:nakta", + "artist:nakura yasuhiro", + "artist:namae renraku", + "artist:namagaki okami", + "artist:namahagure", + "artist:namakura makibishi", + "artist:namaman", + "artist:namamo nanase", + "artist:namauni", + "artist:namboku", + "artist:name john", + "artist:name runao", + "artist:namekata tubame", + "artist:nameless", + "artist:nameless peasant", + "artist:nami", + "artist:namiyosi", + "artist:nana gawa no ramu", + "artist:nana shinshi", + "artist:nanaca mai", + "artist:nanae", + "artist:nanae akio", + "artist:nanagami you", + "artist:nanahara fuyuki", + "artist:nanahoshi akari", + "artist:nanakagi satoshi", + "artist:nanakawa roduka", + "artist:nanaki seijyu", + "artist:nanakichi", + "artist:nanamatsu kenji", + "artist:nanami natuki", + "artist:nanami shizuka", + "artist:nanamiya 723", + "artist:nanao anzu", + "artist:nanao naru", "artist:nanase jun", "artist:nanase makoto", "artist:nanase masato", @@ -87,6 +243,7 @@ object Artist2 : TagList { "artist:naughty hijabista 3dx", "artist:naughtytinkerer", "artist:nauth le roy", + "artist:nauvvii", "artist:nayoshi", "artist:nayunata", "artist:nayuta", @@ -94,6 +251,7 @@ object Artist2 : TagList { "artist:nc", "artist:ndc", "artist:nebo", + "artist:necdaz", "artist:necoto rina", "artist:necro", "artist:necrodrone", @@ -109,6 +267,7 @@ object Artist2 : TagList { "artist:nek0gami", "artist:neko animo", "artist:neko maru rentarou", + "artist:neko no youchuu", "artist:neko samurai", "artist:neko totora", "artist:neko toufu", @@ -143,17 +302,21 @@ object Artist2 : TagList { "artist:nekotantei lux", "artist:nekoyama", "artist:nekoyanagi matasaburou", + "artist:nekoyashiki pushio", + "artist:nemejis", "artist:nemoto mami", "artist:nemunemu", "artist:nemureru usagi 06", "artist:nemuri taiyo", "artist:nendo.", + "artist:neneneg", "artist:neo black", "artist:neo gentle", "artist:neo geppetto", "artist:neo jared", "artist:neocoill", "artist:neodemons", + "artist:neoguoguko", "artist:neoneet", "artist:nerddesign", "artist:nerdus", @@ -180,11 +343,13 @@ object Artist2 : TagList { "artist:nezirozi", "artist:nezumeta", "artist:nf4", + "artist:ngamaru", "artist:ngmi", "artist:ni theta", "artist:ni-no", "artist:nibiiro shizuka", "artist:nibiirokaden", + "artist:niboshitofu", "artist:nicchi sangyou", "artist:nicchuu", "artist:nice tack", @@ -205,6 +370,7 @@ object Artist2 : TagList { "artist:niimaru yuu", "artist:niisan", "artist:niiyama takashi", + "artist:nijihashi sola", "artist:nijiiro ink", "artist:nijo", "artist:nijyou makoto", @@ -232,6 +398,7 @@ object Artist2 : TagList { "artist:ningyon", "artist:niniidawns", "artist:ninniku", + "artist:nino paru", "artist:ninomiya hikaru", "artist:ninomiya ryouzou", "artist:nira yuyuki", @@ -303,6 +470,7 @@ object Artist2 : TagList { "artist:noda yuuji", "artist:nodame", "artist:nodegama", + "artist:nodo", "artist:noe omi", "artist:nofuture", "artist:nogi makoto", @@ -312,9 +480,12 @@ object Artist2 : TagList { "artist:noir", "artist:noise", "artist:noisetanker", + "artist:nokemy", + "artist:noki kuzuri", "artist:nokishita negio", "artist:nom noh", "artist:nomeeo", + "artist:nomiya tomoka", "artist:nomura mizuki", "artist:nomura ryouji", "artist:non-kong", @@ -324,6 +495,7 @@ object Artist2 : TagList { "artist:nonjake", "artist:nonohara miki", "artist:nonomura hideki", + "artist:noodlenood", "artist:nook lom", "artist:noomi bernadotte", "artist:noparu", @@ -333,6 +505,7 @@ object Artist2 : TagList { "artist:norakuro nero", "artist:norberto fernandez", "artist:nord fantasy", + "artist:nori gorou", "artist:nori heita", "artist:nori norisuke", "artist:nori tamago", @@ -391,9 +564,11 @@ object Artist2 : TagList { "artist:o yat", "artist:o-ide chosuke", "artist:o-ji", + "artist:o-mac", "artist:o-ro", "artist:o.davis", "artist:o.p com", + "artist:oad", "artist:oaf", "artist:oaks", "artist:oba yoshifumi", @@ -497,6 +672,7 @@ object Artist2 : TagList { "artist:okawa wataru", "artist:okayu", "artist:okayusan", + "artist:okazaki joe", "artist:okazaki mituki", "artist:okazaki takeshi", "artist:oke", @@ -506,9 +682,11 @@ object Artist2 : TagList { "artist:okingjo", "artist:okino matsushiro", "artist:okiraku nic", + "artist:okita yuuho", "artist:okiyo", "artist:okome gang", "artist:okometsubu", + "artist:oksandio", "artist:oku hiroya", "artist:oku tamamusi", "artist:okuma masami", @@ -532,10 +710,12 @@ object Artist2 : TagList { "artist:om", "artist:omaru gyuunyuu", "artist:omega zuel", + "artist:omi shinano", "artist:omiart", "artist:omny87", "artist:omori unko", "artist:on", + "artist:on fan", "artist:onaka sukisuki", "artist:onat", "artist:once and again", @@ -561,6 +741,7 @@ object Artist2 : TagList { "artist:onyxsis", "artist:oo sebastian oo", "artist:oo umigarasu", + "artist:ooban yaki", "artist:oobanburumai", "artist:oobari masami", "artist:oobayashi mori", @@ -680,12 +861,14 @@ object Artist2 : TagList { "artist:ottorisu", "artist:otty the notty", "artist:otumaru", + "artist:oudo mikito", "artist:oujano kaze", "artist:ouji hiyoko", "artist:ouka sushi", "artist:ouka zero shiki", "artist:oukazero", "artist:ouma tokiichi", + "artist:oumikun", "artist:ounwm", "artist:ourflatcoat", "artist:ousawa kanata", @@ -759,6 +942,7 @@ object Artist2 : TagList { "artist:pastel", "artist:pata", "artist:patanu", + "artist:patientz", "artist:patiroku", "artist:patrice killoffer", "artist:patrick gainher", @@ -780,11 +964,14 @@ object Artist2 : TagList { "artist:pee kay", "artist:pekepoko", "artist:peko", + "artist:pekoni", "artist:pen", "artist:pencil", "artist:penguindou", "artist:penname wa nai", + "artist:pepamintopatty", "artist:peparon", + "artist:pepe boada", "artist:pepper0", "artist:peregrine", "artist:perfect queentsunade", @@ -830,6 +1017,7 @@ object Artist2 : TagList { "artist:picao", "artist:pickles", "artist:pie", + "artist:pier carlo macchi", "artist:pier dario pennati", "artist:piero", "artist:pierre dupuis", @@ -840,6 +1028,7 @@ object Artist2 : TagList { "artist:pikuru", "artist:pingkypen", "artist:pink", + "artist:pink alucard", "artist:pink no piyo piyo", "artist:pink pawg", "artist:pinta", @@ -889,12 +1078,15 @@ object Artist2 : TagList { "artist:ponkosfm", "artist:ponkotsu", "artist:ponkotsu y4", + "artist:ponnyu", "artist:ponyanony", "artist:ponz", + "artist:poofroom", "artist:poorgom", "artist:pop", "artist:pop room", "artist:popeye", + "artist:poppezinga", "artist:poriuretan", "artist:pornomagnum", "artist:poruserin", @@ -933,6 +1125,7 @@ object Artist2 : TagList { "artist:psp3dass", "artist:psycho", "artist:psycho comic j", + "artist:psychostuff", "artist:psycocko", "artist:psycodraws", "artist:ptarouh", @@ -946,6 +1139,7 @@ object Artist2 : TagList { "artist:punishedkom", "artist:punk-pegasus", "artist:puranpuman", + "artist:purepervert", "artist:purfect princessgirl", "artist:puribou", "artist:purin a la mode", @@ -981,6 +1175,7 @@ object Artist2 : TagList { "artist:queencomplex", "artist:quickdraw", "artist:qunami himehiko", + "artist:qundium", "artist:qutouten", "artist:qys3", "artist:r", @@ -1000,6 +1195,7 @@ object Artist2 : TagList { "artist:rabies t lagomorph", "artist:rached", "artist:radasus nailo", + "artist:radio bx", "artist:radio ga ga", "artist:radiohead", "artist:raffaele marinetti", @@ -1109,6 +1305,7 @@ object Artist2 : TagList { "artist:reine", "artist:reiq", "artist:reirei", + "artist:reissence", "artist:reit", "artist:reitou dentai", "artist:rekaerb maerd", @@ -1148,11 +1345,13 @@ object Artist2 : TagList { "artist:rihito", "artist:rihito akane", "artist:rikka kai", + "artist:rikoko", "artist:riku maru", "artist:rikudou koushi", "artist:rikudou maki", "artist:rikumoto yoshiyuki", "artist:rikusu", + "artist:rilex lenov", "artist:rileyav", "artist:rimiera", "artist:rimviolet", @@ -1234,7 +1433,7 @@ object Artist2 : TagList { "artist:rottencat", "artist:roudoc 2-gou", "artist:rougetu", - "artist:row", + "artist:rounds chen", "artist:rox chien", "artist:roxane jeong", "artist:roy mccloud", @@ -1336,11 +1535,14 @@ object Artist2 : TagList { "artist:s.o.s.", "artist:s.p.k", "artist:s.r.i.", + "artist:s8403", + "artist:sa.te.", "artist:saba ibaru", "artist:saba satoru", "artist:sabaku", "artist:sabanoniwatori", "artist:sabashi renya", + "artist:saberkenji", "artist:sabretoothedermine", "artist:sabu", "artist:saburou", @@ -1394,6 +1596,7 @@ object Artist2 : TagList { "artist:saitani umetarou", "artist:saite kei", "artist:saito chiho", + "artist:saito naoki", "artist:saito sakae", "artist:saito yahu", "artist:saitoh maho", @@ -1510,9 +1713,10 @@ object Artist2 : TagList { "artist:sanba riwo", "artist:sanbasou", "artist:sanbun kyoden", + "artist:sandbox", "artist:sandro angiolini", + "artist:sanehara kurumi", "artist:sanezaki tsukiuo", - "artist:sang ha", "artist:sangoshou", "artist:sangou mitsuru", "artist:sanhualishuwu", @@ -1534,10 +1738,12 @@ object Artist2 : TagList { "artist:sansyoku amido.", "artist:sansyouo", "artist:sant andrea", + "artist:santouka", "artist:sanuki", "artist:saorikiorimi", "artist:saphire nishi", "artist:sara palmer", + "artist:sarachi yomi", "artist:sarah salanica", "artist:saraka s", "artist:sarami ryou", @@ -1549,6 +1755,7 @@ object Artist2 : TagList { "artist:saruasu", "artist:saruei", "artist:saryuu", + "artist:sasaame", "artist:sasachinn", "artist:sasaduka dai", "artist:sasagawa hayashi", @@ -1614,10 +1821,12 @@ object Artist2 : TagList { "artist:sawatari yuuka", "artist:sawatei", "artist:sawayaka samehada", + "artist:saye", "artist:sayo", "artist:sayo tanku", "artist:sayousuke", "artist:sayuhime tatsumi", + "artist:sazaemu", "artist:sazaki ichiri", "artist:sazanami mio", "artist:sb", @@ -1639,6 +1848,7 @@ object Artist2 : TagList { "artist:scriptoromniscius24", "artist:scy 25", "artist:sd bigpie", + "artist:seabones", "artist:sean lang", "artist:seanji sariel", "artist:sebafox", @@ -1699,6 +1909,7 @@ object Artist2 : TagList { "artist:sensouji kinoto", "artist:sentrythe2310", "artist:senzublunt", + "artist:seo miinosuke", "artist:sera tooru", "artist:serei teru", "artist:sergei", @@ -1710,6 +1921,7 @@ object Artist2 : TagList { "artist:seriiif plus", "artist:serikawa kazumi", "artist:seriou sakura", + "artist:serizawa tomo", "artist:serizawa yuuji", "artist:sessa takuma", "artist:sesso nashiko", @@ -1723,12 +1935,14 @@ object Artist2 : TagList { "artist:setuna rio", "artist:setunai porori", "artist:seura isago", + "artist:seven gromwoid", "artist:seven pear", "artist:sexgazer", "artist:sexless2012", "artist:sexy sketches", "artist:sexyturkey", "artist:sezqya", + "artist:sgt-lonely", "artist:sh0r0ken", "artist:shadako26", "artist:shade", @@ -1754,6 +1968,7 @@ object Artist2 : TagList { "artist:shawntae howard", "artist:shaya", "artist:sheela", + "artist:shelby yorda", "artist:shelkopryad", "artist:shelly", "artist:shennai misha", @@ -1767,6 +1982,7 @@ object Artist2 : TagList { "artist:shiba nanasei", "artist:shiba yuuji", "artist:shibahara gotyo", + "artist:shibaken goro", "artist:shibari kana", "artist:shibasaki koh", "artist:shibasaki syouzi", @@ -1786,6 +2002,9 @@ object Artist2 : TagList { "artist:shiden hiro", "artist:shido mayuru", "artist:shiga kenta", + ) + + override fun getTags2(): List = listOf( "artist:shiga retsuto", "artist:shiganai might", "artist:shigehira", @@ -1803,7 +2022,9 @@ object Artist2 : TagList { "artist:shiina soutyou", "artist:shiino", "artist:shiino yuy", + "artist:shiitake taishi", "artist:shiizaki hinaki", + "artist:shiizako you", "artist:shijima yukio", "artist:shijimi", "artist:shijou sadafumi", @@ -1820,6 +2041,7 @@ object Artist2 : TagList { "artist:shikkoku no tsubasa", "artist:shikorisasu", "artist:shima drill", + "artist:shima hokke", "artist:shima kyousuke", "artist:shima syu", "artist:shimachiyo", @@ -1841,6 +2063,7 @@ object Artist2 : TagList { "artist:shimao kazu", "artist:shimashii", "artist:shimataka", + "artist:shimatamago", "artist:shimazaki lem", "artist:shimazu tekko", "artist:shimeji", @@ -1923,6 +2146,7 @@ object Artist2 : TagList { "artist:shiraishi asuka", "artist:shiraishi nagisa", "artist:shiran takashi", + "artist:shiranami kouki", "artist:shirane shiratsuki", "artist:shiraneko itsu", "artist:shirasagi rokuwa", @@ -1975,8 +2199,10 @@ object Artist2 : TagList { "artist:shizukawa shisumi", "artist:shizuki shinra", "artist:shizuki shuya", + "artist:shizuma", "artist:shizumi hanako", "artist:sho-yan", + "artist:shocho", "artist:shogun tanuki", "artist:shoji-ikari", "artist:shojoheart", @@ -2003,9 +2229,6 @@ object Artist2 : TagList { "artist:shourin bonzu", "artist:shousan bouzu", "artist:shoushin sha", - ) - - override fun getTags2() = listOf( "artist:show", "artist:shrums", "artist:shu", @@ -2067,7 +2290,6 @@ object Artist2 : TagList { "artist:sioduke ikura", "artist:siokaze sango", "artist:siomidu", - "artist:siooninco", "artist:sipaktli", "artist:siproites", "artist:siqi", @@ -2105,6 +2327,7 @@ object Artist2 : TagList { "artist:sketchy skylar", "artist:skillet91", "artist:skltn", + "artist:skullworms", "artist:skully", "artist:skwang", "artist:sky", @@ -2173,6 +2396,7 @@ object Artist2 : TagList { "artist:sonoda miyabi", "artist:sonozaki souichi", "artist:sonson-sensei", + "artist:soonsky", "artist:sooperman", "artist:sora inoue", "artist:sorai shinya", @@ -2224,6 +2448,7 @@ object Artist2 : TagList { "artist:speeh", "artist:spelman huto", "artist:spelunkersal", + "artist:sperm ryuuseigun", "artist:spice", "artist:spidu", "artist:spike4072", @@ -2270,10 +2495,13 @@ object Artist2 : TagList { "artist:steven stahlberg", "artist:sticky sheep", "artist:stikyfinkaz", + "artist:stix", "artist:stjepan sejic", "artist:stlemo", + "artist:stogiegoatarts", "artist:stoper", "artist:store at thorurun", + "artist:strange red guy", "artist:strangestquiet", "artist:studio-pirrate", "artist:studioaberration", @@ -2339,6 +2567,7 @@ object Artist2 : TagList { "artist:sunamori yuuta", "artist:sundown", "artist:sunibee", + "artist:sunnyside", "artist:sunset nivaris", "artist:sunshow", "artist:suo grey", @@ -2349,12 +2578,15 @@ object Artist2 : TagList { "artist:superamu k", "artist:superix", "artist:supersoft2", + "artist:supert", + "artist:supertito", "artist:supertomato", "artist:supullim", "artist:suraemon", "artist:suru", "artist:sus woman", "artist:susaki ake", + "artist:sushiyama", "artist:susugu", "artist:susuki", "artist:suta furachina", @@ -2371,6 +2603,7 @@ object Artist2 : TagList { "artist:suzuki jun", "artist:suzuki kimuchi", "artist:suzuki kyoutarou", + "artist:suzuki masahisa", "artist:suzuki mey", "artist:suzuki mira", "artist:suzuki senpai", @@ -2381,7 +2614,7 @@ object Artist2 : TagList { "artist:suzuneco", "artist:suzunone kanata", "artist:suzushiro", - "artist:suzushiro rei", + "artist:suzushiro seri", "artist:suzutsuki kurara", "artist:sw", "artist:swagalicious tony", @@ -2418,6 +2651,7 @@ object Artist2 : TagList { "artist:t-factory", "artist:t-zok", "artist:t.k-1", + "artist:t.y.stars", "artist:ta", "artist:ta-na", "artist:taata", @@ -2457,6 +2691,7 @@ object Artist2 : TagList { "artist:taiger", "artist:taigiakira", "artist:taihei tengoku", + "artist:tailbox", "artist:taira hajime", "artist:taira tsukune", "artist:taishinkokuoh anton", @@ -2512,6 +2747,7 @@ object Artist2 : TagList { "artist:takara kosuke", "artist:takaryoo", "artist:takasaki takemaru", + "artist:takasaki yuuki", "artist:takase muh", "artist:takase rico", "artist:takase yuu", @@ -2520,19 +2756,24 @@ object Artist2 : TagList { "artist:takashiro syouseki", "artist:takashita takashi", "artist:takasugi kou", + "artist:takasumahiro", "artist:takato suzunosuke", "artist:takatoh kazuma", "artist:takatoh sachi", + "artist:takatoh yuko", "artist:takatori umi", "artist:takatou ayumi", "artist:takatou rui", "artist:takatou sora", "artist:takatsu", "artist:takatuki nato", + "artist:takaya n", "artist:takaya natsuki", "artist:takayaki", + "artist:takayama chizu", "artist:takayama toshiaki", "artist:takayamanon", + "artist:takayoshi yuri", "artist:take", "artist:take hiroaki", "artist:take shinshi", @@ -2550,6 +2791,7 @@ object Artist2 : TagList { "artist:takeki michiaki", "artist:takemura sesshu", "artist:takenoko seijin", + "artist:takeoka kosen", "artist:takeoka miho", "artist:takeshita kenjirou", "artist:takeuchi reona", @@ -2558,6 +2800,7 @@ object Artist2 : TagList { "artist:takeuchi takashi", "artist:takewakamaru", "artist:takeyuu", + "artist:takezumi", "artist:taki-dora", "artist:takigawa karin", "artist:takimoto satoru", @@ -2673,6 +2916,7 @@ object Artist2 : TagList { "artist:tatsumi hiroshi", "artist:tatsunami takajin", "artist:tatsunami youtoku", + "artist:tatsunosuke yukiya", "artist:tatsuse yumino", "artist:tatsuya ishida", "artist:tatteinu", @@ -2708,6 +2952,7 @@ object Artist2 : TagList { "artist:teltelhousi", "artist:temix", "artist:tempo gensui", + "artist:temporalwolf", "artist:tempura tamao", "artist:ten", "artist:tenako", @@ -2718,6 +2963,7 @@ object Artist2 : TagList { "artist:tendou kuon", "artist:tendou masae", "artist:teng mai", + "artist:teng zhai zai", "artist:tenjiku rounin", "artist:tenjin hidetaka", "artist:tenjo ryuka", @@ -2725,6 +2971,7 @@ object Artist2 : TagList { "artist:tensa-zangitsu", "artist:tensei-kun", "artist:tenshi juuji", + "artist:tenshi okihana", "artist:tenshinro ryoichi", "artist:tenshou akira", "artist:tentacle monster chu", @@ -2744,8 +2991,10 @@ object Artist2 : TagList { "artist:terashima musi", "artist:terasu mc", "artist:terazip", + "artist:terebi", "artist:teresa richards", "artist:teri terio", + "artist:teritama potekora", "artist:teriyaki", "artist:terrenski", "artist:terry hijiri", @@ -2760,7 +3009,7 @@ object Artist2 : TagList { "artist:tes-mel", "artist:tesan", "artist:teshima nari.", - "artist:test11", + "artist:test12", "artist:tetramax", "artist:tetsubirei", "artist:tetsukui", @@ -2834,6 +3083,7 @@ object Artist2 : TagList { "artist:thorn7", "artist:thorstone", "artist:thousandfoldfeathers", + "artist:threek", "artist:throat", "artist:thunderbat", "artist:tiaz-3dx", @@ -2868,6 +3118,7 @@ object Artist2 : TagList { "artist:tk28", "artist:tksn", "artist:tm", + "artist:to hegemonikon", "artist:to slash let", "artist:toastyco games", "artist:toba yuga", @@ -2926,6 +3177,7 @@ object Artist2 : TagList { "artist:tom smith", "artist:tom tamio", "artist:tom wlod", + "artist:tomato rice", "artist:tomatojigoku", "artist:tomatomato", "artist:tomihero", @@ -2965,6 +3217,7 @@ object Artist2 : TagList { "artist:toontinkerer", "artist:tooyama hikaru", "artist:tooyama kouhaku", + "artist:toph sinex", "artist:tophattruffles", "artist:toradoshi", "artist:torai ryuu", @@ -2992,6 +3245,7 @@ object Artist2 : TagList { "artist:torque", "artist:toru-k", "artist:tosh", + "artist:toshi hiroshi", "artist:toshi.d", "artist:toshiaki", "artist:toshihiro", @@ -3090,6 +3344,7 @@ object Artist2 : TagList { "artist:tsukumo gou", "artist:tsukushino makoto", "artist:tsukuyomi sazin", + "artist:tsumire", "artist:tsumugie", "artist:tsumujikaze", "artist:tsumumaru hifu", @@ -3121,6 +3376,7 @@ object Artist2 : TagList { "artist:tsuzuki masaki", "artist:tsuzura", "artist:tsuzura ryo", + "artist:tttttttt", "artist:ttuunn", "artist:tuan hollaback", "artist:tukamori syuuji", @@ -3149,6 +3405,7 @@ object Artist2 : TagList { "artist:twinpoo", "artist:twistedgrim", "artist:twistedscarlett60", + "artist:twistedted", "artist:two-ton-neko", "artist:tyanaka", "artist:tyarashi", @@ -3176,6 +3433,7 @@ object Artist2 : TagList { "artist:uchoten", "artist:uchuu teiou", "artist:udai tetsurou", + "artist:udimushi", "artist:udon", "artist:udou ryousuke", "artist:uduki takeru", @@ -3230,6 +3488,7 @@ object Artist2 : TagList { "artist:umematsu thomas", "artist:umeo hiromori", "artist:umetani kenji", + "artist:umetsu yasuomi", "artist:umetsu yukinori", "artist:umibe shin", "artist:umihara minato", @@ -3254,6 +3513,7 @@ object Artist2 : TagList { "artist:unknown76sc", "artist:unknownmaru", "artist:unname neko", + "artist:unnero11", "artist:uno makoto", "artist:uno usaya", "artist:unpopularwolf", @@ -3290,7 +3550,9 @@ object Artist2 : TagList { "artist:uri uri", "artist:uron rei", "artist:urotan", + "artist:uruh aqua", "artist:urushihara satoshi", + "artist:urushime", "artist:urutsu", "artist:uruujima call", "artist:us them", @@ -3301,11 +3563,14 @@ object Artist2 : TagList { "artist:usagine kobo", "artist:usami wataru", "artist:usami yuu", + "artist:usanomura kamekichi", "artist:usashiro mani", "artist:uselessboy", + "artist:ushi no shita", "artist:ushigami mitsuki", "artist:ushiho", "artist:ushijima", + "artist:ushikani gassen", "artist:ushita", "artist:uso asio", "artist:usoneko", @@ -3313,12 +3578,14 @@ object Artist2 : TagList { "artist:usui rikaon", "artist:usurai", "artist:usyuuri", + "artist:utage.", "artist:utamaro", "artist:utanone sion", "artist:utatane hiroyuki", "artist:utpalavarna", "artist:utsugi tsuguha", "artist:utsurou", + "artist:uzaki takamaru", "artist:uzakiyu", "artist:uziga waita", "artist:uzuki jun", @@ -3385,6 +3652,7 @@ object Artist2 : TagList { "artist:viviane nicaise", "artist:vizeta", "artist:vkelis", + "artist:vladimiro missaglia", "artist:void nosferatu", "artist:vokatron", "artist:volpe", @@ -3406,6 +3674,7 @@ object Artist2 : TagList { "artist:wade99", "artist:waga na wa masamichi", "artist:waguchi shouka", + "artist:waidhi", "artist:waikke", "artist:waito", "artist:waka", @@ -3423,6 +3692,7 @@ object Artist2 : TagList { "artist:waldemar kazak", "artist:wallace wood", "artist:walter geovani", + "artist:walter m. baumhofer", "artist:walzrj erorider", "artist:wamusato haru", "artist:wanaata", @@ -3451,6 +3721,7 @@ object Artist2 : TagList { "artist:watanabe yoshimasa", "artist:watanuki kaname", "artist:watanuki lon", + "artist:watanuki sui", "artist:watarai kage", "artist:watari kazuya", "artist:watari masahito", @@ -3512,10 +3783,13 @@ object Artist2 : TagList { "artist:wolfy-nail", "artist:woof", "artist:woofy rainshadow", + "artist:woomochichi", + "artist:worky zark", "artist:wossarem", "artist:wotca", "artist:wox yang", "artist:wreck shop", + "artist:writefag", "artist:wrong", "artist:wtparadise", "artist:wu chuang", @@ -3533,9 +3807,12 @@ object Artist2 : TagList { "artist:xc404", "artist:xeladuart", "artist:xentain", + "artist:xeono", "artist:xeph", "artist:xeracx", + "artist:xi yao", "artist:xianetta", + "artist:xiao bai tian", "artist:xiaowoo", "artist:xiaoxi", "artist:xiii", @@ -3589,6 +3866,7 @@ object Artist2 : TagList { "artist:yakuta tetsuya", "artist:yakuzaishi", "artist:yam spectrum", + "artist:yama tachibana", "artist:yamabuki zarame", "artist:yamabukiiro", "artist:yamada akihiro", @@ -3596,6 +3874,7 @@ object Artist2 : TagList { "artist:yamada kosuke", "artist:yamada mario", "artist:yamada no seikatu ga daiichi", + "artist:yamada rei", "artist:yamada sansuke", "artist:yamada shiguma", "artist:yamada shouji", @@ -3691,6 +3970,7 @@ object Artist2 : TagList { "artist:yato hikaru", "artist:yatsuka", "artist:yatsuki akehisa", + "artist:yatuki junichiro", "artist:yaturugi takumi", "artist:yayoi kotoyuki", "artist:yaz malvavisco", @@ -3703,12 +3983,14 @@ object Artist2 : TagList { "artist:yequo", "artist:yes-i-did", "artist:yezhi na", + "artist:yf", "artist:ygo", "artist:yichimo", "artist:yishan studio", "artist:ynorka", "artist:yo-jin", "artist:yo-nashi", + "artist:yochiko", "artist:yodogawa nanko", "artist:yoekosukii", "artist:yog", @@ -3723,6 +4005,9 @@ object Artist2 : TagList { "artist:yoko juusuke", "artist:yoko mawatari", "artist:yokohama inka", + ) + + override fun getTags3(): List = listOf( "artist:yokoi rego", "artist:yokomichigai", "artist:yokonyan", @@ -3761,6 +4046,7 @@ object Artist2 : TagList { "artist:yoshida inuhito", "artist:yoshida kei", "artist:yoshida kunio", + "artist:yoshida mika", "artist:yoshiga fuumi", "artist:yoshihara yuuka", "artist:yoshikawa arata", @@ -3804,6 +4090,7 @@ object Artist2 : TagList { "artist:yousuke", "artist:youtou sadamitsu", "artist:youtsuu 2-gou", + "artist:yozakura sakyou", "artist:yozora shiba", "artist:yslaire", "artist:yu", @@ -3813,12 +4100,14 @@ object Artist2 : TagList { "artist:yubari meronn", "artist:yubeshiru", "artist:yuboot", + "artist:yudeebi", "artist:yuduka", "artist:yuduki ichi", "artist:yuduki kisa", "artist:yudzuki hina", "artist:yue", "artist:yuena", + "artist:yugo", "artist:yuhki hico", "artist:yuhki shinichi", "artist:yui toshiki", @@ -3854,6 +4143,7 @@ object Artist2 : TagList { "artist:yukimaru.", "artist:yukimasa", "artist:yukimino yukio", + "artist:yukinimaru", "artist:yukino ichigo", "artist:yukino minato", "artist:yukino yukikaze", @@ -3873,6 +4163,7 @@ object Artist2 : TagList { "artist:yumano yuuki", "artist:yume kirei", "artist:yumegi atsuki", + "artist:yumeiro rukka", "artist:yumeno hiroshi", "artist:yumeno owari", "artist:yumeno tanuki", @@ -3895,9 +4186,11 @@ object Artist2 : TagList { "artist:yuri peach", "artist:yurihara aki", "artist:yuruya", + "artist:yusa aki", "artist:yusa shirou", "artist:yusatona", "artist:yusha-m", + "artist:yushi quetzalli", "artist:yutoriko", "artist:yuu", "artist:yuu kazakami", @@ -3921,6 +4214,7 @@ object Artist2 : TagList { "artist:yuuki tomoka", "artist:yuuki tsumugi", "artist:yuuki yu", + "artist:yuukis", "artist:yuumi kazuaki", "artist:yuunagi seshina", "artist:yuurei makomo", @@ -3969,6 +4263,7 @@ object Artist2 : TagList { "artist:zaunderground", "artist:zawar", "artist:zdl", + "artist:zeblackballd", "artist:zebodoy", "artist:zeekzag", "artist:zefrableu", @@ -3978,6 +4273,7 @@ object Artist2 : TagList { "artist:zel", "artist:zen migawa", "artist:zenbaymono studio", + "artist:zenchi", "artist:zennith mehathvin", "artist:zeno", "artist:zenosuke", @@ -3985,6 +4281,7 @@ object Artist2 : TagList { "artist:zephid", "artist:zepie", "artist:zeplich", + "artist:zerbebuth", "artist:zerg", "artist:zero punch", "artist:zero tanuki", @@ -4006,12 +4303,10 @@ object Artist2 : TagList { "artist:zigrock", "artist:ziko", "artist:zinan", - ) - - override fun getTags3() = listOf( "artist:zinen", "artist:zingate", "artist:zirahu manbou", + "artist:ziroko", "artist:ziz", "artist:zizi", "artist:zlfnrk", @@ -4031,6 +4326,7 @@ object Artist2 : TagList { "artist:zurikat", "artist:zuririan", "artist:zwesomerachel", + "artist:zwwilzza", "artist:zxc338093", "artist:zyaroh akira", "artist:zyd", diff --git a/app/src/main/java/exh/eh/tags/Character.kt b/app/src/main/java/exh/eh/tags/Character.kt index 4e312e128..f8a19547c 100644 --- a/app/src/main/java/exh/eh/tags/Character.kt +++ b/app/src/main/java/exh/eh/tags/Character.kt @@ -1,8 +1,7 @@ package exh.eh.tags object Character : TagList { - - override fun getTags1() = listOf( + override fun getTags1(): List = listOf( "character:.giffany", "character:001", "character:2b", @@ -10,9 +9,11 @@ object Character : TagList { "character:9s", "character:a2", "character:aayla secura", + "character:abigail marston", "character:abiru kobushi", "character:ace trainer", "character:addam origo", + "character:adele", "character:adele balfette", "character:adelicia lenn mathers", "character:adelle", @@ -135,6 +136,7 @@ object Character : TagList { "character:alchemi alchemivich pinka", "character:alcina dimitrescu", "character:alena", + "character:alex chen", "character:alexa", "character:alexander t. oyajiide", "character:alexandra vasquez", @@ -169,6 +171,7 @@ object Character : TagList { "character:alphard alshua", "character:altera", "character:altessa", + "character:altiera cunningham", "character:alvis e. hamilton", "character:alyx vance", "character:amagiri kazutake", @@ -190,6 +193,7 @@ object Character : TagList { "character:amira hergal", "character:amu", "character:amu hinamori", + "character:amur tiger", "character:amuro ninagawa", "character:amy pond", "character:amy rose", @@ -236,6 +240,7 @@ object Character : TagList { "character:annie parker", "character:ant-man", "character:anti", + "character:antoine d coolette", "character:antonio luini", "character:anya borzakovskaya", "character:anya cocolova", @@ -254,9 +259,11 @@ object Character : TagList { "character:aoi tosaka", "character:aoi yamada", "character:aoko aozaki", + "character:apha tawanroong", "character:aphelandra", "character:apple bloom", "character:applejack", + "character:apprentice illusion magician", "character:april oneil", "character:ara", "character:ara haan", @@ -271,6 +278,7 @@ object Character : TagList { "character:arfoire", "character:aria holmes kanzaki", "character:aria shichijou", + "character:ariane glenys maple", "character:arietta the wild", "character:arika amazake", "character:arin", @@ -286,6 +294,7 @@ object Character : TagList { "character:arresta blanket", "character:arriet", "character:arshes nei", + "character:arthur conan doyle", "character:arthur read", "character:artoria pendragon", "character:artoria pendragon alter", @@ -314,6 +323,7 @@ object Character : TagList { "character:astaroth", "character:aster phoenix", "character:astraea", + "character:asuha kusunoki", "character:asuha touhara", "character:asuka hoshino", "character:asuka kazama", @@ -324,7 +334,6 @@ object Character : TagList { "character:asuka sugo", "character:asuka takizawa", "character:asuka watarai", - "character:asuna", "character:asuna ichinose", "character:asuna kagurazaka", "character:asuna yuuki", @@ -344,6 +353,7 @@ object Character : TagList { "character:audrey smith", "character:aurica nestmile", "character:aurora suya rhys kaymin", + "character:auster", "character:avenger", "character:axel almar", "character:axl low", @@ -378,6 +388,9 @@ object Character : TagList { "character:azalyn goza", "character:azami", "character:azmaria hendric", + "character:azucena rocio quispe", + "character:azuma seren", + "character:azura", "character:azusa azuki", "character:azusa miura", "character:azusa nakajou", @@ -432,6 +445,7 @@ object Character : TagList { "character:belphemon rage mode", "character:ben tennyson", "character:bender bending rodriguez", + "character:bengal tiger", "character:beni-enma", "character:benio adashino", "character:benjamin grimm", @@ -450,6 +464,8 @@ object Character : TagList { "character:biba amatori", "character:big boss", "character:big macintosh", + "character:bijou", + "character:bill goodfellowe", "character:binchou-tan", "character:birdy cephon altera", "character:bisca mulan", @@ -477,6 +493,7 @@ object Character : TagList { "character:bob parr", "character:bobobo-bo bo-bobo", "character:bocchi hitori", + "character:bomb-burst", "character:bonnie rockwaller", "character:booker dewitt", "character:boom-boom", @@ -522,9 +539,11 @@ object Character : TagList { "character:cancer deathmask", "character:candice", "character:candice white adley", + "character:candy smalls", "character:capitana galaxia", "character:captain britain", "character:captain ginyu", + "character:captain hook", "character:cara dune", "character:caren ortensia", "character:carla", @@ -672,6 +691,7 @@ object Character : TagList { "character:cloudy quartz", "character:clover field", "character:clover manson", + "character:cocoloo", "character:cocona", "character:cocona bartel", "character:cocoro yazawa", @@ -699,6 +719,7 @@ object Character : TagList { "character:cotaro yazawa", "character:covid-19", "character:cow girl", + "character:crazy dave", "character:crea dolosera", "character:creditta cash", "character:crimson viper", @@ -792,6 +813,7 @@ object Character : TagList { "character:daisuke jigen", "character:daisy mae yokum", "character:daisy oak", + "character:damian desmond", "character:dan hibiki", "character:dana scully", "character:dancing lady orchid", @@ -849,9 +871,11 @@ object Character : TagList { "character:doremi harukaze", "character:doris rurido", "character:dorothea arnault", + "character:doudanuki masakuni", "character:douglas billingham", "character:douma", "character:dovahkiin", + "character:dr. gero", "character:dr. girlfriend", "character:dr. john a. zoidberg", "character:dr. karin chakwas", @@ -863,6 +887,8 @@ object Character : TagList { "character:draco centauros", "character:drasna", "character:droite", + "character:duca degli abruzzi", + "character:dumon", "character:dusknoir", "character:dutch schaefer", "character:dyute", @@ -935,6 +961,7 @@ object Character : TagList { "character:emiri uchi", "character:emiru nagakura", "character:emma frost", + "character:emma woods", "character:emmeryn", "character:emporio ivankov", "character:empress nashmeira ii", @@ -1009,9 +1036,11 @@ object Character : TagList { "character:felli loss", "character:female knight", "character:female protagonist", + "character:ferb seto", "character:fergie duhamel", "character:ferris eris", "character:fideo ardena", + "character:fine motion", "character:finn", "character:finn the human", "character:fiona", @@ -1117,6 +1146,7 @@ object Character : TagList { "character:ghiaccio", "character:ghost weed", "character:giant leopard plant", + "character:gid lucione deviluke", "character:gil nexdor", "character:gilbert durandal", "character:gilbert g.p. guilford", @@ -1130,18 +1160,24 @@ object Character : TagList { "character:gintoki sakata", "character:girl squirrel", "character:gisen yagyuu", + "character:giuseppe garibaldi", "character:giyuu tomioka", "character:gladiolus", + "character:glamrock freddy", "character:glenn quagmire", + "character:gloria sato", "character:gluko", "character:go-bemiu-gi", "character:goddess alice", "character:godot", "character:goei", + "character:goemon gaap", "character:goh", + "character:gold d. roger", "character:golden darkness", "character:gon freecss", "character:gordo brandt", + "character:gorou", "character:gorou miura", "character:gorou mutsumi", "character:gothetta gothetticus", @@ -1152,6 +1188,7 @@ object Character : TagList { "character:gourry gabriev", "character:grace nam", "character:grace oconnor", + "character:graha tia", "character:grandis granva", "character:gravel", "character:gray", @@ -1187,6 +1224,7 @@ object Character : TagList { "character:hacka doll no.3", "character:hacka doll no.4", "character:hagoromo gitsune", + "character:hajime kokonoi", "character:hajime saitou", "character:hajime shino", "character:hakase shinonome", @@ -1206,6 +1244,7 @@ object Character : TagList { "character:hanako hasegawa", "character:hanako kuroe", "character:hanako oomuro", + "character:hanako urawa", "character:hanamaru kunikida", "character:hanataro yamada", "character:hanayo koizumi", @@ -1230,10 +1269,12 @@ object Character : TagList { "character:haruichi kominato", "character:haruka amami", "character:haruka kawashima", + "character:haruka kito", "character:haruka minami", "character:haruka minato", "character:haruka morishima", "character:haruka nanami", + "character:haruka narumi", "character:haruka nogizaka", "character:haruka oozora", "character:haruka takamori", @@ -1249,6 +1290,7 @@ object Character : TagList { "character:haruto houjo", "character:haruya nagumo", "character:haruyuki arita", + "character:hasshaku-sama", "character:hata no kokoro", "character:hatate himekaidou", "character:hatchan", @@ -1276,6 +1318,7 @@ object Character : TagList { "character:helena douglas", "character:heles", "character:helga sinclair", + "character:hellmaster phibrizzo", "character:hendrik", "character:henriette mystere", "character:henry", @@ -1332,6 +1375,7 @@ object Character : TagList { "character:hinagiku katsura", "character:hinata hyuga", "character:hinata kawamoto", + "character:hinata tachibana", "character:hinata uesato", "character:hinata wakaba", "character:hinoki kasuga", @@ -1368,6 +1412,7 @@ object Character : TagList { "character:honou no heine", "character:hoppou seiki", "character:horizon ariadust", + "character:horkeu kamui", "character:horse chestnut", "character:hotaru ichijou", "character:hotaru shidare", @@ -1389,6 +1434,7 @@ object Character : TagList { "character:hulkling", "character:hungary", "character:huntress", + "character:hyakumantenbara salome", "character:hydra bell", "character:hylia", "character:hyouka kazakiri", @@ -1414,6 +1460,7 @@ object Character : TagList { "character:iggy koopa", "character:ika musume", "character:ikazuchi", + "character:ikemen kamen amai mask", "character:ikolina", "character:iku nagae", "character:iku nakatani", @@ -1488,6 +1535,7 @@ object Character : TagList { "character:jack", "character:jack atlas", "character:jacqli", + "character:jacqueline olantern dupre", "character:jacqui briggs", "character:jaden yuki", "character:jaguar man", @@ -1559,7 +1607,6 @@ object Character : TagList { "character:jubilee", "character:judith neutron", "character:judith snorrevik", - "character:judy hopps", "character:juggernaut", "character:jujuku shunamur", "character:julianne stingray", @@ -1598,6 +1645,7 @@ object Character : TagList { "character:kaede makidera", "character:kaede misumi", "character:kaede nankyoku", + "character:kaede sendoin", "character:kaede takagaki", "character:kaere kimura", "character:kaeya alberich", @@ -1610,8 +1658,10 @@ object Character : TagList { "character:kaguya ootsutsuki", "character:kaguya sumeragi", "character:kaguya yamai", + "character:kaho kuwakami", "character:kaho morii", "character:kai chisaki", + "character:kai hanaoka", "character:kai kyou", "character:kain blueriver", "character:kaisar lidfard", @@ -1620,7 +1670,9 @@ object Character : TagList { "character:kakashi hatake", "character:kakei mihaya", "character:kako-hakase", + "character:kakucho hitto", "character:kakunsa", + "character:kalego naberius", "character:kalifa", "character:kalinka cossack", "character:kallen stadtfeld", @@ -1634,6 +1686,7 @@ object Character : TagList { "character:kanade jinguji", "character:kanade suzutsuki", "character:kanade tachibana", + "character:kanade yoisaki", "character:kanade yuuki", "character:kanae itou", "character:kanae kochou", @@ -1656,6 +1709,7 @@ object Character : TagList { "character:kano sazanami", "character:kanon azai", "character:kanon hatori", + "character:kanon kougami", "character:kanon mizushiro", "character:kanon nakagawa", "character:kanpe-chan", @@ -1691,6 +1745,7 @@ object Character : TagList { "character:karkinos rucan", "character:karnatia seri anabald", "character:kasen ibara", + "character:kasuga maru", "character:kasumi momochi", "character:kasumi tendo", "character:kasumi todoh", @@ -1715,6 +1770,7 @@ object Character : TagList { "character:kaworu nagisa", "character:kaya miyoshi", "character:kazahana", + "character:kazami ryo", "character:kazamori sasa", "character:kazari", "character:kazari uiharu", @@ -1733,6 +1789,7 @@ object Character : TagList { "character:kazuto minaho", "character:kazuya aoi", "character:keena soga", + "character:kei arimori", "character:kei ayamine", "character:kei kishimoto", "character:kei yuuki", @@ -1775,6 +1832,7 @@ object Character : TagList { "character:killer croc", "character:killer t saibou", "character:killua zoldyck", + "character:kim chien le", "character:kimahri ronso", "character:kimi aoi", "character:king dedede", @@ -1785,6 +1843,7 @@ object Character : TagList { "character:kinu himuro", "character:kinuho wannai", "character:kinuyo nishi", + "character:kinzoku bat", "character:kipo oak", "character:kira daidohji", "character:kirakishou", @@ -1805,10 +1864,13 @@ object Character : TagList { "character:kirin toudou", "character:kirina hiura", "character:kirino kousaka", + "character:kirio amy", + "character:kirisato", "character:kiritsugu emiya", "character:kirumi tojo", "character:kiryu kazuma", "character:kiryuu bannanchiten", + "character:kisaki kondou", "character:kisara nanjou", "character:kisuke urahara", "character:kite tenjo", @@ -1819,6 +1881,7 @@ object Character : TagList { "character:kiyone makibi", "character:kl-e-0", "character:klan klan", + "character:klarion the witch boy", "character:klin", "character:klose rinz", "character:kneesocks demon", @@ -1826,6 +1889,7 @@ object Character : TagList { "character:koakuma", "character:kobato haneda", "character:kobato hasegawa", + "character:kobeni yonomori", "character:kobory", "character:koby", "character:kodaka hasegawa", @@ -1840,11 +1904,13 @@ object Character : TagList { "character:koharu shimoe", "character:koheita nanamatsu", "character:kohran li", + "character:kohta hirano", "character:kohza", "character:koichi nanase", "character:koishi herikawa", "character:koishi komeiji", "character:koizumi-san", + "character:kojiro nanjo", "character:kojirou hyuuga", "character:kokkoro", "character:koko hekmatyar", @@ -1872,6 +1938,7 @@ object Character : TagList { "character:kotaro inugami", "character:kotaro nanbara", "character:kotaro ogami", + "character:kotarou higuchi", "character:kotarou katsura", "character:kotetsu t. kaburagi", "character:kotoha kutsugi", @@ -1935,6 +2002,9 @@ object Character : TagList { "character:kukaku shiba", "character:kukuri tachibana", "character:kula diamond", + ) + + override fun getTags2(): List = listOf( "character:kumako kumoike", "character:kumi mikuni", "character:kumin tsuyuri", @@ -1954,6 +2024,7 @@ object Character : TagList { "character:kurumi imari", "character:kurumu kurono", "character:kushina uzumaki", + "character:kushinadahime", "character:kusuha mizuha", "character:kusunoki kasuga", "character:kusunoki sio", @@ -1980,6 +2051,7 @@ object Character : TagList { "character:kyon", "character:kyon no imouto", "character:kyosuke kiryu", + "character:kyosuke yotsuya", "character:kyou fujibayashi", "character:kyouhei kuga", "character:kyouji takahara", @@ -2003,9 +2075,6 @@ object Character : TagList { "character:kyrie elison", "character:kyubey", "character:kyubimon", - ) - - override fun getTags2() = listOf( "character:kyuubei yagyuu", "character:l lawliet", "character:l85a1", @@ -2029,6 +2098,7 @@ object Character : TagList { "character:lamretta", "character:lanas mom", "character:lancer", + "character:lanling wang", "character:laplus darknesss", "character:lara croft", "character:largo potter", @@ -2045,6 +2115,7 @@ object Character : TagList { "character:leaf", "character:leanne", "character:leblanc", + "character:lebreau fermet viralesque", "character:leeloo minai lekatariba-lamina-tchai ekbat de sebat", "character:leena toros", "character:lehm brick", @@ -2070,6 +2141,7 @@ object Character : TagList { "character:leonidas i", "character:leonmitchelli galette des rois", "character:leorio paladiknight", + "character:lera melnikova", "character:leshawna", "character:lettuce midorikawa", "character:letz kobayashi", @@ -2077,6 +2149,7 @@ object Character : TagList { "character:levi ackerman", "character:leviathan", "character:levy mcgarden", + "character:lezard valeth", "character:li xiangfei", "character:li xinlin", "character:li-en", @@ -2097,6 +2170,7 @@ object Character : TagList { "character:liliane", "character:lilica evette", "character:lilica felchenerow", + "character:lilina hinazuki", "character:lilith aensland", "character:lilithmon", "character:lilka eleniak", @@ -2145,8 +2219,10 @@ object Character : TagList { "character:lotton the wizard", "character:lou", "character:louis el bridget", + "character:louise camford", "character:louise francoise le blanc de la valliere", "character:louise halevy", + "character:loux krystas", "character:lu xun", "character:luann van houten", "character:luca angeloni", @@ -2205,12 +2281,15 @@ object Character : TagList { "character:madoka kugimiya", "character:madoka kyouno", "character:maekawa", + "character:mafuyu asahina", "character:mafuyu kirisu", "character:mafuyu oribe", "character:mafuyu shiina", + "character:magami oguchi", "character:magane chikujouin", "character:magillanica lou mayvin", "character:magma", + "character:magnamalo", "character:mahalia merrill", "character:mahiru inami", "character:maho hiyajo", @@ -2222,6 +2301,7 @@ object Character : TagList { "character:mai sakurajima", "character:mai shinomiya", "character:mai shiranui", + "character:mai thi hoang", "character:mai tokiha", "character:mai valentine", "character:maid chou", @@ -2235,6 +2315,7 @@ object Character : TagList { "character:maki tsurumaki", "character:makibano miruru", "character:makie sasaki", + "character:mako hitachi", "character:makoto itou", "character:makoto kikuchi", "character:makoto makimura", @@ -2242,6 +2323,7 @@ object Character : TagList { "character:makoto sawatari", "character:makoto shido", "character:makoto yuuki", + "character:malcolm graves", "character:malicorne de grandpre", "character:malty melromarc", "character:mami mizuno", @@ -2278,6 +2360,7 @@ object Character : TagList { "character:marcille donato", "character:marco bodt", "character:marechiyo oomaeda", + "character:mareyo oomaeda", "character:margaret borowski", "character:marge simpson", "character:margery daw", @@ -2404,6 +2487,7 @@ object Character : TagList { "character:mei mah", "character:mei misaki", "character:mei mishima", + "character:mei raiden", "character:mei sakura", "character:mei terumi", "character:mei zenmyoutsutsumi", @@ -2440,13 +2524,16 @@ object Character : TagList { "character:mexiah furan", "character:meyrin hawke", "character:mezou shouji", + "character:mi-chon shikimori", "character:mia clementis", "character:mia connery", "character:mia fey", + "character:mia taylor", "character:miaya gekkougahara", "character:micchy", "character:michael garret", "character:michelanne mazinsky", + "character:michelle watagi", "character:michiru hyodo", "character:michiru koda", "character:michiru matsushima", @@ -2454,6 +2541,7 @@ object Character : TagList { "character:midge klump", "character:midna", "character:midori imai", + "character:midori ishizaka", "character:midori oono", "character:midori tooyama", "character:midori yamabuki", @@ -2533,6 +2621,7 @@ object Character : TagList { "character:minami obuchi", "character:minami sakurai", "character:minami shimada", + "character:minami toba", "character:minamitsu murasa", "character:minamo katsura", "character:minamo kurosawa", @@ -2562,6 +2651,7 @@ object Character : TagList { "character:mio natsume", "character:mio sakamoto", "character:mion sonozaki", + "character:miori celesta", "character:mipha", "character:mira nygus", "character:mira yamana", @@ -2596,8 +2686,10 @@ object Character : TagList { "character:misogi kumagawa", "character:miss doublefinger", "character:miss fortune", + "character:miss heed", "character:miss kitty", "character:mister fantastic", + "character:mistiora arte", "character:misty tredwell", "character:misuzu kamio", "character:misuzu kusakabe", @@ -2607,6 +2699,7 @@ object Character : TagList { "character:mitsue shijo", "character:mitsuhide akechi", "character:mitsuhiko tsuburaya", + "character:mitsuki bakugou", "character:mitsuki nase", "character:mitsuki sawatari", "character:mitsuki shijou", @@ -2668,6 +2761,7 @@ object Character : TagList { "character:momoko sakura", "character:momoko shigeno", "character:momoko touyoko", + "character:momotarou mikoshiba", "character:momoyo kawakami", "character:mona megistus", "character:mondo ooya", @@ -2681,6 +2775,7 @@ object Character : TagList { "character:montmorency margarita la fere de montmorency", "character:moo-tan", "character:moon dancer", + "character:moon shadow", "character:moose", "character:mordred pendragon", "character:morgan le fay", @@ -2697,9 +2792,11 @@ object Character : TagList { "character:motoyasu kitamura", "character:moukaku", "character:moune", + "character:mount lady", "character:moutoku sousou", "character:mr. carrot cake", "character:mr. gar", + "character:mr. heartland", "character:mr. mime", "character:mr. popo", "character:mr. saturn", @@ -2724,6 +2821,7 @@ object Character : TagList { "character:muneakira yagyuu", "character:muramasa", "character:muramasa senju", + "character:murasaki echizen", "character:murasaki kuhouin", "character:murasaki shion", "character:murrue ramius", @@ -2869,6 +2967,7 @@ object Character : TagList { "character:nico yazawa", "character:nicole chen", "character:nicole the lynx", + "character:nienke meijer", "character:nightingale", "character:nikola tesla", "character:nina ichihara", @@ -2906,6 +3005,7 @@ object Character : TagList { "character:norton campbell", "character:nouhime", "character:nove", + "character:nozomi amano", "character:nozomi kiriya", "character:nozomi kujou", "character:nozomi tojo", @@ -2918,6 +3018,7 @@ object Character : TagList { "character:nuriko", "character:nyamo naamo", "character:nyaruko", + "character:nyatasha nyanners", "character:nyota uhura", "character:ochako uraraka", "character:octavia", @@ -2938,6 +3039,7 @@ object Character : TagList { "character:ono d", "character:onpu segawa", "character:onsa amano", + "character:opal bei fong", "character:ophiuchus shaina", "character:oriana thomson", "character:origami tobiichi", @@ -2973,9 +3075,11 @@ object Character : TagList { "character:park jae-sang", "character:parsee mizuhashi", "character:passionlip", + "character:patch d coolette", "character:patchouli knowledge", "character:patricia reichardt", "character:patricia thompson", + "character:paula jones", "character:paz ortega andrade", "character:pearl fey", "character:pebbles flintstone", @@ -3003,11 +3107,14 @@ object Character : TagList { "character:pharaoh atem", "character:philip j. fry", "character:philip pirrip", + "character:philuffy aingram", "character:phineas flynn", "character:phoenix", "character:phoenix wright", "character:phoron tatara", + "character:picero agares", "character:pidge gunderson", + "character:pieck finger", "character:pikachu", "character:ping hai", "character:pink oomiya", @@ -3017,6 +3124,7 @@ object Character : TagList { "character:pit girl", "character:pitahaya", "character:pixy misa", + "character:piyoko", "character:ple two", "character:pleinair", "character:plusle", @@ -3044,6 +3152,7 @@ object Character : TagList { "character:prier", "character:priestess", "character:prince diamond", + "character:prince of midenhall", "character:princess bean", "character:princess bubblegum", "character:princess cadance", @@ -3060,6 +3169,7 @@ object Character : TagList { "character:princess marie ange", "character:princess of moonbrook", "character:princess peach", + "character:princess pipp petals", "character:princess ruto", "character:princess star butterfly", "character:princess waya", @@ -3077,9 +3187,11 @@ object Character : TagList { "character:projekt melody", "character:protagonist", "character:prussia", + "character:ps5-chan", "character:psylocke", "character:pucchan", "character:pudding charlotte", + "character:puko", "character:pumyra", "character:punchline", "character:pyotr ilyich tchaikovsky", @@ -3089,6 +3201,7 @@ object Character : TagList { "character:qoone", "character:queen aleena hedgehog", "character:queen chrysalis", + "character:queen draco", "character:queen elizabeth", "character:queen grimhilde", "character:queen marlena", @@ -3151,6 +3264,7 @@ object Character : TagList { "character:ratie curti", "character:ravel phenex", "character:ravness loxaerion", + "character:ray akaba", "character:rayneshia el-arte corwen", "character:re-l mayer", "character:rebecca hawkins", @@ -3178,6 +3292,7 @@ object Character : TagList { "character:reiko mikami", "character:reiko nagase", "character:reiko natsume", + "character:reiko sato-in", "character:reiko takahashi", "character:reimi saionji", "character:reimi sugimoto", @@ -3244,6 +3359,7 @@ object Character : TagList { "character:rikou takitsubo", "character:riku mikami", "character:rikuo", + "character:riley akaba", "character:riley andersen", "character:riley daring", "character:rimu mikogami", @@ -3260,6 +3376,7 @@ object Character : TagList { "character:rin tosaka", "character:rina kurumi", "character:rina ogata", + "character:rindou haitani", "character:rindou kobayashi", "character:ringo akai", "character:ringo noyamano", @@ -3322,8 +3439,11 @@ object Character : TagList { "character:rozalin", "character:rozie", "character:ruben victoriano", + "character:rubeus hagrid", "character:ruby moon", "character:ruby tojo", + "character:rudolph zeppelin iii", + "character:rudy lineback", "character:ruffnut thorston", "character:rui kisugi", "character:ruiko saten", @@ -3386,6 +3506,7 @@ object Character : TagList { "character:saber alter", "character:saber lily", "character:sabre tiger", + "character:sabro sabnock", "character:sachiko koshimizu", "character:sachiko ogasawara", "character:sadao maou", @@ -3435,6 +3556,7 @@ object Character : TagList { "character:saku tooyama", "character:sakuno uryuu", "character:sakura haruno", + "character:sakura igarashi", "character:sakura igawa", "character:sakura kanou", "character:sakura kasugano", @@ -3527,6 +3649,7 @@ object Character : TagList { "character:scheris adjani", "character:scolipede", "character:scotch broom", + "character:scp-4960", "character:scrooge mcduck", "character:sei asagiri", "character:seifer almasy", @@ -3561,7 +3684,6 @@ object Character : TagList { "character:sensui seiki", "character:sensui shinseiki", "character:sentouin roku-gou", - "character:sentouki - raye", "character:sentouki - roze", "character:senzou tachibana", "character:seolla schweizer", @@ -3639,6 +3761,7 @@ object Character : TagList { "character:shino sousaki", "character:shinobu jacobs", "character:shinobu kochou", + "character:shinobu kuki", "character:shinobu maehara", "character:shinobu miyake", "character:shinobu nunotaba", @@ -3677,6 +3800,7 @@ object Character : TagList { "character:shizuku ashuu", "character:shizuku hazuki", "character:shizuku kitayama", + "character:shizuku kuroe", "character:shizuku oikawa", "character:shizuku sangou", "character:shizumaru hisame", @@ -3685,7 +3809,9 @@ object Character : TagList { "character:shizuru hibara", "character:shobu kirifuda", "character:shoebill", + "character:shoka sakurane", "character:shoko sashinami", + "character:shoma sawamura", "character:shou ashikawa", "character:shou hinakawa", "character:shou toramaru", @@ -3724,6 +3850,7 @@ object Character : TagList { "character:shuusei kagari", "character:shuusekichi seiki", "character:shy guy", + "character:sid chang", "character:sideshow bob", "character:sieglinde baumgard", "character:siesta", @@ -3739,6 +3866,7 @@ object Character : TagList { "character:sisudatu", "character:siune", "character:sivil", + "character:sky striker ace - raye", "character:skycat", "character:skyla", "character:slaanesh", @@ -3784,6 +3912,7 @@ object Character : TagList { "character:souji okita", "character:soukou kuuboki", "character:souma yukihira", + "character:sousei arakida", "character:souseiseki", "character:soushi miketsukami", "character:soushun murasame", @@ -3812,16 +3941,20 @@ object Character : TagList { "character:starlight", "character:starsha iscandar", "character:stella loussier", + "character:steph gingrich", "character:stephanie dola", "character:sterling malory archer", + "character:steven armstrong", "character:steven boxleitner", "character:sticks the badger", "character:stocking anarchy", "character:storm", + "character:su-chan", "character:subaru konoe", "character:subaru mikage", "character:subaru nakajima", "character:subaru natsuki", + "character:subaru wakaba", "character:subway boss ingo", "character:suelecia zagan analeit", "character:sugoi doppai", @@ -3872,6 +4005,9 @@ object Character : TagList { "character:suzune saijou", "character:suzuno kamazuki", "character:suzuya tohzuki", + ) + + override fun getTags3(): List = listOf( "character:sweetie belle", "character:sweetie drops", "character:sword maiden", @@ -3892,6 +4028,7 @@ object Character : TagList { "character:szayel aporro granz", "character:t-00 tyrant", "character:t-elos", + "character:t.j. livingston", "character:t.m. opera o", "character:tabitha", "character:tabitha helene orleans de gallia", @@ -3909,6 +4046,8 @@ object Character : TagList { "character:taiga fujimura", "character:taiga kagami", "character:taigei", + "character:taigong wang", + "character:taiju ooki", "character:taiki", "character:taikogane sadamune", "character:tail blue", @@ -3951,6 +4090,7 @@ object Character : TagList { "character:tamamo no mae", "character:tamayo kizaki", "character:tamora jean calhoun", + "character:tang wutong", "character:tanjirou kamado", "character:tanukichi okuma", "character:tapio chatorazawa", @@ -3979,6 +4119,7 @@ object Character : TagList { "character:teletha tessa testarossa", "character:tenchi masaki", "character:teni", + "character:tenka kou", "character:tenma tsukamoto", "character:tenri ayukawa", "character:tensei iida", @@ -4006,9 +4147,6 @@ object Character : TagList { "character:tiana", "character:tianzi", "character:tien", - ) - - override fun getTags3() = listOf( "character:tien shinhan", "character:tieria erde", "character:tiese schtrinen", @@ -4018,6 +4156,7 @@ object Character : TagList { "character:tigress", "character:tikal the echidna", "character:timantha turner", + "character:timido cute", "character:tinker bell", "character:tio plato", "character:tipper taloon", @@ -4028,6 +4167,7 @@ object Character : TagList { "character:tohru adachi", "character:tohru takagami", "character:toma amamiya", + "character:toma inumaru", "character:tommy himi", "character:tomo asama", "character:tomo yamanobe", @@ -4049,11 +4189,13 @@ object Character : TagList { "character:tooru taki", "character:toph bei fong", "character:tora", + "character:torao mido", "character:tori aoi", "character:toshiro hijikata", "character:toshiya satou", "character:toshizou hijikata", "character:totooria helmold", + "character:touji sawaizumi", "character:touji suzuhara", "character:touka itsuki", "character:touka takanashi", @@ -4071,6 +4213,7 @@ object Character : TagList { "character:toyotomi hideyoshi", "character:tracer", "character:trap jaw", + "character:treacle", "character:triana orpheus", "character:trilla suduri", "character:triplicate girl", @@ -4078,6 +4221,7 @@ object Character : TagList { "character:trixie", "character:tron bonne", "character:trunks briefs", + "character:truth", "character:tsubaki miwa", "character:tsubaki oribe", "character:tsubaki takamura", @@ -4111,6 +4255,7 @@ object Character : TagList { "character:tsunami", "character:tsurara oikawa", "character:tsurara shirayuki", + "character:tsurugi kensaki", "character:tsuruko aoyama", "character:tsuruya", "character:tsutomu komano", @@ -4124,6 +4269,7 @@ object Character : TagList { "character:tweek tweak", "character:tweyen", "character:twilight sparkle", + "character:twin turbo", "character:ty lee", "character:type 64", "character:type 95", @@ -4157,6 +4303,7 @@ object Character : TagList { "character:uryuu ishida", "character:urza pranaice", "character:usami", + "character:ushio kofune", "character:ushiwakamaru", "character:uso ewin", "character:usopp", @@ -4178,6 +4325,7 @@ object Character : TagList { "character:velsper", "character:venipede", "character:vento of the front", + "character:vera nair", "character:veronica madaraki", "character:vert farbreton", "character:vestara khai", @@ -4211,10 +4359,12 @@ object Character : TagList { "character:warrior", "character:washu hakubi", "character:wasp", + "character:watson amelia", "character:weather report", "character:wedding peach", "character:wednesday addams", "character:welrod mkii", + "character:wen-li yang", "character:wendi", "character:wendy marvell", "character:wendy o. koopa", @@ -4281,6 +4431,7 @@ object Character : TagList { "character:yasumitsu wakamiya", "character:yasuna oribe", "character:yasutarou hamada", + "character:yawata maru", "character:yayoi fujisawa", "character:yayoi shinozuka", "character:yayoi takatsuki", @@ -4289,6 +4440,7 @@ object Character : TagList { "character:yellow tulip", "character:yggdra yuril artwaltz", "character:yiffany longstocking lalonde harley", + "character:ying swei", "character:ymir", "character:yoda", "character:yoh asakura", @@ -4313,12 +4465,14 @@ object Character : TagList { "character:yoshiko tsushima", "character:yoshiko yamanaka", "character:yoshimi hanakura", + "character:yoshimi ibaragi", "character:yoshimi takenouchi", "character:yoshimoto imagawa", "character:yoshimura haruka", "character:yoshino himekawa", "character:yoshino kousaka", "character:yoshino shimazu", + "character:yoshino tomotake", "character:yoshio kobayashi", "character:yoshioka", "character:yoshitsugu otani", @@ -4411,15 +4565,18 @@ object Character : TagList { "character:yunoha thrul", "character:yura keikain", "character:yuri", + "character:yuri himukai", "character:yuri nakamura", "character:yuri nikaidou", "character:yuri sakazaki", "character:yuri seo", + "character:yuria niguredou", "character:yurika misumaru", "character:yurika toudou", "character:yuriko aoki", "character:yusa nishimori", "character:yuta homura", + "character:yuta okkotsu", "character:yutaro katori", "character:yuty la", "character:yuu", @@ -4435,6 +4592,7 @@ object Character : TagList { "character:yuuhi katagiri", "character:yuuhi mitsurugi", "character:yuuichi aizawa", + "character:yuuichi kayama", "character:yuuichirou kumada", "character:yuuji itadori", "character:yuuka gouha", @@ -4465,7 +4623,9 @@ object Character : TagList { "character:yuuri kozukata", "character:yuuri shibuya", "character:yuusaku fujiki", + "character:yuusuke fujisaki", "character:yuuta hibiki", + "character:yuuta kiryuu", "character:yuuta togashi", "character:yuuto kamishiro", "character:yuuya mirokuji", @@ -4477,6 +4637,7 @@ object Character : TagList { "character:yuzuriha shirase", "character:yylfordt granz", "character:yzma", + "character:z-arc", "character:z1", "character:z3", "character:zaizen touko", diff --git a/app/src/main/java/exh/eh/tags/Cosplayer.kt b/app/src/main/java/exh/eh/tags/Cosplayer.kt index 683f33dfd..a6040e68f 100644 --- a/app/src/main/java/exh/eh/tags/Cosplayer.kt +++ b/app/src/main/java/exh/eh/tags/Cosplayer.kt @@ -1,46 +1,121 @@ package exh.eh.tags object Cosplayer : TagList { - - override fun getTags1() = listOf( + override fun getTags1(): List = listOf( + "cosplayer:abaoyeshituniang", + "cosplayer:ai lei jiang", "cosplayer:akane araragi", + "cosplayer:akemi101xoxo", "cosplayer:aleksandra bodler", + "cosplayer:alicekyo", + "cosplayer:alin ma", + "cosplayer:alisa kiss", + "cosplayer:alodia gosiengfiao", + "cosplayer:amanda welp", + "cosplayer:anastasia komori", "cosplayer:aokotan", + "cosplayer:arisa mizuhara", "cosplayer:arty huang", + "cosplayer:ashiya noriko", "cosplayer:atsuki", + "cosplayer:ayaka matsunaga", + "cosplayer:bailey jay", + "cosplayer:banbanko", "cosplayer:bishoujomom", + "cosplayer:bobbi starr", "cosplayer:carry key", + "cosplayer:charles dera", "cosplayer:chunmomo", + "cosplayer:comonun", + "cosplayer:danielle vedovelli", + "cosplayer:darling cute", + "cosplayer:dillion harper", + "cosplayer:donnaloli", + "cosplayer:evenink", + "cosplayer:fe galvao", + "cosplayer:fluffy nemu", + "cosplayer:franxcos", + "cosplayer:g44 wa kizutsukanai", "cosplayer:gumiho hannya", "cosplayer:hane ame", + "cosplayer:helly von valentine", + "cosplayer:hessakai", + "cosplayer:hey shika", + "cosplayer:higurashi rin", + "cosplayer:himeecosplay", "cosplayer:hinaughtya", "cosplayer:holly wolf", + "cosplayer:imokawa naoko", "cosplayer:iori moe", + "cosplayer:ishikawa asami", + "cosplayer:jaycee", + "cosplayer:jessica nigri", "cosplayer:jill", "cosplayer:kalinka fox", + "cosplayer:kanda midori", "cosplayer:kaya huang", + "cosplayer:kimmie mi", + "cosplayer:kitami eri", + "cosplayer:koyama rikako", + "cosplayer:kqueentsun", + "cosplayer:kurumi.", "cosplayer:kuuko w", "cosplayer:lenfried", + "cosplayer:lewdoart", + "cosplayer:lovelyspacekitten", + "cosplayer:marie-claude bourbonnais", + "cosplayer:meikoui", "cosplayer:miih cosplay", "cosplayer:mikomin", "cosplayer:misa daidai", + "cosplayer:mizhimaoqiu", + "cosplayer:mochizuki eiko", "cosplayer:momoiro reku", "cosplayer:momokun", "cosplayer:nadyasonika", + "cosplayer:neroko kaigan", + "cosplayer:niannian d", + "cosplayer:nicky", + "cosplayer:niyeye", "cosplayer:nora fawn", "cosplayer:octokuro", "cosplayer:oichi", + "cosplayer:okada yui", + "cosplayer:penkarui", + "cosplayer:punk macarroni", + "cosplayer:queenie", + "cosplayer:rio-chan", "cosplayer:rioko", "cosplayer:rocksy light", + "cosplayer:rolyatistaylor", + "cosplayer:saiwari ph", "cosplayer:saku", "cosplayer:sakurai hinoki", + "cosplayer:sandykuroneko", + "cosplayer:saotome love", + "cosplayer:sawaka", + "cosplayer:sexyflowerwater", + "cosplayer:shibuya kaho", "cosplayer:shiro kitsune", "cosplayer:siao ding", "cosplayer:smoettii", + "cosplayer:sneaky", + "cosplayer:soa lianna", + "cosplayer:son yeeun", + "cosplayer:sunnyvier", + "cosplayer:tanaka hitomi", + "cosplayer:tenleid", + "cosplayer:todopokie", + "cosplayer:tsubaki zakuro", + "cosplayer:tsuki desu", + "cosplayer:tyouduki maryou", + "cosplayer:uchida mahiro", "cosplayer:valery himera", "cosplayer:velvet", "cosplayer:wildhoney423", "cosplayer:yume", + "cosplayer:yunocos69", "cosplayer:yuzupyon", + "cosplayer:zara durose", ) } diff --git a/app/src/main/java/exh/eh/tags/Female.kt b/app/src/main/java/exh/eh/tags/Female.kt index 88949e56e..5dd3fd3ac 100644 --- a/app/src/main/java/exh/eh/tags/Female.kt +++ b/app/src/main/java/exh/eh/tags/Female.kt @@ -1,11 +1,13 @@ package exh.eh.tags object Female : TagList { - - override fun getTags1() = listOf( + override fun getTags1(): List = listOf( "female:abortion", "female:absorption", + "female:adventitious mouth", + "female:adventitious penis", "female:adventitious vagina", + "female:afro", "female:age progression", "female:age regression", "female:ahegao", @@ -17,10 +19,13 @@ object Female : TagList { "female:anal birth", "female:anal intercourse", "female:anal prolapse", + "female:analphagia", "female:angel", + "female:animal on animal", "female:animal on furry", "female:animegao", "female:anorexic", + "female:apparel bukkake", "female:apron", "female:armpit licking", "female:armpit sex", @@ -33,8 +38,10 @@ object Female : TagList { "female:bald", "female:ball sucking", "female:balljob", + "female:balls expansion", "female:bandages", "female:bandaid", + "female:bat girl", "female:bbw", "female:bdsm", "female:bear", @@ -47,6 +54,8 @@ object Female : TagList { "female:big balls", "female:big breasts", "female:big clit", + "female:big lips", + "female:big muscles", "female:big nipples", "female:big penis", "female:big vagina", @@ -68,6 +77,7 @@ object Female : TagList { "female:bodystocking", "female:bodysuit", "female:bondage", + "female:braces", "female:brain fuck", "female:breast expansion", "female:breast feeding", @@ -80,6 +90,7 @@ object Female : TagList { "female:butler", "female:cannibalism", "female:cashier", + "female:cat", "female:catfight", "female:catgirl", "female:cbt", @@ -95,11 +106,16 @@ object Female : TagList { "female:christmas", "female:clamp", "female:clit growth", + "female:clit insertion", "female:clit stimulation", "female:clone", + "female:closed eyes", "female:clothed male nude female", + "female:clothed paizuri", + "female:clown", "female:coach", "female:cock ring", + "female:cockphagia", "female:cockslapping", "female:collar", "female:condom", @@ -115,11 +131,13 @@ object Female : TagList { "female:crossdressing", "female:crotch tattoo", "female:crown", + "female:crying", "female:cum bath", "female:cum in eye", "female:cum swap", "female:cumflation", "female:cunnilingus", + "female:cuntbusting", "female:dark nipples", "female:dark sclera", "female:dark skin", @@ -129,6 +147,8 @@ object Female : TagList { "female:deer girl", "female:defloration", "female:demon girl", + "female:denki anma", + "female:detached sleeves", "female:diaper", "female:dick growth", "female:dickgirl on dickgirl", @@ -138,6 +158,8 @@ object Female : TagList { "female:dog", "female:dog girl", "female:doll joints", + "female:dolphin", + "female:domination loss", "female:donkey", "female:double anal", "female:double blowjob", @@ -169,6 +191,7 @@ object Female : TagList { "female:farting", "female:females only", "female:femdom", + "female:fff threesome", "female:fft threesome", "female:filming", "female:fingering", @@ -183,11 +206,13 @@ object Female : TagList { "female:foot insertion", "female:foot licking", "female:footjob", + "female:forced exposure", "female:forniphilia", "female:fox", "female:fox girl", "female:freckles", "female:frog", + "female:frog girl", "female:frottage", "female:fundoshi", "female:furry", @@ -199,11 +224,15 @@ object Female : TagList { "female:gender change", "female:gender morph", "female:ghost", + "female:giant sperm", "female:giantess", "female:gigantic breasts", + "female:gijinka", + "female:giraffe girl", "female:glasses", "female:glory hole", "female:gloves", + "female:goblin", "female:gokkun", "female:gothic lolita", "female:granddaughter", @@ -213,12 +242,14 @@ object Female : TagList { "female:guro", "female:gyaru", "female:gymshorts", + "female:haigure", "female:hair buns", "female:hairjob", "female:hairy", "female:hairy armpits", "female:handicapped", "female:handjob", + "female:hanging", "female:harem", "female:harness", "female:harpy", @@ -237,18 +268,24 @@ object Female : TagList { "female:human cattle", "female:human on furry", "female:humiliation", + "female:hyena girl", "female:impregnation", "female:incest", "female:infantilism", "female:inflation", "female:insect", "female:insect girl", + "female:internal urination", "female:inverted nipples", "female:invisible", + "female:kangaroo", + "female:kappa", "female:kemonomimi", "female:kigurumi pajama", "female:kimono", + "female:kindergarten uniform", "female:kissing", + "female:kneepit sex", "female:kunoichi", "female:lab coat", "female:lactation", @@ -258,6 +295,7 @@ object Female : TagList { "female:layer cake", "female:leash", "female:leg lock", + "female:legjob", "female:leotard", "female:lingerie", "female:lioness", @@ -266,7 +304,10 @@ object Female : TagList { "female:lolicon", "female:long tongue", "female:low bestiality", + "female:low guro", "female:low lolicon", + "female:low scat", + "female:low smegma", "female:machine", "female:maggot", "female:magical girl", @@ -290,20 +331,25 @@ object Female : TagList { "female:minigirl", "female:monkey", "female:monkey girl", + "female:monoeye", "female:monster girl", "female:moral degeneration", "female:mother", "female:mouse", "female:mouse girl", "female:mouth mask", + "female:multimouth blowjob", "female:multiple arms", "female:multiple assjob", "female:multiple breasts", "female:multiple footjob", "female:multiple handjob", + "female:multiple nipples", "female:multiple orgasms", "female:multiple paizuri", "female:multiple penises", + "female:multiple straddling", + "female:multiple vaginas", "female:muscle", "female:muscle growth", "female:nakadashi", @@ -315,6 +361,7 @@ object Female : TagList { "female:nipple birth", "female:nipple expansion", "female:nipple fuck", + "female:nipple stimulation", "female:nose fuck", "female:nose hook", "female:nun", @@ -327,12 +374,16 @@ object Female : TagList { "female:oppai loli", "female:orc", "female:orgasm denial", + "female:otter girl", + "female:oyakodon", "female:paizuri", + "female:panda girl", "female:pantyhose", "female:pantyjob", "female:parasite", "female:pasties", "female:penis birth", + "female:personality excretion", "female:petplay", "female:petrification", "female:phimosis", @@ -364,13 +415,16 @@ object Female : TagList { "female:rape", "female:real doll", "female:reptile", + "female:retractable penis", "female:rhinoceros", "female:rimjob", "female:robot", "female:ryona", "female:saliva", + "female:sarashi", "female:scar", "female:scat", + "female:scat insertion", "female:school gym uniform", "female:school swimsuit", "female:schoolboy uniform", @@ -378,22 +432,29 @@ object Female : TagList { "female:scrotal lingerie", "female:selfcest", "female:sex toys", + "female:shapening", "female:shared senses", "female:shark", + "female:shark girl", + "female:shaved head", "female:sheep", "female:sheep girl", "female:shemale", "female:shibari", + "female:shimaidon", "female:shimapan", "female:shrinking", "female:sister", "female:skinsuit", + "female:skunk girl", "female:slave", "female:sleeping", "female:slime", "female:slime girl", "female:slug", "female:small breasts", + "female:small penis", + "female:smalldom", "female:smegma", "female:smell", "female:smoking", @@ -401,6 +462,7 @@ object Female : TagList { "female:snake", "female:snake girl", "female:snuff", + "female:sockjob", "female:sole dickgirl", "female:sole female", "female:solo action", @@ -412,8 +474,10 @@ object Female : TagList { "female:squirting", "female:ssbbw", "female:stewardess", + "female:stirrup legwear", "female:stockings", "female:stomach deformation", + "female:straitjacket", "female:strap-on", "female:stretching", "female:stuck in wall", @@ -427,10 +491,13 @@ object Female : TagList { "female:table masturbation", "female:tail", "female:tail plug", + "female:tailjob", + "female:tailphagia", "female:tall girl", "female:tanlines", "female:teacher", "female:tentacles", + "female:thick eyebrows", "female:thigh high boots", "female:tiara", "female:tickling", @@ -443,11 +510,13 @@ object Female : TagList { "female:tracksuit", "female:trampling", "female:transformation", + "female:transparent clothing", "female:tribadism", "female:triple anal", "female:triple penetration", "female:triple vaginal", "female:ttf threesome", + "female:ttt threesome", "female:tube", "female:turtle", "female:tutor", @@ -472,7 +541,10 @@ object Female : TagList { "female:waiter", "female:waitress", "female:weight gain", + "female:wet clothes", + "female:whale", "female:whip", + "female:wingjob", "female:wings", "female:witch", "female:wolf", @@ -484,6 +556,7 @@ object Female : TagList { "female:x-ray", "female:yandere", "female:yuri", + "female:zebra", "female:zombie", ) } diff --git a/app/src/main/java/exh/eh/tags/Group.kt b/app/src/main/java/exh/eh/tags/Group.kt index a177cfa83..b915166dd 100644 --- a/app/src/main/java/exh/eh/tags/Group.kt +++ b/app/src/main/java/exh/eh/tags/Group.kt @@ -1,8 +1,7 @@ package exh.eh.tags object Group : TagList { - - override fun getTags1() = listOf( + override fun getTags1(): List = listOf( "group:---", "group:... mou ii desu.", "group:...with my tears.", @@ -72,6 +71,7 @@ object Group : TagList { "group:38.5 c", "group:3d adult comics", "group:3d bdsm dungeon", + "group:3d live", "group:3d pose shuu", "group:3darlings", "group:3dfiends", @@ -402,6 +402,7 @@ object Group : TagList { "group:anakichi", "group:anal crisis", "group:analog store", + "group:analyst freedom", "group:ananwanco", "group:anata o aishite yamazu", "group:anatawo haijindesu", @@ -514,6 +515,7 @@ object Group : TagList { "group:arikui paradise", "group:arinko.", "group:arisan-antenna", + "group:aristogracy", "group:ariyon dou", "group:ark emerald", "group:ark nantoka", @@ -586,6 +588,7 @@ object Group : TagList { "group:asunaro-shiki bakudan", "group:at 1level", "group:at down", + "group:at e.com", "group:at kenkyuujo", "group:at m-gun", "group:at mztm", @@ -690,6 +693,7 @@ object Group : TagList { "group:balklash.", "group:ball colon s", "group:ballet cohort", + "group:bambi", "group:banana koubou", "group:banana musume", "group:banana no kawa", @@ -752,6 +756,7 @@ object Group : TagList { "group:bery manjhr", "group:bessungou", "group:beta houkai", + "group:beta kikaku hanbai", "group:beta na kanzume", "group:betaneta", "group:betsu ni suki janai yo", @@ -829,6 +834,7 @@ object Group : TagList { "group:blue topaz", "group:blue24", "group:bluebox", + "group:bluehistory", "group:bluehot plus", "group:bluejelly", "group:bluemage", @@ -1038,6 +1044,7 @@ object Group : TagList { "group:chikutakudoh", "group:chikuwano kimochi", "group:chikyuugai seimeitai mokyu", + "group:child box", "group:childmaid", "group:childwife", "group:chill-out", @@ -1143,6 +1150,7 @@ object Group : TagList { "group:circle yuki", "group:circlesprocket", "group:citoron soft", + "group:citric acid1350", "group:clammbon", "group:cleanliness.", "group:cleari tei", @@ -1408,6 +1416,7 @@ object Group : TagList { "group:dolcecanto", "group:dollproject", "group:dom joshidan", + "group:donaora", "group:donburi beya", "group:dondondon", "group:dont understand", @@ -1458,6 +1467,7 @@ object Group : TagList { "group:drill", "group:drill biyori", "group:dro-ya", + "group:dropwortbell", "group:drug slash tag slash 21", "group:dual beat", "group:dualtail", @@ -1531,6 +1541,7 @@ object Group : TagList { "group:enshu spirits", "group:entgegen", "group:enuhuo", + "group:enyidou", "group:ephese", "group:epic lust", "group:epicureansyndrome", @@ -1726,6 +1737,7 @@ object Group : TagList { "group:fuwa fuwa pinkchan", "group:fuwamoko honpo", "group:fuwaten", + "group:fuyuzora izumo", "group:fuzukikai", "group:g area", "group:g equals kundow", @@ -1768,9 +1780,11 @@ object Group : TagList { "group:garaku dusk", "group:garakuta shoujo", "group:garakuta-ya", + "group:garasu hokou", "group:garbage", "group:gardening bulldog", "group:garnet-works.", + "group:garunansa mk-2", "group:garyuh-chitai", "group:gas ketsu jinsei", "group:gasshuukoku netamekoru", @@ -1885,6 +1899,7 @@ object Group : TagList { "group:gpen", "group:gpx", "group:grand cross", + "group:grand plie.", "group:graphic l", "group:gravidan", "group:great acta", @@ -1987,6 +2002,9 @@ object Group : TagList { "group:halleluya.", "group:hallenchi planet", "group:hallucigenia", + ) + + override fun getTags2(): List = listOf( "group:halopack", "group:ham string", "group:ham.", @@ -2002,13 +2020,12 @@ object Group : TagList { "group:hamurabi-dou", "group:hamustar", "group:hamusuta-nonikomi", + "group:hana ni arashi.", "group:hana tabako", - ) - - override fun getTags2() = listOf( "group:hana to ribon", "group:hana x mezo", "group:hanafubuki gorilla", + "group:hanahubu", "group:hanaji koubou", "group:hanamachi shimaiten", "group:hanamaru mugen gym", @@ -2037,6 +2054,7 @@ object Group : TagList { "group:happo ryuu", "group:happy birthday", "group:happy flame time", + "group:happy log", "group:happy strawberry", "group:happydrop", "group:happywest", @@ -2136,6 +2154,7 @@ object Group : TagList { "group:hetaretch", "group:hetaruya", "group:heya no sumi.", + "group:hgt labo", "group:hi at skip", "group:hi plus us", "group:hi-b", @@ -2199,6 +2218,7 @@ object Group : TagList { "group:hiroq", "group:hirouguma", "group:hisagoya", + "group:hisou and anchoku", "group:hisuitei", "group:hisyoku no tansansui", "group:hito no fundoshi", @@ -2229,6 +2249,7 @@ object Group : TagList { "group:hokoushayou shingou", "group:hokuroza", "group:holiday school", + "group:home not found", "group:homepie koubou", "group:homerun chaya", "group:homuras r comics", @@ -2248,6 +2269,7 @@ object Group : TagList { "group:hook", "group:hooliganism", "group:horiishi horuto", + "group:horonabe ken", "group:horrorbabecentral", "group:horsetail", "group:hoshi no hako", @@ -2367,6 +2389,7 @@ object Group : TagList { "group:imobatake", "group:imokenpi", "group:imomushi kyouiku madoguchi", + "group:inakahaishin", "group:inaridou shoten", "group:inc satsujinsha", "group:inceton games", @@ -2395,6 +2418,7 @@ object Group : TagList { "group:intoku.info", "group:inudrill.", "group:inukamedou", + "group:inukichi club", "group:inukorohouse", "group:inunabe", "group:inuteikoku", @@ -2414,6 +2438,7 @@ object Group : TagList { "group:isada-ke", "group:isami kaihatsu jigyoudan", "group:isamu. no oheya", + "group:isanayoruho", "group:ishikari shake nabe doukoukai", "group:ishikorodou", "group:ishimuraya", @@ -2460,6 +2485,7 @@ object Group : TagList { "group:jamadai oukoku", "group:janculsoft", "group:jangarian", + "group:jar of elements", "group:jasmin universal village", "group:jeepney.cony", "group:jei c1on-ri", @@ -2535,6 +2561,7 @@ object Group : TagList { "group:k.a.d", "group:k.f.d.", "group:k.o.store", + "group:k.z.z. gundan", "group:k2 company", "group:k2 tomo no kai", "group:k3", @@ -2555,6 +2582,7 @@ object Group : TagList { "group:kaeri no kai 2", "group:kaeru soft", "group:kagaku-shitsu.", + "group:kage mitsu", "group:kagisawadou", "group:kagishippo", "group:kagiyama baking co ltd", @@ -2584,6 +2612,7 @@ object Group : TagList { "group:kaki purin", "group:kakiabura", "group:kakinotanehitotsubu", + "group:kaku shoujo", "group:kakunetu neko punch", "group:kakuzato-ichi", "group:kamaboko higii", @@ -2612,6 +2641,7 @@ object Group : TagList { "group:kangaroo kick", "group:kanimiso pan", "group:kanimiso-tei", + "group:kankitudou", "group:kankituteien", "group:kanmi ningyou", "group:kanmidokoro usb", @@ -2840,12 +2870,14 @@ object Group : TagList { "group:kokkishin", "group:koko sou iu mise janainde", "group:kokochikyuu", + "group:kokonji honpo", "group:kokonoe", "group:kokonokaya", "group:kokonokiya", "group:kokoro ha koi iro", "group:kokoro no bookmark", "group:kokou no gokutsubushi", + "group:koks k yokochou", "group:koku-from-shojo", "group:kokumaro chousei tounyuu", "group:kokuritsu hinanjo", @@ -2916,6 +2948,7 @@ object Group : TagList { "group:kouni yuu", "group:kousaien", "group:kousoku gurihari-tei", + "group:kousoku purin", "group:kouzaka-san to makino jimusho", "group:kouzu shoukai", "group:kouzuya", @@ -3047,8 +3080,10 @@ object Group : TagList { "group:lab-ideas", "group:labomagi", "group:lagrangian-point", + "group:lagunaseca", "group:laikaloid", "group:lala la", + "group:lalapaloosa", "group:lamchat", "group:lamia advisers", "group:landurchin", @@ -3056,6 +3091,7 @@ object Group : TagList { "group:lantern chord", "group:lapis lazuli", "group:lapislazuli triple star", + "group:laser beam", "group:lathimania kyouwakoku", "group:latte chaba", "group:lavenderblue", @@ -3171,6 +3207,7 @@ object Group : TagList { "group:m kichibeya", "group:m plus dilore", "group:m slash k club", + "group:m-i-p", "group:m-keifu", "group:m-koujou", "group:m-lab.", @@ -3460,6 +3497,7 @@ object Group : TagList { "group:mindcontrolcomics", "group:mine slash mine", "group:minemine kikaku", + "group:minimum fuusen", "group:minimum lab", "group:miniomlet ongakudan", "group:minisuka fx", @@ -3481,6 +3519,7 @@ object Group : TagList { "group:misin koujou", "group:misonodenpatou", "group:misoyahonpo", + "group:misssail", "group:misuterutein", "group:misutta", "group:misuzu dennou gijutsukenkyuujo", @@ -3531,6 +3570,7 @@ object Group : TagList { "group:moe hentai", "group:moe hina", "group:moe shoujo ryouiki", + "group:moegara", "group:moeyuki soft", "group:moezilla-gumi", "group:mofu mofu sheep", @@ -3582,6 +3622,7 @@ object Group : TagList { "group:moon night kitten", "group:moon ruler", "group:moonlegacy", + "group:moonlight laboratory", "group:moonrevenge", "group:moonshell", "group:moonsorrow", @@ -3639,6 +3680,7 @@ object Group : TagList { "group:mozuku dokokai", "group:mp", "group:mp0", + "group:mr. hokke", "group:mr.jack plus", "group:mr.k", "group:mr.outside", @@ -3765,6 +3807,7 @@ object Group : TagList { "group:namakura dou", "group:namanecotei", "group:namasute koubou", + "group:namazuchaya", "group:namekataya", "group:nami-nami restaurant", "group:namida no teinen taishoku", @@ -3906,6 +3949,7 @@ object Group : TagList { "group:nekozamedan", "group:nekuronomikon", "group:nel-zel formula", + "group:nemu wa yakiniku ga tabetai", "group:nemurineko", "group:nenashigusa no ie", "group:nendo ningyo", @@ -3961,6 +4005,9 @@ object Group : TagList { "group:nikomark", "group:nikomi omurice", "group:nikoniko company", + ) + + override fun getTags3(): List = listOf( "group:niku ringo", "group:nikubenki seisakusho", "group:nikudan", @@ -4006,9 +4053,6 @@ object Group : TagList { "group:niwatori", "group:niwatori-ya", "group:niwatoritowani", - ) - - override fun getTags3() = listOf( "group:niy koubou", "group:niziro", "group:niziyumedokoro", @@ -4025,6 +4069,7 @@ object Group : TagList { "group:nocohica", "group:nodobotoke kingyo", "group:nogusaw puzzle", + "group:noir jou entrance", "group:nokishita no rakuen.", "group:nomerikomu", "group:nomigoro.", @@ -4040,7 +4085,6 @@ object Group : TagList { "group:norakurari.", "group:noraneko koubou", "group:noraneko-no-tama", - "group:nori5rou", "group:norihee ginjou", "group:noritama-gozen", "group:norn", @@ -4175,6 +4219,7 @@ object Group : TagList { "group:omusubi koubou", "group:on my way", "group:on-show", + "group:onabe no naka.", "group:onaka suita domei", "group:onasuga 99-yen", "group:one dollar", @@ -4220,6 +4265,7 @@ object Group : TagList { "group:ororiya enpitsudo", "group:osanagokoro no kimi ni", "group:osaru-san panic", + "group:oshaburi tengoku", "group:oshigoto no jikan", "group:osouzaiya-san", "group:osova", @@ -4439,6 +4485,7 @@ object Group : TagList { "group:pockyfactory", "group:poco black", "group:poco poco", + "group:poino", "group:poisonblues", "group:poiyo dimension", "group:pokachutei", @@ -4464,6 +4511,7 @@ object Group : TagList { "group:poppin stompin", "group:popship", "group:popularplus", + "group:porcini", "group:porno maker", "group:potato house", "group:poteto dango", @@ -4544,7 +4592,6 @@ object Group : TagList { "group:rabbit kuukan", "group:rabbits", "group:rabitan", - "group:rabu.", "group:raccoondog", "group:radiant slash h plus", "group:radiostar", @@ -4797,6 +4844,7 @@ object Group : TagList { "group:sakura mangekyou", "group:sakura naomiki", "group:sakura nigou", + "group:sakura no tomoru hie", "group:sakura prin", "group:sakura zensen", "group:sakuradou", @@ -4827,6 +4875,7 @@ object Group : TagList { "group:sangenshokudou", "group:sanjuuhachi shiki kikanjuu", "group:sankaku apron", + "group:sankaku button", "group:sankaku doumei", "group:sankokudo", "group:sanma kizoku", @@ -5081,6 +5130,7 @@ object Group : TagList { "group:shonen gekikuukan", "group:shonnaka-dou", "group:shootouts", + "group:short kami", "group:shortcut koubou", "group:shosekido", "group:shouchuu mac", @@ -5110,6 +5160,7 @@ object Group : TagList { "group:shuryousha", "group:shuto reccara", "group:shuueisha", + "group:shuukyuu 8-ka", "group:shuukyuu itsukasei", "group:shuutaisei", "group:shyness over drive", @@ -5143,9 +5194,9 @@ object Group : TagList { "group:siop", "group:sioyaki", "group:sioyude", + "group:sirisiri denbu club", "group:sirius soft", "group:siro house", - "group:siropome", "group:sirouto plan", "group:sirubedou", "group:sisinabeya", @@ -5261,6 +5312,7 @@ object Group : TagList { "group:st. rio", "group:st. rororo", "group:staccato squirrel", + "group:stamina teishoku", "group:standard azarashi", "group:star link", "group:star-dreamer tei", @@ -5402,7 +5454,6 @@ object Group : TagList { "group:sushi-go-round", "group:suteinu nursery", "group:sutekiplan", - "group:suzuki masahisa", "group:suzuki shouten", "group:suzunaridou", "group:suzupony", @@ -5421,6 +5472,7 @@ object Group : TagList { "group:syamisen koubou", "group:synthetic garden", "group:syonen-kikakugai.", + "group:syounan rakujin society", "group:syounen heroine", "group:syounen kouraku", "group:syouseki kessyou", @@ -5474,6 +5526,7 @@ object Group : TagList { "group:takara no suzunari", "group:takashi-ya", "group:takayashiki kaihatsu", + "group:take4 project", "group:takeda syouten", "group:takegamiya", "group:takeshidou-chou", @@ -5494,6 +5547,7 @@ object Group : TagList { "group:tamatamasanmyaku", "group:tamokuteki hall", "group:tamokuteki kuukan", + "group:tanajou", "group:tanaka shouten", "group:tanaura honpo", "group:tanetsuke ichinengo", @@ -5526,6 +5580,7 @@ object Group : TagList { "group:team tanabe", "group:team z and 3n", "group:team zero", + "group:team4000", "group:tears of ymir", "group:teatime", "group:tecchitecchi", @@ -5534,9 +5589,11 @@ object Group : TagList { "group:tedaingu", "group:teddy-plaza", "group:teemonk", + "group:teiesuya", "group:teihatu syouzyo titai", "group:teikiatu de ikou", "group:teikoku club", + "group:tekirororock", "group:tekken neko gourmet", "group:tekoman-dou", "group:telomere limiter", @@ -5718,6 +5775,7 @@ object Group : TagList { "group:toumei tsuushin", "group:toushi ryoku kenkyuujo", "group:toutaku tuyagadou", + "group:touyou bujutsu gakkou", "group:touyu okiba kari", "group:touyu stand", "group:touzoku tachi no rakuda no mure", @@ -5918,6 +5976,7 @@ object Group : TagList { "group:usagi youjinbou", "group:usagijiru", "group:usagikoara", + "group:usaginoheya", "group:usagitei", "group:usako kf", "group:usamimi syndrome", @@ -5949,337 +6008,5 @@ object Group : TagList { "group:vagina dentata", "group:valiant", "group:valkyria", - "group:valkyrieharlem", - "group:vanilla fuumi shoujo", - "group:vanilla star", - "group:vanilla-dou max", - "group:variety pot", - "group:vashadow", - "group:vc productions", - "group:venom", - "group:veronica no ha", - "group:violence asia team", - "group:visual biscuits", - "group:vitamin gohan", - "group:vitamin soft", - "group:vitamin x", - "group:vivi-sectr", - "group:vivid color", - "group:vivid dot", - "group:vivido", - "group:viweb", - "group:voltcompany.", - "group:vpans extasy", - "group:vulcannu", - "group:w at nd", - "group:wabi sabi wasabi", - "group:wagamama dou", - "group:wakaba syokei", - "group:wakarase seisaku iinkai", - "group:wakatobi", - "group:wakusei-teki shukou", - "group:wakuwaku boycott", - "group:wakuwaku doubutsuen", - "group:walhalla illusion", - "group:wamusho", - "group:wanko-tei", - "group:wankyoku canvas", - "group:wanwandoh", - "group:warabimochi", - "group:waretama", - "group:warp loop", - "group:washikul.", - "group:washokudeniku.", - "group:wata 120 percent", - "group:wataame", - "group:watagashi maker", - "group:watanabe tou", - "group:wataru kuya", - "group:water ducts", - "group:waterfall", - "group:waterspoon", - "group:waterstudio", - "group:waterwheel", - "group:weather report", - "group:webstudioofflimits", - "group:wellca", - "group:wendybell", - "group:west vision", - "group:whirl-wind", - "group:white out", - "group:white plus dk", - "group:white rocket", - ) - - override fun getTags4() = listOf( - "group:whitecloth", - "group:whitesoft", - "group:whitewill", - "group:wi-fe hacker", - "group:wicked heart", - "group:wild goat", - "group:will tame", - "group:willow soft", - "group:wind mail", - "group:wind of the keep valley", - "group:windarteam", - "group:winger in mind", - "group:winghills", - "group:wish", - "group:wish kibou no tsubasa", - "group:witchflame", - "group:witching hour entertainment", - "group:wizard", - "group:wolf fang dou", - "group:wonderland 203", - "group:wope-retta", - "group:world of porncraft", - "group:world temperament", - "group:worstworks", - "group:wriggle souzeme tomonokai", - "group:x model", - "group:x-tei", - "group:xephs artwork", - "group:xl-toons", - "group:xx koubou", - "group:xxxxxxx", - "group:xyzyroh", - "group:y slash s slash k", - "group:y.d.l", - "group:y.m.sensha", - "group:yaboudo project", - "group:yabougumi", - "group:yabukaradou", - "group:yaburi dokoro", - "group:yadapot", - "group:yadokugaeru", - "group:yadoo van yahdoo", - "group:yagi q-syah", - "group:yago no ana", - "group:yajilshi plus", - "group:yajirushi key", - "group:yajiya", - "group:yakata", - "group:yakimisomura", - "group:yakinasu teishoku", - "group:yakiniku teishoku", - "group:yakisaketeishoku", - "group:yakisoba pants", - "group:yakisoba rengo", - "group:yakiubu", - "group:yakousei fan club", - "group:yaku 40 man sarad", - "group:yakumi sarai", - "group:yakusyo", - "group:yakutai", - "group:yam x 2 dai teikoku", - "group:yamada ichizoku.", - "group:yamadamaya", - "group:yamadaya", - "group:yamagiwa art cg studio", - "group:yamaguchirou", - "group:yamakawa denenhuukei", - "group:yamami no yado", - "group:yamamori gohan", - "group:yamanaka no naka", - "group:yamano murao", - "group:yami ni ugomeku", - "group:yamikumo tsuushin", - "group:yamotodou rakugakiichi", - "group:yanagiba dai", - "group:yanagisegawa", - "group:yanasegawabeya", - "group:yangyang nickbow", - "group:yanmarumaa", - "group:yaou keikaku", - "group:yaoyorozu-kobo", - "group:yaoyorozudo", - "group:yasai batake", - "group:yaseuma lo-ru", - "group:yashiya", - "group:yashock kaigi", - "group:yasrin-do", - "group:yasudajuku", - "group:yasuomi-craft", - "group:yasyokutei", - "group:yatuumi no kagami", - "group:yawaraka okashiya", - "group:yaya hinata-ya", - "group:yes sir.", - "group:yggdrasil", - "group:yo-metdo", - "group:yoban left", - "group:yobigakka", - "group:yohsyuan", - "group:yojouhan factory", - "group:yojouhan shobou", - "group:yojouhan toshi", - "group:yokan musume", - "group:yokazetei", - "group:yokohama zza koubou", - "group:yokoshimanchi.", - "group:yokoshimaya", - "group:yokoshoku ice", - "group:yomamagoto", - "group:yomosue doukoukai", - "group:yomothuhirasaka", - "group:yonatan black mutou", - "group:yonbangai garo", - "group:yonjuichi", - "group:yonmasuya", - "group:yonurime", - "group:yorando", - "group:yoru no benkyoukai", - "group:yoru no okazu shokudou", - "group:yoruyama no kyuukeijo", - "group:yoseatume tekina nanika", - "group:yoshida gorou shoukai", - "group:yoshiga dokoro", - "group:yoshii tech sha", - "group:yotukuro", - "group:you", - "group:you you tsuushin", - "group:you you you", - "group:youchi-na-ochakai", - "group:youen bijo no garou", - "group:youkai ankake", - "group:youkai tamanokoshi", - "group:youkandou", - "group:youki m.k.c.", - "group:youmusya", - "group:yours-wow", - "group:yousei allergen", - "group:youseimangasya", - "group:youtoujirushi", - "group:youtsuu transmitter", - "group:youyukai", - "group:yowatari kouba", - "group:yoyude ikemasu", - "group:yozorairodrops", - "group:ys company", - "group:yu-ta.18", - "group:yu-yu-tei", - "group:yuasa rengou", - "group:yubidou", - "group:yudenakya nama-beer", - "group:yudokuya", - "group:yuhshiki", - "group:yukagenikaga", - "group:yukeyuke ryuseigo", - "group:yuki daruma koujou", - "group:yuki no iori", - "group:yukijirushi nyuugyou", - "group:yukikagerou", - "group:yukimi honpo", - "group:yukimura", - "group:yukinko okeya", - "group:yukino koubou", - "group:yukirinrin", - "group:yukyu-kyuka", - "group:yume bouei shoujo tai", - "group:yume yori suteki na", - "group:yume-zakura", - "group:yumeiro-goromo", - "group:yumeizukosya", - "group:yumemigachi campus", - "group:yumemigokoti", - "group:yumemiru-kikai", - "group:yumenamakon", - "group:yumenokage", - "group:yumeoikyounouta", - "group:yumeoukoku", - "group:yunabon", - "group:yurayuraseyuura", - "group:yureika blade", - "group:yuri dokidoki", - "group:yuri equal 18l", - "group:yuriai kojinshi kai", - "group:yurinyurin", - "group:yuriru-rarika", - "group:yurumebox", - "group:yuruyakatou", - "group:yuruyuru seisakusho", - "group:yusuzumi", - "group:yuu adashino suisan", - "group:yuu heya", - "group:yuubin basha", - "group:yuudachitei", - "group:yuuendou", - "group:yuugai tosho kikaku", - "group:yuugen kaisha sokuhou seisakusho", - "group:yuugensangyou sukimakaze", - "group:yuugure koubou", - "group:yuuhodou", - "group:yuujikouji", - "group:yuukakumin", - "group:yuuki kagoubutsu", - "group:yuukyuu shinden", - "group:yuukyuu suisenkan", - "group:yuunagi gaibutai", - "group:yuuriko", - "group:yuusha kandenchi", - "group:yuutopia", - "group:yuuya-yuu", - "group:yuyake box", - "group:yuzu soft", - "group:yuzucha", - "group:yuzuen", - "group:yuzumomo jam", - "group:yuzuonsen", - "group:yuzuponz", - "group:yuzurihaya", - "group:z", - "group:z-tabukuroneko house", - "group:z-vector", - "group:za da carjya", - "group:zakkin kougyou", - "group:zan-sei", - "group:zankirow", - "group:zankoku doumei", - "group:zankoku na kami ga shihai suru", - "group:zantetuken", - "group:zasshu-ken", - "group:zassoubatake", - "group:zassoya", - "group:zatouichi", - "group:zatuyou gakari", - "group:zawameki jambo", - "group:zeiniku shoujotai", - "group:zenmai koubou", - "group:zenmai kourogi", - "group:zennihon do-m jitsuryoku kentei kousa", - "group:zenoside", - "group:zenra restaurant", - "group:zensekai yakenohara doumei", - "group:zenshuu bougyo", - "group:zensoku zenkai.", - "group:zensun habaku", - "group:zenzidou kosyubenjo", - "group:zero byte", - "group:zero equals mono", - "group:zero ni kaeru tsuki", - "group:zero-one", - "group:zero-sen", - "group:zero-xx", - "group:zerocool", - "group:zeroinfinityone", - "group:zeryishi", - "group:zettai shoujo", - "group:zettaitensei", - "group:zgf", - "group:zi", - "group:zion", - "group:zmey no soukutsu", - "group:zokubutsu.zip", - "group:zombie to yukaina nakamatachi", - "group:zonzon sharp 4", - "group:zooerastia", - "group:zouri no sato", - "group:zozalist", - "group:zugaikotsu marudashi", - "group:zvizva-dan", - "group:zydan", - "group:zyulokuya", - "group:zzz comics", ) } diff --git a/app/src/main/java/exh/eh/tags/Group2.kt b/app/src/main/java/exh/eh/tags/Group2.kt new file mode 100644 index 000000000..92728c5d8 --- /dev/null +++ b/app/src/main/java/exh/eh/tags/Group2.kt @@ -0,0 +1,342 @@ +package exh.eh.tags + +object Group2 : TagList { + override fun getTags1(): List = listOf( + "group:valkyrieharlem", + "group:vanilla fuumi shoujo", + "group:vanilla star", + "group:vanilla-dou max", + "group:variety pot", + "group:vashadow", + "group:vc productions", + "group:venom", + "group:veronica no ha", + "group:violence asia team", + "group:visual biscuits", + "group:vitamin gohan", + "group:vitamin soft", + "group:vitamin x", + "group:vivi-sectr", + "group:vivid color", + "group:vivid dot", + "group:vivido", + "group:viweb", + "group:voltcompany.", + "group:vpans extasy", + "group:vulcannu", + "group:w at nd", + "group:wabi sabi wasabi", + "group:wagamama dou", + "group:wakaba syokei", + "group:wakarase seisaku iinkai", + "group:wakatobi", + "group:wakusei-teki shukou", + "group:wakuwaku boycott", + "group:wakuwaku doubutsuen", + "group:walhalla illusion", + "group:wamusho", + "group:wanko-tei", + "group:wankyoku canvas", + "group:wanwandoh", + "group:warabimochi", + "group:waretama", + "group:warp loop", + "group:wasa wasa", + "group:washikul.", + "group:washokudeniku.", + "group:wata 120 percent", + "group:wataame", + "group:watagashi maker", + "group:watanabe tou", + "group:wataru kuya", + "group:water ducts", + "group:waterfall", + "group:waterspoon", + "group:waterstudio", + "group:waterwheel", + "group:weather report", + "group:webstudioofflimits", + "group:wellca", + "group:wendybell", + "group:west vision", + "group:whirl-wind", + "group:white out", + "group:white plus dk", + "group:white rocket", + "group:whitecloth", + "group:whitesoft", + "group:whitewill", + "group:wi-fe hacker", + "group:wicked heart", + "group:wild goat", + "group:will tame", + "group:willow soft", + "group:wind mail", + "group:wind of the keep valley", + "group:windarteam", + "group:winger in mind", + "group:winghills", + "group:wish", + "group:wish kibou no tsubasa", + "group:witchflame", + "group:witching hour entertainment", + "group:wizard", + "group:wolf fang dou", + "group:wonderland 203", + "group:wope-retta", + "group:world of porncraft", + "group:world temperament", + "group:worstworks", + "group:wriggle souzeme tomonokai", + "group:x model", + "group:x-tei", + "group:xephs artwork", + "group:xl-toons", + "group:xx koubou", + "group:xxxxxxx", + "group:xyzyroh", + "group:y slash s slash k", + "group:y.d.l", + "group:y.m.sensha", + "group:yaboudo project", + "group:yabougumi", + "group:yabukaradou", + "group:yaburi dokoro", + "group:yadapot", + "group:yadokugaeru", + "group:yadoo van yahdoo", + "group:yagi q-syah", + "group:yago no ana", + "group:yajilshi plus", + "group:yajirushi key", + "group:yajiya", + "group:yakata", + "group:yakimisomura", + "group:yakinasu teishoku", + "group:yakiniku teishoku", + "group:yakisaketeishoku", + "group:yakisoba pants", + "group:yakisoba rengo", + "group:yakiubu", + "group:yakousei fan club", + "group:yaku 40 man sarad", + "group:yakumi sarai", + "group:yakusyo", + "group:yakutai", + "group:yam x 2 dai teikoku", + "group:yamada ichizoku.", + "group:yamadamaya", + "group:yamadaya", + "group:yamagiwa art cg studio", + "group:yamaguchirou", + "group:yamakawa denenhuukei", + "group:yamami no yado", + "group:yamamori gohan", + "group:yamanaka no naka", + "group:yamano murao", + "group:yamato nadeshiko club", + "group:yami ni ugomeku", + "group:yamikumo tsuushin", + "group:yamotodou rakugakiichi", + "group:yanagiba dai", + "group:yanagisegawa", + "group:yanasegawabeya", + "group:yangyang nickbow", + "group:yanmarumaa", + "group:yaou keikaku", + "group:yaoyorozu-kobo", + "group:yaoyorozudo", + "group:yasai batake", + "group:yaseuma lo-ru", + "group:yashiya", + "group:yashock kaigi", + "group:yasrin-do", + "group:yasudajuku", + "group:yasuomi-craft", + "group:yasyokutei", + "group:yatomomin", + "group:yatuumi no kagami", + "group:yawaraka okashiya", + "group:yaya hinata-ya", + "group:yes sir.", + "group:yggdrasil", + "group:yo-metdo", + "group:yoban left", + "group:yobigakka", + "group:yohsyuan", + "group:yojouhan factory", + "group:yojouhan shobou", + "group:yojouhan toshi", + "group:yokan musume", + "group:yokazetei", + "group:yokohama zza koubou", + "group:yokoshimanchi.", + "group:yokoshimaya", + "group:yokoshoku ice", + "group:yoku mireba beta", + "group:yomamagoto", + "group:yomosue doukoukai", + "group:yomothuhirasaka", + "group:yonatan black mutou", + "group:yonbangai garo", + "group:yonjuichi", + "group:yonmasuya", + "group:yonurime", + "group:yorando", + "group:yoru no benkyoukai", + "group:yoru no okazu shokudou", + "group:yoruyama no kyuukeijo", + "group:yoseatume tekina nanika", + "group:yoshida gorou shoukai", + "group:yoshiga dokoro", + "group:yoshii tech sha", + "group:yotukuro", + "group:you", + "group:you you tsuushin", + "group:you you you", + "group:youchi-na-ochakai", + "group:youen bijo no garou", + "group:yougensya", + "group:youkai ankake", + "group:youkai tamanokoshi", + "group:youkandou", + "group:youki m.k.c.", + "group:youmusya", + "group:yours-wow", + "group:yousei allergen", + "group:youseimangasya", + "group:youtoujirushi", + "group:youtsuu transmitter", + "group:youyukai", + "group:yowatari kouba", + "group:yoyude ikemasu", + "group:yozorairodrops", + "group:ys company", + "group:yu-ta.18", + "group:yu-yu-tei", + "group:yuasa rengou", + "group:yubidou", + "group:yudenakya nama-beer", + "group:yudokuya", + "group:yuhshiki", + "group:yukagenikaga", + "group:yukan high zakura", + "group:yukeyuke ryuseigo", + "group:yuki daruma koujou", + "group:yuki no iori", + "group:yukijirushi nyuugyou", + "group:yukikagerou", + "group:yukimi honpo", + "group:yukimura", + "group:yukinko okeya", + "group:yukino koubou", + "group:yukirinrin", + "group:yukyu-kyuka", + "group:yume bouei shoujo tai", + "group:yume yori suteki na", + "group:yume-zakura", + "group:yumeiro-goromo", + "group:yumeizukosya", + "group:yumemigachi campus", + "group:yumemigokoti", + "group:yumemiru-kikai", + "group:yumenamakon", + "group:yumenokage", + "group:yumeoikyounouta", + "group:yumeoukoku", + "group:yunabon", + "group:yurayuraseyuura", + "group:yureika blade", + "group:yuri dokidoki", + "group:yuri equal 18l", + "group:yuriai kojinshi kai", + "group:yurinyurin", + "group:yuriru-rarika", + "group:yurumebox", + "group:yuruyakatou", + "group:yuruyuru seisakusho", + "group:yusuzumi", + "group:yuu adashino suisan", + "group:yuu heya", + "group:yuubin basha", + "group:yuudachitei", + "group:yuuendou", + "group:yuugai tosho kikaku", + "group:yuugen kaisha sokuhou seisakusho", + "group:yuugensangyou sukimakaze", + "group:yuugure koubou", + "group:yuuhodou", + "group:yuujikouji", + "group:yuukakumin", + "group:yuuki kagoubutsu", + "group:yuukyuu shinden", + "group:yuukyuu suisenkan", + "group:yuunagi gaibutai", + "group:yuuriko", + "group:yuusha kandenchi", + "group:yuutopia", + "group:yuuya-yuu", + "group:yuyake box", + "group:yuzu soft", + "group:yuzucha", + "group:yuzuen", + "group:yuzumomo jam", + "group:yuzuonsen", + "group:yuzuponz", + "group:yuzurihaya", + "group:z", + "group:z-tabukuroneko house", + "group:z-vector", + "group:za da carjya", + "group:zakkin kougyou", + "group:zan-sei", + "group:zankirow", + "group:zankoku doumei", + "group:zankoku na kami ga shihai suru", + "group:zantetuken", + "group:zasshu-ken", + "group:zassoubatake", + "group:zassoya", + "group:zatouichi", + "group:zatuyou gakari", + "group:zawameki jambo", + "group:zeiniku shoujotai", + "group:zenmai koubou", + "group:zenmai kourogi", + "group:zennihon do-m jitsuryoku kentei kousa", + "group:zenoside", + "group:zenra restaurant", + "group:zenryoku sissou cat", + "group:zensekai yakenohara doumei", + "group:zenshuu bougyo", + "group:zensoku zenkai.", + "group:zensun habaku", + "group:zenzidou kosyubenjo", + "group:zero byte", + "group:zero equals mono", + "group:zero ni kaeru tsuki", + "group:zero-one", + "group:zero-sen", + "group:zero-xx", + "group:zerocool", + "group:zeroinfinityone", + "group:zeryishi", + "group:zettai shoujo", + "group:zettaitensei", + "group:zgf", + "group:zi", + "group:zion", + "group:zmey no soukutsu", + "group:zokubutsu.zip", + "group:zombie to yukaina nakamatachi", + "group:zonzon sharp 4", + "group:zooerastia", + "group:zouri no sato", + "group:zozalist", + "group:zugaikotsu marudashi", + "group:zvizva-dan", + "group:zydan", + "group:zyulokuya", + "group:zzz comics", + ) +} diff --git a/app/src/main/java/exh/eh/tags/Language.kt b/app/src/main/java/exh/eh/tags/Language.kt index cb1b96998..c2c0bbf45 100644 --- a/app/src/main/java/exh/eh/tags/Language.kt +++ b/app/src/main/java/exh/eh/tags/Language.kt @@ -1,7 +1,7 @@ package exh.eh.tags object Language : TagList { - override fun getTags1() = listOf( + override fun getTags1(): List = listOf( "language:arabic", "language:bulgarian", "language:catalan", diff --git a/app/src/main/java/exh/eh/tags/Male.kt b/app/src/main/java/exh/eh/tags/Male.kt index 7d365b5f1..ce3a1ff5e 100644 --- a/app/src/main/java/exh/eh/tags/Male.kt +++ b/app/src/main/java/exh/eh/tags/Male.kt @@ -1,28 +1,39 @@ package exh.eh.tags object Male : TagList { - - override fun getTags1() = listOf( + override fun getTags1(): List = listOf( "male:abortion", "male:absorption", + "male:adventitious penis", + "male:afro", "male:age progression", "male:age regression", "male:ahegao", + "male:albino", "male:alien", + "male:all the way through", "male:amputee", "male:anal", "male:anal birth", "male:anal intercourse", "male:anal prolapse", + "male:analphagia", "male:angel", + "male:animal on animal", "male:animal on furry", "male:animegao", + "male:anorexic", "male:apparel bukkake", "male:apron", "male:armpit licking", + "male:armpit sex", "male:asphyxiation", + "male:ass expansion", + "male:assjob", + "male:autofellatio", "male:bald", "male:ball sucking", + "male:balljob", "male:balls expansion", "male:bandages", "male:bat boy", @@ -30,10 +41,14 @@ object Male : TagList { "male:bdsm", "male:bear", "male:bear boy", + "male:beauty mark", "male:bestiality", + "male:big areolae", "male:big ass", "male:big balls", "male:big breasts", + "male:big lips", + "male:big muscles", "male:big nipples", "male:big penis", "male:bike shorts", @@ -47,12 +62,16 @@ object Male : TagList { "male:bloomers", "male:blowjob", "male:blowjob face", + "male:body modification", "male:body painting", "male:body swap", "male:body writing", "male:bodystocking", "male:bodysuit", "male:bondage", + "male:braces", + "male:brain fuck", + "male:breast expansion", "male:breast feeding", "male:bride", "male:brother", @@ -62,11 +81,13 @@ object Male : TagList { "male:burping", "male:business suit", "male:butler", + "male:camel", "male:cannibalism", "male:cashier", "male:cat", "male:catboy", "male:cbt", + "male:centaur", "male:cervix prolapse", "male:chastity belt", "male:cheating", @@ -75,13 +96,20 @@ object Male : TagList { "male:chinese dress", "male:chloroform", "male:christmas", + "male:clamp", + "male:clit insertion", "male:clit stimulation", "male:clone", + "male:closed eyes", "male:clothed female nude male", + "male:clown", "male:coach", "male:cock ring", + "male:cockphagia", + "male:cockslapping", "male:collar", "male:condom", + "male:conjoined", "male:coprophagia", "male:corruption", "male:corset", @@ -90,25 +118,39 @@ object Male : TagList { "male:cowman", "male:crab", "male:crossdressing", + "male:crotch tattoo", "male:crown", + "male:crying", + "male:cum bath", + "male:cumflation", + "male:cunnilingus", "male:cuntboy", "male:dark nipples", "male:dark sclera", "male:dark skin", "male:deepthroat", "male:deer", + "male:deer boy", "male:demon", + "male:denki anma", + "male:detached sleeves", + "male:diaper", "male:dick growth", "male:dickgirl on male", + "male:dicknipples", "male:dilf", "male:dinosaur", "male:dog", "male:dog boy", + "male:doll joints", + "male:dolphin", + "male:domination loss", "male:donkey", "male:double anal", "male:double blowjob", "male:double penetration", "male:dougi", + "male:draenei", "male:dragon", "male:drill hair", "male:drugs", @@ -126,6 +168,7 @@ object Male : TagList { "male:eye-covering bang", "male:eyemask", "male:eyepatch", + "male:facesitting", "male:facial hair", "male:fairy", "male:farting", @@ -138,8 +181,10 @@ object Male : TagList { "male:fisting", "male:focus paizuri", "male:food on body", + "male:foot insertion", "male:foot licking", "male:footjob", + "male:forced exposure", "male:forniphilia", "male:fox", "male:fox boy", @@ -156,8 +201,13 @@ object Male : TagList { "male:gender morph", "male:ghost", "male:giant", + "male:giant sperm", + "male:gijinka", + "male:giraffe boy", "male:glasses", "male:glory hole", + "male:gloves", + "male:goat", "male:goblin", "male:gokkun", "male:gorilla", @@ -169,42 +219,63 @@ object Male : TagList { "male:gyaru-oh", "male:gymshorts", "male:hair buns", + "male:hairjob", "male:hairy", + "male:hairy armpits", "male:handjob", + "male:hanging", "male:harem", "male:harpy", "male:headphones", + "male:heterochromia", + "male:hijab", + "male:hood", "male:horns", "male:horse", "male:horse boy", "male:horse cock", "male:hotpants", + "male:huge penis", "male:human on furry", "male:humiliation", + "male:hyena boy", "male:impregnation", "male:incest", "male:infantilism", "male:inflation", "male:insect", "male:insect boy", + "male:internal urination", + "male:inverted nipples", "male:invisible", "male:josou seme", + "male:kangaroo", + "male:kappa", "male:kemonomimi", "male:kigurumi pajama", "male:kimono", + "male:kindergarten uniform", "male:kissing", + "male:kunoichi", "male:lab coat", + "male:lactation", "male:large insertions", "male:large tattoo", "male:latex", "male:layer cake", + "male:leash", + "male:leg lock", "male:leotard", "male:lingerie", "male:lion", + "male:living clothes", "male:lizard guy", "male:long tongue", "male:low bestiality", + "male:low guro", + "male:low scat", "male:low shotacon", + "male:low smegma", "male:machine", "male:maggot", "male:magical girl", @@ -213,33 +284,46 @@ object Male : TagList { "male:males only", "male:masked face", "male:masturbation", + "male:mecha boy", "male:merman", "male:mesuiki", "male:metal armor", "male:midget", "male:miko", "male:military", + "male:milking", "male:mind break", "male:mind control", "male:miniguy", "male:minotaur", + "male:mmm threesome", "male:monkey", "male:monkey boy", + "male:monoeye", "male:monster", "male:moral degeneration", "male:mouse", "male:mouse boy", + "male:mouth mask", + "male:multimouth blowjob", + "male:multiple arms", "male:multiple assjob", "male:multiple footjob", "male:multiple handjob", "male:multiple orgasms", "male:multiple penises", + "male:multiple straddling", "male:muscle", + "male:muscle growth", "male:nakadashi", + "male:navel fuck", + "male:nazi", "male:necrophilia", "male:netorare", "male:ninja", "male:nipple birth", + "male:nipple fuck", + "male:nipple stimulation", "male:nose fuck", "male:nose hook", "male:nun", @@ -248,94 +332,131 @@ object Male : TagList { "male:oil", "male:old man", "male:onahole", + "male:oni", "male:orc", "male:orgasm denial", + "male:ostrich", "male:otokofutanari", + "male:otter boy", + "male:oyakodon", "male:paizuri", + "male:panda boy", "male:panther", "male:pantyhose", + "male:pantyjob", + "male:parasite", "male:pasties", + "male:pegasus", "male:pegging", "male:penis birth", + "male:personality excretion", "male:petplay", + "male:petrification", "male:phimosis", "male:piercing", "male:pig", "male:pig man", "male:pillory", + "male:pirate", "male:piss drinking", + "male:pixie cut", "male:plant boy", "male:pole dancing", "male:policeman", + "male:ponytail", "male:possession", "male:pregnant", + "male:prehensile hair", "male:priest", "male:prolapse", "male:prostate massage", "male:prostitution", "male:pubic stubble", "male:public use", + "male:pussyboys only", "male:rabbit", + "male:raccoon boy", "male:randoseru", "male:rape", "male:reptile", + "male:retractable penis", "male:rhinoceros", "male:rimjob", "male:robot", "male:ryona", + "male:saliva", "male:scar", "male:scat", "male:school gym uniform", "male:school swimsuit", "male:schoolboy uniform", "male:schoolgirl uniform", + "male:scrotal lingerie", "male:selfcest", "male:sex toys", "male:shared senses", "male:shark", "male:shark boy", + "male:shaved head", "male:sheep", "male:sheep boy", "male:shibari", + "male:shimaidon", "male:shimapan", "male:shotacon", "male:shrinking", "male:skinsuit", + "male:skunk boy", "male:slave", "male:sleeping", "male:slime", "male:slime boy", "male:slug", "male:small penis", + "male:smalldom", "male:smegma", "male:smell", "male:smoking", "male:snake", "male:snake boy", "male:snuff", + "male:sockjob", "male:sole male", + "male:sole pussyboy", "male:solo action", "male:spanking", "male:speculum", "male:spider", + "male:spider boy", "male:squid boy", + "male:squirrel boy", + "male:ssbbm", + "male:steward", "male:stewardess", + "male:stirrup legwear", "male:stockings", "male:stomach deformation", + "male:straitjacket", + "male:strap-on", "male:stretching", "male:stuck in wall", + "male:sumata", "male:sundress", "male:sunglasses", "male:sweating", "male:swimsuit", "male:swinging", "male:syringe", + "male:table masturbation", "male:tail", "male:tail plug", + "male:tailjob", + "male:tailphagia", "male:tall man", "male:tanlines", "male:teacher", "male:tentacles", + "male:thick eyebrows", "male:thigh high boots", "male:tiara", "male:tickling", @@ -348,16 +469,23 @@ object Male : TagList { "male:tracksuit", "male:trampling", "male:transformation", + "male:triple anal", + "male:triple penetration", "male:tube", "male:turtle", "male:tutor", "male:twins", + "male:twintails", "male:unbirth", "male:uncle", + "male:underwater", "male:unicorn", + "male:unusual insertions", "male:unusual pupils", + "male:unusual teeth", "male:urethra insertion", "male:urination", + "male:vacbed", "male:vampire", "male:very long hair", "male:virginity", @@ -366,6 +494,9 @@ object Male : TagList { "male:voyeurism", "male:waiter", "male:waitress", + "male:weight gain", + "male:wet clothes", + "male:whale", "male:whip", "male:wings", "male:witch", @@ -374,8 +505,11 @@ object Male : TagList { "male:wooden horse", "male:worm", "male:wormhole", + "male:wrestling", "male:x-ray", "male:yandere", "male:yaoi", + "male:zebra", + "male:zombie", ) } diff --git a/app/src/main/java/exh/eh/tags/Mixed.kt b/app/src/main/java/exh/eh/tags/Mixed.kt index 47e670a6c..01911e33d 100644 --- a/app/src/main/java/exh/eh/tags/Mixed.kt +++ b/app/src/main/java/exh/eh/tags/Mixed.kt @@ -1,8 +1,7 @@ package exh.eh.tags object Mixed : TagList { - - override fun getTags1() = listOf( + override fun getTags1(): List = listOf( "mixed:animal on animal", "mixed:body swap", "mixed:ffm threesome", @@ -16,6 +15,7 @@ object Mixed : TagList { "mixed:multiple assjob", "mixed:multiple footjob", "mixed:multiple handjob", + "mixed:nudism", "mixed:oyakodon", "mixed:shimaidon", "mixed:ttm threesome", diff --git a/app/src/main/java/exh/eh/tags/Other.kt b/app/src/main/java/exh/eh/tags/Other.kt index 2edbd2f67..a4b188d8a 100644 --- a/app/src/main/java/exh/eh/tags/Other.kt +++ b/app/src/main/java/exh/eh/tags/Other.kt @@ -1,9 +1,9 @@ package exh.eh.tags object Other : TagList { - - override fun getTags1() = listOf( + override fun getTags1(): List = listOf( "other:3d", + "other:3d imageset", "other:already uploaded", "other:anaglyph", "other:animated", @@ -13,10 +13,12 @@ object Other : TagList { "other:comic", "other:compilation", "other:dakimakura", + "other:defaced", "other:figure", "other:forbidden content", "other:full censorship", "other:full color", + "other:game manual", "other:game sprite", "other:goudoushi", "other:hardcore", @@ -33,10 +35,10 @@ object Other : TagList { "other:nudity only", "other:out of order", "other:paperchild", - "other:poor grammar", "other:realporn", "other:redraw", "other:replaced", + "other:rough grammar", "other:rough translation", "other:sample", "other:scanmark", diff --git a/app/src/main/java/exh/eh/tags/Parody.kt b/app/src/main/java/exh/eh/tags/Parody.kt index aca54d1c2..6eb224dfd 100644 --- a/app/src/main/java/exh/eh/tags/Parody.kt +++ b/app/src/main/java/exh/eh/tags/Parody.kt @@ -1,7 +1,7 @@ package exh.eh.tags object Parody : TagList { - override fun getTags1() = listOf( + override fun getTags1(): List = listOf( "parody:.hack", "parody:.hackg.u.", "parody:.hacklegend of the twilight", @@ -31,6 +31,7 @@ object Parody : TagList { "parody:a town where you live", "parody:a vampyre story", "parody:a.d.police", + "parody:a.i. ga tomaranai", "parody:abenobashi mahou shoutengai", "parody:acca 13-ku kansatsu-ka", "parody:accel world", @@ -66,8 +67,10 @@ object Parody : TagList { "parody:akira", "parody:aku no musume", "parody:aku no onna kanbu", + "parody:akuma no memumemu-chan", "parody:akuyaku reijou nanode last boss o kattemimashita", "parody:aladdin", + "parody:albatross koukairoku", "parody:aldnoah.zero", "parody:alice gear aegis", "parody:alice in wonderland", @@ -124,6 +127,7 @@ object Parody : TagList { "parody:ar nosurge", "parody:ar tonelico", "parody:ar tonelico qoga", + "parody:araburu kisetsu no otome-domo yo", "parody:araiguma rascal", "parody:arasaa mama no watashi de ii no", "parody:arcana famiglia", @@ -194,6 +198,7 @@ object Parody : TagList { "parody:backbeard-sama ga miteru", "parody:bagi the monster of mighty nature", "parody:baka to test to shoukanjuu", + "parody:bakemono no ko", "parody:bakemonogatari", "parody:bakuen campus guardress", "parody:bakugan", @@ -206,6 +211,7 @@ object Parody : TagList { "parody:ballroom e youkoso", "parody:bamboo blade", "parody:band yarouze", + "parody:banished from the heros party i decided to live a quiet life in the countryside", "parody:banjo-kazooie", "parody:banner of the stars", "parody:baribari densetsu", @@ -271,6 +277,7 @@ object Parody : TagList { "parody:bloodstained", "parody:bloody roar", "parody:blue dragon", + "parody:blue skin no mori", "parody:blue spring ride", "parody:blue submarine no. 6", "parody:bna brand new animal", @@ -355,6 +362,7 @@ object Parody : TagList { "parody:childs play", "parody:chio-chan no tsuugakuro", "parody:chip n dale rescue rangers", + "parody:cho aniki", "parody:chobits", "parody:chogattai majutsu robot ginguiser", "parody:chokotto sister", @@ -428,6 +436,7 @@ object Parody : TagList { "parody:daiakuji", "parody:daibanchou -big bang age-", "parody:daicon", + "parody:daihanjou manpuku marche", "parody:daikoukai jidai", "parody:daisenryaku", "parody:daiya no ace", @@ -440,6 +449,7 @@ object Parody : TagList { "parody:dantalian no shoka", "parody:daphne in the brilliant blue", "parody:dark chronicle", + "parody:dark messiah", "parody:dark water", "parody:darker than black", "parody:darkstalkers", @@ -457,6 +467,7 @@ object Parody : TagList { "parody:defenders", "parody:defense devil", "parody:defense of the ancients", + "parody:delicious party precure", "parody:demento", "parody:demi-chan wa kataritai", "parody:demonbane", @@ -480,6 +491,7 @@ object Parody : TagList { "parody:devil may cry", "parody:devil summoner soul hackers", "parody:devil survivor", + "parody:devilman lady", "parody:dexters laboratory", "parody:di gi charat", "parody:diablo", @@ -550,6 +562,7 @@ object Parody : TagList { "parody:dragonaut", "parody:dragonica", "parody:dragons crown", + "parody:dragons raiden", "parody:drakengard", "parody:drawn together", "parody:dream c club", @@ -619,6 +632,7 @@ object Parody : TagList { "parody:family project", "parody:fancy lala", "parody:fantastic four", + "parody:fantasy bishoujo juniku ojisan to", "parody:fantasy earth zero", "parody:far east of eden kabuki klash", "parody:fatal frame", @@ -706,6 +720,7 @@ object Parody : TagList { "parody:fushigi no umi no nadia", "parody:fushigi yuugi", "parody:fushigiboshi no futagohime", + "parody:futaba channel", "parody:futakoi", "parody:futari ecchi", "parody:futari wa precure splash star", @@ -723,6 +738,7 @@ object Parody : TagList { "parody:ga-rei", "parody:gad guard", "parody:gaiking", + "parody:gaikotsu kishi-sama tadaima isekai e odekakechuu", "parody:gakkou gurashi", "parody:gakkou no kaidan", "parody:gakuen alice", @@ -733,6 +749,7 @@ object Parody : TagList { "parody:galaxy cyclone braiger", "parody:galaxy express 999", "parody:galaxy fraulein yuna", + "parody:galleria no chika meikyuu to majo no ryodan", "parody:gan kon", "parody:ganbare goemon", "parody:gangsta.", @@ -753,6 +770,7 @@ object Parody : TagList { "parody:gen 13", "parody:gen colon lock", "parody:genji tsuushin agedama", + "parody:genkai tokki monster monpiece", "parody:genmu no tou to tsurugi no okite", "parody:genmu senki leda", "parody:genroh", @@ -824,6 +842,7 @@ object Parody : TagList { "parody:gundam 00", "parody:gundam 0083", "parody:gundam age", + "parody:gundam breaker mobile", "parody:gundam build fighters", "parody:gundam g no reconguista", "parody:gundam seed", @@ -856,6 +875,7 @@ object Parody : TagList { "parody:hakumei to mikochi", "parody:hakuouki", "parody:hakushaku to yousei", + "parody:hakushon daimaou", "parody:half-life", "parody:halo", "parody:hamtaro", @@ -906,8 +926,10 @@ object Parody : TagList { "parody:highschool dxd", "parody:highschool of the dead", "parody:higurashi no naku koro ni", + "parody:higyaku no noel", "parody:hikarian", "parody:hikaru no go", + "parody:hikounin sentai akibaranger", "parody:hime chen otogi chikku idol lilpri", "parody:hime kishi lilia", "parody:hime-chans ribbon", @@ -918,6 +940,7 @@ object Parody : TagList { "parody:history kikan", "parody:historys strongest disciple kenichi", "parody:hitomi no karte", + "parody:hitomi-chan wa hitomishiri", "parody:hitomi-sensei no hokenshitsu", "parody:hitori bocchi no marumaru seikatsu", "parody:hitsugi katsugi no kuro.", @@ -978,6 +1001,7 @@ object Parody : TagList { "parody:ikoku meiro no croisee", "parody:imouto sae ireba ii.", "parody:in search of the lost future", + "parody:inaka ni kaeru to yakeni natsuita kasshoku ponytail shota ga iru", "parody:inazuma eleven", "parody:inazuman", "parody:inda no himekishi janne", @@ -998,6 +1022,7 @@ object Parody : TagList { "parody:is", "parody:isekai izakaya nobu", "parody:isekai maou to shoukan shoujo no dorei majutsu", + "parody:isekai meikyuu de harem o", "parody:isekai no seikishi monogatari", "parody:isekai shokudou", "parody:isekai wa smartphone to tomo ni.", @@ -1007,6 +1032,7 @@ object Parody : TagList { "parody:its not my fault that im not popular", "parody:iwa kakeru", "parody:ixion saga dt", + "parody:iya na kao sare nagara opantsu misete moraitai", "parody:izuna legend of the unemployed ninja", "parody:jackie chan adventures", "parody:jaja uma grooming up", @@ -1035,9 +1061,11 @@ object Parody : TagList { "parody:johnny bravo", "parody:johnny test", "parody:jojos bizarre adventure", + "parody:joshikousei girls high", "parody:joshikousei no mudazukai", "parody:joukamachi no dandelion", "parody:jouki toshi no tantei shoujo", + "parody:ju-on", "parody:jubei-chan", "parody:jumping rabbit", "parody:jungle de ikou", @@ -1060,11 +1088,13 @@ object Parody : TagList { "parody:k.o. beast", "parody:kaerunyo panyorn", "parody:kage no densetsu", + "parody:kageki shojo", "parody:kagihime monogatari eikyuu alice rondo", "parody:kaguya-sama wa kokurasetai", "parody:kaichou wa maid-sama", "parody:kaifuku jutsushi no yarinaoshi", "parody:kaiji", + "parody:kaijin kaihatsubu no kuroitsu-san", "parody:kaiketsu zorro", "parody:kaitou tenshi twin angel", "parody:kaizoku sentai gokaiger", @@ -1080,6 +1110,7 @@ object Parody : TagList { "parody:kami-tachi ni hirowareta otoko", "parody:kamikaze kaitou jeanne", "parody:kamisama dolls", + "parody:kamisama hajimemashita", "parody:kamisama minarai himitsu no cocotama", "parody:kamisama ni natta hi", "parody:kampfer", @@ -1103,6 +1134,7 @@ object Parody : TagList { "parody:katekyo hitman reborn", "parody:katsute mahou shoujo to aku wa tekitai shite ita.", "parody:katte ni kaizou", + "parody:kawaii dake ja nai shikimori-san", "parody:kawaikereba hentai demo suki ni natte kuremasu ka", "parody:kaze no na wa amnesia", "parody:kaze no yojimbo", @@ -1113,6 +1145,7 @@ object Parody : TagList { "parody:kemeko deluxe", "parody:kemono friends", "parody:kemono jihen", + "parody:kenja no deshi o nanoru kenja", "parody:kenja no mago", "parody:kenka banchou otome", "parody:kenkou zenrakei suieibu umishou", @@ -1146,6 +1179,7 @@ object Parody : TagList { "parody:kingdom hearts", "parody:kinnikuman", "parody:kino no tabi", + "parody:kinsou no vermeil", "parody:kira kira", "parody:kirakira precure a la mode", "parody:kirarin revolution", @@ -1173,6 +1207,7 @@ object Parody : TagList { "parody:komi-san wa komyushou desu.", "parody:konjiki no word master", "parody:kono aozora ni yakusoku o", + "parody:kono healer mendokusai", "parody:kono oto tomare", "parody:kono subarashii sekai ni syukufuku o", "parody:konto koroshiya 1989", @@ -1216,9 +1251,11 @@ object Parody : TagList { "parody:kyoukai no rinne", "parody:kyoukai senjou no horizon", "parody:kyouryuu wakusei", + "parody:kyuuketsuki sugu shinu", "parody:kyuukyoku choujin r", "parody:kyuukyoku hentai kamen", "parody:kyuukyoku shinka shita full dive rpg ga genjitsu yori mo kusogee dattara", + "parody:kyuukyuu sentai gogofive", "parody:kyuushu sentai danjija", "parody:la corda doro", "parody:la pucelle", @@ -1232,6 +1269,7 @@ object Parody : TagList { "parody:le ranch", "parody:league of legends", "parody:left 4 dead", + "parody:legend of legaia", "parody:legend of lyon flare", "parody:legend of queen opala", "parody:legend of the cryptids", @@ -1326,6 +1364,8 @@ object Parody : TagList { "parody:mahouka koukou no rettousei", "parody:mahoutsukai no yakusoku", "parody:mahoutsukai no yome", + "parody:mahoutsukai reimeiki", + "parody:mai mai miracle", "parody:mai-hime", "parody:mai-otome", "parody:mairimashita iruma-kun", @@ -1383,6 +1423,7 @@ object Parody : TagList { "parody:mayoi neko overrun", "parody:maze runner", "parody:mazinger z", + "parody:me me me", "parody:mecha mote", "parody:mechakko dotakon", "parody:medabots", @@ -1423,6 +1464,7 @@ object Parody : TagList { "parody:mirmo de pon", "parody:miss machiko", "parody:mission impossible", + "parody:misumisou", "parody:mitsudomoe", "parody:mitsume ga tooru", "parody:mitsumete knight", @@ -1479,7 +1521,6 @@ object Parody : TagList { "parody:muv-luv alternative total eclipse", "parody:mx0", "parody:my dad the rock star", - "parody:my dress-up darling", "parody:my hero academia", "parody:my life as a teenage robot", "parody:my little pony friendship is magic", @@ -1508,6 +1549,7 @@ object Parody : TagList { "parody:nazo no kanojo x", "parody:nee chanto shiyou yo", "parody:nee summer", + "parody:needy streamer overload", "parody:nejimaki seirei senki tenkyou no alderamin", "parody:nekketsu saikyou go-saurer", "parody:nekome kozou", @@ -1563,6 +1605,7 @@ object Parody : TagList { "parody:oda nobuna no yabou", "parody:odin sphere", "parody:odoru daisousasen", + "parody:odyssey", "parody:oira uchuu no tankoufu", "parody:ojama yurei-kun", "parody:ojamajo doremi", @@ -1636,6 +1679,7 @@ object Parody : TagList { "parody:parappa the rapper", "parody:parasite eve", "parody:parasyte", + "parody:paripi koumei", "parody:pastel", "parody:pastel yumi", "parody:patlabor", @@ -1709,6 +1753,7 @@ object Parody : TagList { "parody:pu-li-ru-la", "parody:puella magi madoka magica", "parody:pumpkin scissors", + "parody:punch-out", "parody:puppet princess of marl kingdom", "parody:pussy saga", "parody:puyo puyo", @@ -1740,6 +1785,7 @@ object Parody : TagList { "parody:red pride of eden", "parody:redline", "parody:redwall", + "parody:refrain no chika meikyuu to majo no ryodan", "parody:regalia the three sacred stars", "parody:reibaishi izuna", "parody:remi nobodys girl", @@ -1822,6 +1868,7 @@ object Parody : TagList { "parody:sarah and duck", "parody:sasameki koto", "parody:sasami magical girls club", + "parody:satsukare", "parody:savage reign", "parody:sayonara zetsubou sensei", "parody:school days", @@ -1838,6 +1885,7 @@ object Parody : TagList { "parody:seiken densetsu", "parody:seiken densetsu 2", "parody:seiken densetsu 3", + "parody:seiken densetsu ds", "parody:seikesshou albatross", "parody:seikon no qwaser", "parody:seirei no moribito", @@ -1869,12 +1917,14 @@ object Parody : TagList { "parody:sensei no bulge", "parody:sentimental graffiti", "parody:sentouin hakenshimasu", + "parody:senyoku no sigrdrifa", "parody:serial experiments lain", "parody:seto no hanayome", "parody:seven mortal sins", "parody:seven of seven", "parody:sewayaki kitsune no senko-san", "parody:sexfriend", + "parody:shachiku-san wa youjo yuurei ni iyasaretai.", "parody:shadow of the colossus", "parody:shakugan no shana", "parody:shakunetsu no nirai kanai", @@ -1912,6 +1962,7 @@ object Parody : TagList { "parody:shinryaku ika musume", "parody:shinseiki inma seiden", "parody:shinsekai yori", + "parody:shiroi suna no aquatope", "parody:shironeko project", "parody:shisha no teikoku", "parody:shishunki renaissance david-kun", @@ -1951,9 +2002,13 @@ object Parody : TagList { "parody:snow white and the seven dwarfs", "parody:sokihei m.d. geist", "parody:solatorobo", + ) + + override fun getTags2(): List = listOf( "parody:soltyrei", "parody:sonic soldier borgman", "parody:sonic the hedgehog", + "parody:sono bisque doll wa koi o suru", "parody:sono hanabira ni kuchizuke o", "parody:sora no iro mizu no iro", "parody:sora no kanata no dystopia", @@ -1967,6 +2022,7 @@ object Parody : TagList { "parody:soredemo machi wa mawatteiru", "parody:soredemo tsuma o aishiteru", "parody:soromon no kagi", + "parody:sou-bou-tei kowasubeshi", "parody:soukou kijo iris", "parody:soukyuu no fafner", "parody:soul cradle", @@ -2002,9 +2058,6 @@ object Parody : TagList { "parody:star gladiator", "parody:star ocean", "parody:star ocean 2", - ) - - override fun getTags2() = listOf( "parody:star ocean 3", "parody:star ocean 4", "parody:star trek", @@ -2055,6 +2108,7 @@ object Parody : TagList { "parody:sword art online", "parody:sword art online alternative gun gale online", "parody:sword girls", + "parody:sword of the stranger", "parody:sword world rpg", "parody:sym-bionic titan", "parody:t.u.f.f. puppy", @@ -2087,6 +2141,7 @@ object Parody : TagList { "parody:tantei opera milky holmes", "parody:tantei wa mou shindeiru.", "parody:tari tari", + "parody:tartaros", "parody:tasogare otome x amnesia", "parody:tasogare sakaba uwabami breakers", "parody:tatakae tarantella", @@ -2236,6 +2291,7 @@ object Parody : TagList { "parody:the x-files", "parody:they are my noble masters", "parody:this ugly yet beautiful world", + "parody:thomas the tank engine and friends", "parody:threads of fate", "parody:three from prostokvashino", "parody:thundercats", @@ -2244,8 +2300,7 @@ object Parody : TagList { "parody:tiny toons", "parody:to heart", "parody:to love-ru", - "parody:toaru kagaku no railgun", - "parody:toaru majutsu no index", + "parody:toaru project", "parody:tobe isami", "parody:togainu no chi", "parody:toheart2", @@ -2259,6 +2314,7 @@ object Parody : TagList { "parody:tokyo mew mew", "parody:tokyo red hood", "parody:tom and jerry", + "parody:tom clancys ghost recon", "parody:tom clancys rainbow six", "parody:tomb raider", "parody:tomodachi no imouto ga ore ni dake uzai", @@ -2306,6 +2362,7 @@ object Parody : TagList { "parody:twinkle review", "parody:uchi no musume ni te o dasuna", "parody:uchouten kazoku", + "parody:uchuu eiyuu monogatari", "parody:uchuu kaizoku sara", "parody:uchuu kazoku carlvinson", "parody:uchuu no kishi tekkaman", @@ -2332,6 +2389,7 @@ object Parody : TagList { "parody:uta no prince-sama", "parody:utawarerumono", "parody:utawarerumono itsuwari no kamen", + "parody:utsukushiki sei no dendoushi rei rei", "parody:uzaki-chan wa asobitai", "parody:va-11 hall-a", "parody:valkyria chronicles", @@ -2412,6 +2470,7 @@ object Parody : TagList { "parody:witchblade", "parody:witchs weapon", "parody:with you", + "parody:wixoss diva a live", "parody:wizard of oz", "parody:wolfs rain", "parody:wooser no sonohigurashi", @@ -2437,6 +2496,7 @@ object Parody : TagList { "parody:yagate kimi ni naru", "parody:yahari ore no seishun love come wa machigatteiru", "parody:yakitate japan", + "parody:yakumo-san wa ezuke ga shitai.", "parody:yakushiji ryouko no kaiki jikenbo", "parody:yakusoku no neverland", "parody:yama no susume", @@ -2453,6 +2513,7 @@ object Parody : TagList { "parody:yiik", "parody:yin yang yo", "parody:yoake mae yori ruriiro na", + "parody:yofukashi no uta", "parody:yokohama kaidashi kikou", "parody:yomawari", "parody:yondemasuyo azazel-san", diff --git a/app/src/main/java/exh/eh/tags/ReClass.kt b/app/src/main/java/exh/eh/tags/Reclass.kt similarity index 78% rename from app/src/main/java/exh/eh/tags/ReClass.kt rename to app/src/main/java/exh/eh/tags/Reclass.kt index 9b26dc90d..f3517c8b0 100644 --- a/app/src/main/java/exh/eh/tags/ReClass.kt +++ b/app/src/main/java/exh/eh/tags/Reclass.kt @@ -1,8 +1,7 @@ package exh.eh.tags -object ReClass : TagList { - - override fun getTags1() = listOf( +object Reclass : TagList { + override fun getTags1(): List = listOf( "reclass:artistcg", "reclass:asianporn", "reclass:cosplay", diff --git a/app/src/main/java/exh/eh/tags/TagList.kt b/app/src/main/java/exh/eh/tags/TagList.kt index 02496643a..7584e4915 100644 --- a/app/src/main/java/exh/eh/tags/TagList.kt +++ b/app/src/main/java/exh/eh/tags/TagList.kt @@ -7,12 +7,9 @@ interface TagList { fun getTags3(): List = emptyList() - fun getTags4(): List = emptyList() - - fun getTags() = listOf( + fun getTags(): List> = listOf( getTags1(), getTags2(), getTags3(), - getTags4(), ) }