AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-06-28 19:26:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/RELEASE-2023.03' into RELEASE-2023.03

Browse Source
This commit is contained in:
Video
2023-04-05 16:17:38 -06:00
parent 3070ff893e b29a176fa9
commit 48aabaa878
15 changed files with 119 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
discord/src/main/java/me/totalfreedom/discord/util/SnowflakeEntry.java
View File

@ -36,8 +36,12 @@ public enum SnowflakeEntry
return Snowflake.of(entry.getString());
}
<<<<<<< HEAD
public static Set<Snowflake> acceptableRoleIDs()
{
=======
public static Set<Snowflake> acceptableRoleIDs() {
>>>>>>> refs/remotes/origin/RELEASE-2023.03
Set<Snowflake> acceptableRoleIDs = new HashSet<>();
acceptableRoleIDs.add(SnowflakeEntry.OWNER_ROLE_ID.getSnowflake());
acceptableRoleIDs.add(SnowflakeEntry.DEVELOPER_ROLE_ID.getSnowflake());