Merge branch 'master' into Playerbot

This commit is contained in:
Yunfan Li
2025-05-02 16:50:45 +08:00
138 changed files with 4062 additions and 3707 deletions
@@ -3438,14 +3438,14 @@ Wintergrasp.Enable = 1
#
# Wintergrasp.PlayerMax
# Description: Maximum number of players allowed in Wintergrasp.
# Default: 100
# Description: Maximum number of players allowed in Wintergrasp per team.
# Default: 120
Wintergrasp.PlayerMax = 100
Wintergrasp.PlayerMax = 120
#
# Wintergrasp.PlayerMin
# Description: Minimum number of players required for Wintergrasp.
# Description: Minimum number of players required for Wintergrasp per team.
# Default: 0
Wintergrasp.PlayerMin = 0
@@ -3453,9 +3453,9 @@ Wintergrasp.PlayerMin = 0
#
# Wintergrasp.PlayerMinLvl
# Description: Required character level for the Wintergrasp battle.
# Default: 77
# Default: 75
Wintergrasp.PlayerMinLvl = 77
Wintergrasp.PlayerMinLvl = 75
#
# Wintergrasp.BattleTimer
@@ -4209,7 +4209,8 @@ AllowTwoSide.Interaction.Arena = 0
#
# AllowTwoSide.Interaction.Auction
# Description: Allow auctions between factions.
# Description: Allow auctions between factions. This flags all auction houses as Neutral,
# and would also take a Neutral auction house cut from auctions.
# Default: 0 - (Disabled)
# 1 - (Enabled)