Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Easter Event items #276

Merged
merged 26 commits into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
7dcf39b
Added Easter Egg Textures
ZethalMC Apr 2, 2024
695ebf9
Added a credit to zethal_
ZethalMC Apr 2, 2024
d0f5e05
Added zethal_ to "credit_users"
ZethalMC Apr 2, 2024
1012049
Add datatypes for the Easter Items
ZethalMC Apr 2, 2024
12cd4a8
Add translation in ES for zethal_ in credits
ZethalMC Apr 3, 2024
f7ac249
Add translation in FR for zethal_ in credits
ZethalMC Apr 3, 2024
7f4c25a
Add translation in PT for zethal_ in credits
ZethalMC Apr 3, 2024
6ea5fcd
Add translation in UA for zethal_ in credits
ZethalMC Apr 3, 2024
b038bc7
Update LICENSE to 2021-2024
ZethalMC Apr 3, 2024
58ea058
Fix indendation
ZethalMC Apr 3, 2024
47c55a2
Remove 'easter' section in 'emoji_name'
ZethalMC Apr 3, 2024
efeb7ca
Update emoji_name for easter items vice versa
ZethalMC Apr 3, 2024
36dee02
Remove extra new line
Iapetus-11 Apr 3, 2024
b02913c
Remove extra new line
Iapetus-11 Apr 3, 2024
bb1ca18
Move easter emoji definitions
Iapetus-11 Apr 3, 2024
9b86bf3
Remove extra new line
Iapetus-11 Apr 3, 2024
97f4053
Fix indendation
ZethalMC Apr 4, 2024
bd6eec3
Fix another indendation problem
ZethalMC Apr 4, 2024
e46c049
Fix json
Iapetus-11 Apr 4, 2024
98e6e10
Update common/data/data.json
Iapetus-11 Apr 4, 2024
f13b980
Update common/data/data.json
Iapetus-11 Apr 4, 2024
f6e8699
Add , to the end of a line
ZethalMC Apr 4, 2024
c21064f
Add , to the end of a line
ZethalMC Apr 4, 2024
2c49003
Add , to the end of a line
ZethalMC Apr 4, 2024
9f04d58
Add , to the end of a line
ZethalMC Apr 4, 2024
9b6a77a
Add , to the end of a line
ZethalMC Apr 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2021-2022 Iapetus-11
Copyright (c) 2021-2024 Iapetus-11

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
3 changes: 2 additions & 1 deletion bot/data/text/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1729,7 +1729,8 @@
"radar": "Minor bug fixes and feature additions",
"kuro": "Helps with multiple translations of Villager Bot",
"hilt": "Helps with multiple translations of Villager Bot",
"infernum": "Miscellaneous bug fixes and feature additions and reminders system improvements"
"infernum": "Miscellaneous bug fixes and feature additions and reminders system improvements",
"zethal_": "Made several textures"
},
"others": "And of course, the countless others who have contributed ideas and bug reports to help make Villager Bot better!"
},
Expand Down
3 changes: 2 additions & 1 deletion bot/data/text/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -1729,7 +1729,8 @@
"radar": "Arreglos menores de bugs y adición de funciones",
"kuro": "Ayuda con varias traducciones de Villager Bot",
"hilt": "Ayuda con varias traducciones de Villager Bot",
"infernum": "Correcciones de errores varios y adiciones de funciones y mejoras del sistema de recordatorios"
"infernum": "Correcciones de errores varios y adiciones de funciones y mejoras del sistema de recordatorios",
"zethal_": "Hizo varias texturas"
},
"others": "Y por supuesto, los incontables usuarios que han contribuido ideas y reportado bugs para ayudar a mejorar a Villager Bot!"
},
Expand Down
3 changes: 2 additions & 1 deletion bot/data/text/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -1729,7 +1729,8 @@
"radar": "Corrections de bugs mineurs et ajout de fonctionnalités",
"kuro": "Aide à traduire de différentes langues le Villager Bot",
"hilt": "Aide à traduire de différentes langues le Villager Bot",
"infernum": "Réparations de bugs divers et addition de fonctionnalités et améliorations du système de rappels"
"infernum": "Réparations de bugs divers et addition de fonctionnalités et améliorations du système de rappels",
"zethal_": "Réalisé plusieurs textures"
},
"others": "Et bien sûr, les innombrables autres personnes qui ont contribués par leurs idées et leurs signalement de bugs à améliorer le Villager Bot !"
},
Expand Down
3 changes: 2 additions & 1 deletion bot/data/text/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -1729,7 +1729,8 @@
"radar": "Pequenas correções de bugs e acréscimos de recursos",
"kuro": "Ajuda com várias traduções do Villager Bot",
"hilt": "Ajuda com várias traduções do Villager Bot",
"infernum": "Diversas correções de bugs, adições de recursos e melhorias no sistema de lembretes"
"infernum": "Diversas correções de bugs, adições de recursos e melhorias no sistema de lembretes",
"zethal_": "Fiz várias texturas"
},
"others": "E, claro, os incontáveis outros que contribuíram com ideias e relatórios de erros para ajudar a tornar o Villager Bot ainda melhor!"
},
Expand Down
3 changes: 2 additions & 1 deletion bot/data/text/ua.json
Original file line number Diff line number Diff line change
Expand Up @@ -1726,7 +1726,8 @@
"radar": "Дрібні виправлення помилок та доповнення функцій",
"kuro": "Допомагає з кількома перекладами Villager Bot",
"hilt": "Допомагає з кількома перекладами Villager Bot",
"infernum": "Різні виправлення помилок і додавання функцій та покращення системи нагадувань"
"infernum": "Різні виправлення помилок і додавання функцій та покращення системи нагадувань",
"zethal_": "Зробив декілька текстур"
},
"others": "І, звичайно ж, незліченна кількість інших, хто надавав ідеї та повідомлення про помилки, щоб допомогти зробити Villager Bot кращим!"
},
Expand Down
47 changes: 45 additions & 2 deletions common/data/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"radar": 747107518471209024,
"kuro": 763169296288579604,
"hilt": 766368169241083944,
"infernum": 493344822900424714
"infernum": 493344822900424714,
"zethal_": 786981038932623391
},
"upvote_emoji_image": "https://cdn.discordapp.com/emojis/682422396636233769.png",
"acceptable_prefix_chars": [
Expand Down Expand Up @@ -1420,6 +1421,27 @@
"mega_mushroom": "<:mega_mushroom:1073978241523654696>",
"golden_mushroom": "<:golden_mushroom:1073977939357606021>",
"blue_shell": "<:blue_shell:1073977769840619632>",
"golden_bunny_ears": "<:Golden_Bunny_Ears:1224720503751573534>",
"rainbow_easter_egg": "<:Rainbow_Easter_Egg:1224720569312870492>",
"bunny_ears": "<:Bunny_Ears:1224720502380298270>",
"green_striped_easter_egg": "<:Green_Striped_Easter_Egg:1224720508495593502>",
"purple_striped_easter_egg": "<:Purple_Striped_Easter_Egg:1224720567178100891>",
"blue_striped_easter_egg": "<:Blue_Striped_Easter_Egg:1224720500568359005>",
"blue_dotted_easter_egg": "<:Blue_Dotted_Easter_Egg:1224720497267179522>",
"green_dotted_easter_egg": "<:Green_Dotted_Easter_Egg:1224720505161125959>",
"purple_dotted_easter_egg": "<:Purple_Dotted_Easter_Egg:1224720516204724224>",
"purple_easter_egg": "<:Purple_Easter_Egg:1224720565739327498>",
"green_easter_egg": "<:Green_Easter_Egg:1224720506738049064>",
"blue_easter_egg": "<:Blue_Easter_Egg:1224720499221991515>",
"red_striped_easter_egg": "<:Red_Striped_Easter_Egg:1224720574207758356>",
"yellow_striped_easter_egg": "<:Yellow_Striped_Easter_Egg:1224720578641133648>",
"orange_striped_easter_egg": "<:Orange_Striped_Easter_Egg:1224720564170653818>",
"red_dotted_easter_egg": "<:Red_Dotted_Easter_Egg:1224720571397574656>",
"yellow_dotted_easter_egg": "<:Yellow_Dotted_Easter_Egg:1224720575562252388>",
"orange_dotted_easter_egg": "<:Orange_Dotted_Easter_Egg:1224720510085103717>",
"orange_easter_egg": "<:Orange_Easter_Egg:1224720512224071771>",
"yellow_easter_egg": "<:Yellow_Easter_Egg:1224720577106018467>",
"red_easter_egg": "<:Red_Easter_Egg:1224720573075034245>",
"farming": {
"growing": {
"emerald_fruit": "<:emerald_fruit_growing:927292976756031551>",
Expand Down Expand Up @@ -1626,7 +1648,28 @@
"Mushroom": "mushroom",
"Mega Mushroom": "mega_mushroom",
"Golden Mushroom": "golden_mushroom",
"Blue Shell": "blue_shell"
"Blue Shell": "blue_shell",
"Golden Bunny Ears": "golden_bunny_ears",
"Rainbow Easter Egg": "rainbow_easter_egg",
"Bunny Ears": "bunny_ears",
"Green Striped Easter Egg": "green_striped_easter_egg",
"Purple Striped Easter Egg": "purple_striped_easter_egg",
"Blue Striped Easter Egg": "blue_striped_easter_egg",
"Blue Dotted Easter Egg": "blue_dotted_easter_egg",
"Green Dotted Easter Egg": "green_dotted_easter_egg",
"Purple Dotted Easter Egg": "purple_dotted_easter_egg",
"Purple Easter Egg": "purple_easter_egg",
"Green Easter Egg": "green_easter_egg",
"Blue Easter Egg": "blue_easter_egg",
"Red Striped Easter Egg": "red_striped_easter_egg",
"Yellow Striped Easter Egg": "yellow_striped_easter_egg",
"Orange Striped Easter Egg": "orange_striped_easter_egg",
"Red Dotted Easter Egg": "red_dotted_easter_egg",
"Yellow Dotted Easter Egg": "yellow_dotted_easter_egg",
"Orange Dotted Easter Egg": "orange_dotted_easter_egg",
"Orange Easter Egg": "orange_easter_egg",
"Yellow Easter Egg": "yellow_easter_egg",
"Red Easter Egg": "red_easter_egg"
},
Iapetus-11 marked this conversation as resolved.
Show resolved Hide resolved
"farming": {
"emojis": {
Expand Down
21 changes: 21 additions & 0 deletions common/models/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,27 @@ class BadgeEmojis(ImmutableBaseModel):
mega_mushroom: str
golden_mushroom: str
blue_shell: str
bunny_ears: str
golden_bunny_ears: str
rainbow_easter_egg: str
green_striped_easter_egg: str
purple_striped_easter_egg: str
blue_striped_easter_egg: str
blue_dotted_easter_egg: str
green_dotted_easter_egg: str
purple_dotted_easter_egg: str
purple_easter_egg: str
green_easter_egg: str
blue_easter_egg: str
red_striped_easter_egg: str
yellow_striped_easter_egg: str
orange_striped_easter_egg: str
red_dotted_easter_egg: str
yellow_dotted_easter_egg: str
orange_dotted_easter_egg: str
orange_easter_egg: str
yellow_easter_egg: str
red_easter_egg: str
farming: FarmingEmojis
reees: list[str]
fish: FishEmojis
Expand Down
Loading