Merge branch 'master' into development

Conflicts:
	gui/builtinViewColumns/baseName.py
This commit is contained in:
Ryan Holmes
2017-02-08 13:58:37 -05:00
16 changed files with 216 additions and 47 deletions

View File

@@ -56,6 +56,9 @@ if config.saveDB and os.path.isfile(config.saveDB):
database_cleanup_instance.OrphanedFitDamagePatterns(db.saveddata_engine)
database_cleanup_instance.NullDamagePatternNames(db.saveddata_engine)
database_cleanup_instance.NullTargetResistNames(db.saveddata_engine)
database_cleanup_instance.OrphanedFitIDItemID(db.saveddata_engine)
database_cleanup_instance.NullDamageTargetPatternValues(db.saveddata_engine)
database_cleanup_instance.DuplicateSelectedAmmoName(db.saveddata_engine)
logging.debug("Completed database validation.")
else: