• liujiahua123123's avatar
    Merge remote-tracking branch 'origin/master' · ff3bd74a
    liujiahua123123 authored
    # Conflicts:
    #	mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/login/ClientPasswordSubmissionPacket.kt
    #	mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/ServerPacket.kt
    ff3bd74a
PacketTest.kt 1.43 KB