Merge branch 'master' into auto-load - make mod structures and inventory generators not be marked as 'imported'