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

Feat/moderation #63

Merged
merged 57 commits into from
Jun 5, 2024
Merged

Feat/moderation #63

merged 57 commits into from
Jun 5, 2024

Conversation

Foxikle
Copy link
Collaborator

@Foxikle Foxikle commented Jun 4, 2024

Dont hate me pls 🙏

@Foxikle Foxikle requested a review from webhead1104 June 5, 2024 00:01
Foxikle added 3 commits June 4, 2024 20:05
…into fix-conflicts

# Conflicts:
#	build.gradle.kts
#	src/main/java/net/cytonic/cytosis/Cytosis.java
#	src/main/java/net/cytonic/cytosis/commands/CommandHandler.java
#	src/main/java/net/cytonic/cytosis/commands/RankCommand.java
#	src/main/java/net/cytonic/cytosis/config/CytosisSettings.java
#	src/main/java/net/cytonic/cytosis/data/Database.java
#	src/main/java/net/cytonic/cytosis/data/DatabaseManager.java
#	src/main/java/net/cytonic/cytosis/events/ServerEventListeners.java
#	src/main/java/net/cytonic/cytosis/managers/ChatManager.java
#	src/main/java/net/cytonic/cytosis/messaging/MessagingManager.java
#	src/main/java/net/cytonic/cytosis/messaging/RabbitMQ.java
@webhead1104 webhead1104 merged commit 4be8d0d into CytonicMC:master Jun 5, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants