Skip to content

Convert ButtonListener to a Record#55

Merged
Owen1212055 merged 14 commits intoMCDiamondFire:masterfrom
ryandev2:master
Aug 16, 2021
Merged

Convert ButtonListener to a Record#55
Owen1212055 merged 14 commits intoMCDiamondFire:masterfrom
ryandev2:master

Conversation

@ryandev2
Copy link
Contributor

ignore all the random commits git added

RyanLandDev and others added 14 commits July 16, 2021 15:28
+ Re-categorised some commands backend
# Conflicts:
#	src/main/java/com/diamondfire/helpbot/bot/HelpBotInstance.java
#	src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/minecraft/MojangPlayerUUIDArgument.java
#	src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/metrics/JoinsCommand.java
#	src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/top/DiscordBoostersCommand.java
#	src/main/java/com/diamondfire/helpbot/sys/externalfile/ExternalFiles.java
#	src/main/java/com/diamondfire/helpbot/sys/message/acceptors/TagAcceptor.java
#	src/main/java/com/diamondfire/helpbot/sys/tag/Tag.java
#	src/main/java/com/diamondfire/helpbot/sys/tag/TagProperty.java
@Owen1212055
Copy link
Contributor

I recommend using branches >:(

@Owen1212055 Owen1212055 merged commit 30ae131 into MCDiamondFire:master Aug 16, 2021
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