release-1.0.0 #39

Merged
cuqmbr merged 108 commits from develop into main 2025-08-14 15:04:35 +00:00
Showing only changes of commit cb09ece53c - Show all commits

View File

@ -38,14 +38,9 @@ src/plugins/FancyNpcs/logs
src/plugins/FancyNpcs/skins src/plugins/FancyNpcs/skins
src/plugins/FancyNpcs/.data src/plugins/FancyNpcs/.data
<<<<<<< HEAD
src/plugins/DiscordSRV/accounts.aof
=======
src/plugins/ImageFrame/data src/plugins/ImageFrame/data
src/plugins/ImageFrame/player src/plugins/ImageFrame/player
src/plugins/ImageFrame/upload src/plugins/ImageFrame/upload
src/map-color-cache.dat src/map-color-cache.dat
>>>>>>> develop
src/plugins/DiscordSRV/accounts.aof