Merge branch 'master' into i18n

# Conflicts: # staticdata/fsd_binary/typedogma.json # staticdata/fsd_lite/evetypes.json # staticdata/phobos/metadata.0.json # staticdata/phobos/traits.json
2020-08-02 18:54:31 -04:00
parent 32a03dedaa bc2cdcdea7
commit c0f8099f49
10 changed files with 328 additions and 104 deletions
--- a/gui/mainFrame.py
+++ b/gui/mainFrame.py
@@ -111,8 +111,6 @@ class OpenFitsThread(threading.Thread):
        self.start()

    def run(self):
-        time.sleep(0.5)  # Give GUI some time to finish drawing
-
        # `startup` tells FitSpawner that we are loading fits are startup, and
        # has 3 values:
        # False = Set as default in FitSpawner itself, never set here