Merge remote-tracking branch 'origin/master' into spoolup

2019-03-02 20:57:29 -05:00
parent 3259cc3e50 c9b0322c9f
commit f81cc4ad93
98 changed files with 1641 additions and 590 deletions
--- a/gui/contextMenu.py
+++ b/gui/contextMenu.py
@@ -189,6 +189,7 @@ from gui.builtinContextMenus import (  # noqa: E402,F401
    marketJump,
    # droneSplit,
    itemRemove,
+    fillWithModule,
    droneRemoveStack,
    ammoPattern,
    project,