Code

Multiple merges#2845

Code

Closed

ATFGK wants to merge 44 commits intoPryaxis:general-develPryaxis/TShock:general-develfrom ATFGK:prospectATFGK/TShock:prospectCopy head branch name to clipboard

+312-196

Commits

Commits on Oct 29, 2022

• Fixed Server not tracks deaths, Now players can be viewed with the /death, /pvpdeath, /alldeath and /allpvpdeath commands.

  hufang360

  committed
  bfe3b12

  Copy full SHA for bfe3b12

Commits on Nov 5, 2022

• Update PlayerData.cs

  hufang360

  authored
  e7c8f2b

  Copy full SHA for e7c8f2b

Commits on Nov 6, 2022

• Merge branch 'general-devel' into general-devel

  hufang360

  authored
  118f9d3

  Copy full SHA for 118f9d3

Commits on Nov 9, 2022

• Merge branch 'general-devel' into general-devel

  hufang360

  authored
  40b43d4

  Copy full SHA for 40b43d4

Commits on Nov 10, 2022

• Merge branch 'general-devel' into general-devel

  hufang360

  authored
  dbc168b

  Copy full SHA for dbc168b

• Merge branch 'general-devel' into general-devel

  hufang360

  authored
  04b67a6

  Copy full SHA for 04b67a6

Commits on Nov 11, 2022

• Whitelist Shadow Candle and BoC for PlayerAddBuff

  drunderscore

  committed
  7edad19

  Copy full SHA for 7edad19

• Merge branch 'general-devel' into general-devel

  hufang360

  authored
  c425ff0

  Copy full SHA for c425ff0

• Update GetDataHandlers.cs

  hufang360

  authored
  5aefdd8

  Copy full SHA for 5aefdd8

• update

  ATFGK

  committed
  07047a8

  Copy full SHA for 07047a8

• update

  ATFGK

  committed
  355d4c3

  Copy full SHA for 355d4c3

• update

  ATFGK

  committed
  5204ced

  Copy full SHA for 5204ced

• Improve rejection message and code duplication in OnPlayerBuff

  Show description for 3717443
  drunderscore

  committed
  3717443

  Copy full SHA for 3717443

• Update docs/changelog.md

  drunderscore

  committed
  e565f07

  Copy full SHA for e565f07

Commits on Nov 12, 2022

• Fixed Super Sponge unable to absorb shimmer

  sgkoishi

  committed
  3e61e68

  Copy full SHA for 3e61e68

• Merge branch 'general-devel' into Update-GetDataHandlers.cs

  ATFGK

  authored
  2665dce

  Copy full SHA for 2665dce

• Update TShockConfig.cs

  ATFGK

  authored
  c67afe0

  Copy full SHA for c67afe0

• Update TShock.cs

  ATFGK

  authored
  49dc5c1

  Copy full SHA for 49dc5c1

• Update GetDataHandlers.cs

  ATFGK

  authored
  607ca2d

  Copy full SHA for 607ca2d

• Update changelog.md

  ATFGK

  authored
  7654a43

  Copy full SHA for 7654a43

• Update GetDataHandlers.cs

  ATFGK

  authored
  9a6f032

  Copy full SHA for 9a6f032

• Update changelog.md

  ATFGK

  authored
  663b6f2

  Copy full SHA for 663b6f2

• Update changelog.md

  ATFGK

  authored
  f87a188

  Copy full SHA for f87a188

Commits on Nov 16, 2022

• Update changelog.md

  ATFGK

  authored
  a719c60

  Copy full SHA for a719c60

• Update changelog.md

  ATFGK

  authored
  883bea6

  Copy full SHA for 883bea6

• Update changelog.md

  Show description for a76168e
  ATFGK

  authored
  a76168e

  Copy full SHA for a76168e

Commits on Nov 18, 2022

• Merge branch 'general-devel' into PVPWithNoTeam

  ATFGK

  authored
  a4d4fb6

  Copy full SHA for a4d4fb6

• Merge branch 'general-devel' into Update-GetDataHandlers.cs

  ATFGK

  authored
  c2e4bfd

  Copy full SHA for c2e4bfd

Commits on Nov 20, 2022

• Fix Digging Molecart and Bomb Fish blocked

  sgkoishi

  committed
  3c6521c

  Copy full SHA for 3c6521c

Commits on Nov 25, 2022

• Merge branch 'general-devel' into general-devel

  hufang360

  authored
  50a9b4a

  Copy full SHA for 50a9b4a

Commits on Nov 26, 2022

• Merge branch 'general-devel' into PVPWithNoTeam

  ATFGK

  authored
  d430425

  Copy full SHA for d430425

• Merge branch 'general-devel' into Update-GetDataHandlers.cs

  ATFGK

  authored
  4d80612

  Copy full SHA for 4d80612

Commits on Nov 27, 2022

• Merge pull request #1 from sgkoishi/pr2833

  Show description for bae8e79
  ATFGK

  authored
  bae8e79

  Copy full SHA for bae8e79

• Merge branch 'prospect' into Update-GetDataHandlers.cs

  ATFGK

  authored
  1179740

  Copy full SHA for 1179740

• Merge pull request #2 from ATFGK/Update-GetDataHandlers.cs

  Show description for f7e4ad4
  ATFGK

  authored
  f7e4ad4

  Copy full SHA for f7e4ad4

• Merge branch 'prospect' into PVPWithNoTeam

  ATFGK

  authored
  6848325

  Copy full SHA for 6848325

• Merge pull request #4 from ATFGK/PVPWithNoTeam

  Show description for a4e3f67
  ATFGK

  authored
  a4e3f67

  Copy full SHA for a4e3f67

• Merge pull request #6 from hufang360/general-devel

  Show description for d9ab321
  ATFGK

  authored
  d9ab321

  Copy full SHA for d9ab321

• Merge pull request #7 from drunderscore/fix/more-add-player-buff-whitelists

  Show description for 0ec87b2
  ATFGK

  authored
  0ec87b2

  Copy full SHA for 0ec87b2

• Merge branch 'prospect' into temp

  ATFGK

  authored
  3b762b7

  Copy full SHA for 3b762b7

• Merge pull request #8 from ATFGK/temp

  Show description for 81a958c
  ATFGK

  authored
  81a958c

  Copy full SHA for 81a958c

• Merge pull request #10 from sgkoishi/bombfix

  Show description for b5cc51d
  ATFGK

  authored
  b5cc51d

  Copy full SHA for b5cc51d

• Merge branch 'prospect' into temp

  ATFGK

  authored
  cfe10e9

  Copy full SHA for cfe10e9

• Merge pull request #11 from ATFGK/temp

  Show description for 3a8b002
  ATFGK

  authored
  3a8b002

  Copy full SHA for 3a8b002