Merge tag 'v2.22.1' into i18n

# Conflicts:
#	gui/esiFittings.py
This commit is contained in:
blitzmann
2020-06-19 21:51:45 -04:00
3341 changed files with 94537 additions and 76344 deletions

View File

@@ -27,7 +27,7 @@ from logbook import Logger
import gui.globalEvents as GE
import gui.mainFrame
from gui.auxFrame import AuxiliaryFrame
from gui.auxWindow import AuxiliaryFrame
from gui.bitmap_loader import BitmapLoader
from gui.builtinViews.entityEditor import BaseValidator, EntityEditor
from gui.utils.clipboard import fromClipboard, toClipboard