Skip to content

M
Mirai
Switch branch/tag
  1. 12 Jan, 2020 19 commits
  3. 11 Jan, 2020 6 commits
    • Him188's avatar
      Merge remote-tracking branch 'origin/japt' into japt · b2ceb983
      Him188 authored 
      # Conflicts:
#	mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/event/MemberJoin.kt
#	mirai-japt/mirai-japt.postfixTemplates
#	mirai-japt/src/main/java/net/mamoe/mirai/japt/BlockingContact.java
#	mirai-japt/src/main/java/net/mamoe/mirai/japt/BlockingGroup.java
#	mirai-japt/src/main/java/net/mamoe/mirai/japt/BlockingQQ.java
#	mirai-japt/src/main/kotlin/net/mamoe/mirai/japt/BlockingContactsImpl.kt
      b2ceb983
    • Him188's avatar
      Update japt · 3a5ec367
      Him188 authored
      3a5ec367
    • Him188's avatar
      Add blocking wrappers · 844d798f
      Him188 authored
      844d798f
    • Him188's avatar
      Fix build · 0f89665e
      Him188 authored
      0f89665e
    • Him188's avatar
      Add doc · 05a0bc64
      Him188 authored
      05a0bc64
    • Him188's avatar
      Fix packet parsing · d7f67e51
      Him188 authored
      d7f67e51
  5. 10 Jan, 2020 15 commits