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.

Sign up for GitHub

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

Support for folders in the emotes folder #561

Merged
merged 14 commits into from
Mar 13, 2025
Merged

Support for folders in the emotes folder #561

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7630c46
Initial
dima-dencep Mar 12, 2025
c5612cc
Merge branch 'dev' of https://github.com/KosmX/emotes into folders
dima-dencep Mar 12, 2025
6d2a47b
Subfolders
dima-dencep Mar 12, 2025
b3372eb
Preview fixes
dima-dencep Mar 12, 2025
b0ae109
Render path
dima-dencep Mar 12, 2025
4529881
Add back button
dima-dencep Mar 12, 2025
0689bd6
Fix search
dima-dencep Mar 12, 2025
f1c05e9
Highlighting last folder
dima-dencep Mar 12, 2025
721c8aa
Update EmoteSubScreen.java
dima-dencep Mar 13, 2025
f71915f
Folder icons
dima-dencep Mar 13, 2025
5b4b1fb
Remove focus
dima-dencep Mar 13, 2025
4ab0049
Exclude system folders
dima-dencep Mar 13, 2025
c64b53d
Update ru_RU.json
dima-dencep Mar 13, 2025
e486c7c
Fix key binding
dima-dencep Mar 13, 2025
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
Prev Previous commit
Next Next commit
Update ru_RU.json
  • Loading branch information
@dima-dencep
dima-dencep committed Mar 13, 2025
commit c64b53d25ac2f9735cb84ece895547ec05089ec8
4 changes: 3 additions & 1 deletion emotesAssets/src/main/resources/assets/emotecraft/lang/ru_RU.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,7 @@
"emotecraft.export.error": "Не удалось экспортировать в %s...",
"emotecraft.export.done": "Успешный экспорт в %s!",
"emotecraft.song_too_big_to_send": "Размер песни слишком большой, отправка на сервер невозможна. Будет отправлена только эмоция",
"emotecraft.cant.override.forced": "Вы вынуждены использовать текущую эмоцию: это не может быть изменено."
"emotecraft.cant.override.forced": "Вы вынуждены использовать текущую эмоцию: это не может быть изменено.",
"emotecraft.folder": "Каталог",
"emotecraft.folder.main": "основ."
}
Loading