Merge from master, probably wont compile but will fix that soon

utils/sql/git/optional/2014_03_17_EnforceAugmentRules.sql

@@ -1,3 +1,3 @@
 INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Inventory:EnforceAugmentRestriction', 'false', 'Forces augment slot restrictions.');
 INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Inventory:EnforceAugmentUsability', 'false', 'Forces augmented item usability.');
-INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Inventory:EnforceAugmentWear', 'false', 'Forces augment wear slot validation.');
+INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Inventory:EnforceAugmentWear', 'false', 'Forces augment wear slot validation.');

utils/sql/git/optional/2015_04_30_MeleePush.sql

@@ -0,0 +1,2 @@
+INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Combat:MeleePush', 'true', 'Turns on Melee Push.');
+INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Combat:MeleePushChance', '50', 'Chance that an NPC can be pushed from melee.');

utils/sql/git/optional/2015_05_18_FishingLineLength.sql

@@ -0,0 +1 @@
+UPDATE rule_values SET rule_value=100 WHERE rule_name='Watermap:FishingLineLength';

utils/sql/git/optional/2015_06_07_SpellsTargetBuffsRule.sql

@@ -0,0 +1 @@
+INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Spells:AlwaysSendTargetBuffs', 'false', 'Allows the server to send the targets buffs ignoring the LAA.');

utils/sql/git/optional/2015_06_07_TransformSummonedBagsRule.sql

@@ -0,0 +1 @@
+INSERT INTO `rule_values` (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES (1, 'Inventory:TransformSummonedBags', 'true', 'Transforms summoned bags into disenchanted ones instead of deleting.');

utils/sql/git/required/2015_05_20_BuffInstrumentMod.sql

@@ -0,0 +1 @@
+ALTER TABLE `character_buffs` ADD COLUMN `instrument_mod` int(10) DEFAULT 10 NOT NULL;

utils/sql/git/required/2015_05_23_BuffDurations.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `character_buffs` CHANGE COLUMN `ticsremaining` `ticsremaining` INT(11) SIGNED NOT NULL;
+ALTER TABLE `merc_buffs` CHANGE COLUMN `TicsRemaining` `TicsRemaining` INT(11) SIGNED NOT NULL DEFAULT 0;

utils/sql/git/required/2015_05_23_PetBuffInstrumentMod.sql

@@ -0,0 +1 @@
+ALTER TABLE `character_pet_buffs` ADD COLUMN `instrument_mod` tinyint UNSIGNED DEFAULT 10 NOT NULL;

utils/sql/git/required/2015_05_23_dbstr_us.sql

@@ -0,0 +1,6 @@
+CREATE TABLE `db_str` (
+	`id` INT(10) NOT NULL,
+	`type` INT(10) NOT NULL,
+	`value` TEXT NOT NULL,
+	PRIMARY KEY (`id`, `type`)
+);

utils/sql/git/required/2015_05_25_npc_types_texture_fields.sql

@@ -0,0 +1,6 @@
+ALTER TABLE npc_types
+ADD COLUMN `armtexture` tinyint(2) NOT NULL DEFAULT '0' AFTER `raid_target`,
+ADD COLUMN `bracertexture` tinyint(2) NOT NULL DEFAULT '0' AFTER `armtexture`,
+ADD COLUMN `handtexture` tinyint(2) NOT NULL DEFAULT '0' AFTER `bracertexture`,
+ADD COLUMN `legtexture` tinyint(2) NOT NULL DEFAULT '0' AFTER `handtexture`,
+ADD COLUMN `feettexture` tinyint(2) NOT NULL DEFAULT '0' AFTER `legtexture`;

utils/sql/git/required/2015_06_07_aa_update.sql

@@ -0,0 +1 @@
+ALTER TABLE character_alternate_abilities ADD COLUMN charges SMALLINT(11) UNSIGNED NOT NULL DEFAULT 0;