Omega via svn r9301:
add some notes about torrent of ice bugs. still working on heroic bosses 2 more hours. I will review the issues after raid though. many issues with current aura scanning
nbluewiz via svn r9302:
# Lei Shen : fix lua error.
# Megaera : Comment for ice Torrent bug.
Omega via svn r9303:
add some notes about torrent of ice bugs. still working on heroic bosses 2 more hours. I will review the issues after raid though. many issues with current aura scanning
nbluewiz via svn r9304:
# Megaera : Okay, try this.
nbluewiz via svn r9305:
# Greatly reduce instance name localization. (idea from tomrus, code by bluewiz. / currently on pvp, i will do this change on scenario soon.)
# ruRU update.
nbluewiz via svn r9306:
# Update dungeon id for Scenario.
Omega via svn r9307:
possibly fix a logic issues with diffusion option not working cause the return got moved into a different nested function thus allowing the rest of the code that wasn't supposed to run, to run anyways. also, as failsafe, ensure that if we skip a number, we still reset it if it's over the correct count.
nbluewiz via svn r9308:
# Dungeon id for world event mods.
nbluewiz via svn r9309:
# Twin Consorts : Adjust normal and heroic dusk phase timer.
Merge branch 'master' of git://git.curseforge.net/wow/deadly-boss-mods/mainline

Conflicts:
	DBM-Core/DBM-Core.lua
	DBM-HeartofFear/DBM-HeartofFear.toc
	DBM-HeartofFear/localization.ru.lua
	DBM-MogushanVaults/DBM-MogushanVaults.toc
	DBM-Pandaria/DBM-Pandaria.toc
	DBM-Pandaria/localization.ru.lua
	DBM-Party-MoP/DBM-Party-MoP.toc
	DBM-PvP/localization.en.lua
	DBM-PvP/localization.ru.lua
	DBM-Scenario-MoP/localization.en.lua
	DBM-Scenario-MoP/localization.ru.lua
	DBM-TerraceofEndlessSpring/DBM-TerraceofEndlessSpring.toc
	DBM-ThroneofThunder/DBM-ThroneofThunder.toc
	DBM-ThroneofThunder/localization.ru.lua
	DBM-WorldEvents/localization.en.lua
	DBM-WorldEvents/localization.ru.lua
Fix