Merge remote-tracking branch 'origin/master' into feature/eqemu-api-data-service-netstats-ws

utils/sql/git/optional/2019_04_13_restore_legacy_faction_thresholds.sql

@@ -0,0 +1,11 @@
+-- Supplied for convenient configuration of faction thresholds to the values that were in place prior to 2019-03-01 update
+INSERT INTO rule_values VALUES
+	(0, "Faction:AllyFactionMinimum", 1101),
+	(0, "Faction:WarmlyFactionMinimum", 701),
+	(0, "Faction:KindlyFactionMinimu", 401),
+	(0, "Faction:AmiablyFactionMinimum", 101),
+	(0, "Faction:IndifferentlyFactionMinimum", 0)
+	(0, "Faction:ApprehensivelyFactionMinimum", -100)
+	(0, "Faction:DubiouslyFactionMinimum", -700)
+	(0, "Faction:ThreateninglyFactionMinimum", -999)
+;

utils/sql/git/required/2019_03_25_optional_npc_model.sql

@@ -0,0 +1 @@
+ALTER TABLE `npc_types` ADD COLUMN `model` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `stuck_behavior`;