diff --git a/.gitattributes b/.gitattributes index 6f5933e4..c751ac98 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,14 @@ +* text=input + *.php text eol=lf *.js text eol=lf *.css text eol=lf *.sql text eol=lf +aowow text eol=lf +prQueue text eol=lf + +*.png binary +*.jpg binary +*.gif binary +*.ttf binary +*.swf binary diff --git a/setup/tools/filegen/templates/item-scaling.in b/setup/tools/filegen/templates/item-scaling.in index 67a6250a..b6521d1b 100644 --- a/setup/tools/filegen/templates/item-scaling.in +++ b/setup/tools/filegen/templates/item-scaling.in @@ -1,10 +1,10 @@ -$WH.g_convertRatingToPercent.RB = /*setup:itemScalingRB*/; - -$WH.g_convertScalingFactor.SV = /*setup:itemScalingSV*/; - -$WH.g_convertScalingFactor.SD = /*setup:itemScalingSD*/; - -if ($WH.isset('$WowheadPower')) { - $WowheadPower.loadScales(3); - $WowheadPower.loadScales(6); -} +$WH.g_convertRatingToPercent.RB = /*setup:itemScalingRB*/; + +$WH.g_convertScalingFactor.SV = /*setup:itemScalingSV*/; + +$WH.g_convertScalingFactor.SD = /*setup:itemScalingSD*/; + +if ($WH.isset('$WowheadPower')) { + $WowheadPower.loadScales(3); + $WowheadPower.loadScales(6); +} diff --git a/setup/tools/trigger_example.txt b/setup/tools/trigger_example.txt index 74a512a3..b0536942 100644 --- a/setup/tools/trigger_example.txt +++ b/setup/tools/trigger_example.txt @@ -1,31 +1,31 @@ -CREATE TABLE `aowow_sync` ( - `table` VARCHAR(50) NOT NULL, - `entry` INT NOT NULL, - `action` TINYINT NOT NULL COMMENT '0:delete; 1:insert; 2:update' -) COLLATE='utf8_general_ci' ENGINE=MyISAM; - - -delimiter | - -CREATE TRIGGER aowow_sync_