Moh 6 Posted July 3, 2023 commit db29247557eab9df99234e00ddece98980ce809a Merge: 8a5b7446 db5e2b6c Author: Yupmoh <[email protected]> Merge branch 'master' of github.com:PrimalConquer/FrostEmu # Conflicts: # Database/FrostEmu.Scripts/FrostEmu.Item/Halloween - PumpkinBox.cs # FrostEmu.Logon/Core/Server.cs # FrostEmu.Logon/Packets/[1051]MsgAccount.cs # FrostEmu.Logon/Packets/[1052]MsgConnect.cs # FrostEmu.World/Core/Constants.cs # FrostEmu.World/Core/LogonHandler.cs # FrostEmu.World/Database/ServerDatabase.cs # FrostEmu.World/Entities/Bot.cs # FrostEmu.World/Entities/WorldClient.cs # FrostEmu.World/Packets/[1023]MsgTeam.cs # FrostEmu.World/Packets/[2068]MsgQuizShow.cs # FrostEmu.World/Structures/Team.cs Share this post Link to post Share on other sites
