Merge branch 'singularity'

# Conflicts:
#	db_update.py
#	eos/effects.py
#	staticdata/fsd_built/dogmaattributes.0.json
#	staticdata/fsd_built/dogmaeffects.0.json
#	staticdata/fsd_built/iconids.0.json
#	staticdata/fsd_built/requiredskillsfortypes.0.json
#	staticdata/fsd_built/typedogma.2.json
#	staticdata/fsd_built/types.4.json
#	staticdata/fsd_built/types.5.json
#	staticdata/phobos/metadata.0.json
#	version.yml

Author: DarkFenX

db_update.py

@@ -163,7 +163,12 @@ def processEveTypes():
                 )
                 # Some draft boosters added to sisi, should be removed later when FC/CCP finishes them
                 or row['typeID'] in (
-                        91916,
+                        94043, 94044, 91935, 91944, 91943, 91921, 91925, 91926, 91964, 91974, 91975,
+                        91949, 91958, 91959, 94045, 94046, 94039, 94040, 91932, 91939, 91940, 91916,
+                        91929, 91930, 91962, 91970, 91971, 91947, 91952, 91951, 91936, 91945, 91946,
+                        91922, 91923, 91924, 91965, 91976, 91977, 91950, 91960, 91961, 91934, 91941,
+                        91942, 91920, 91927, 91928, 91963, 91972, 91973, 91948, 91953, 91954, 94047,
+                        94048
                 )
             ):
                 row['published'] = False

dist_assets/linux/AppImageBuilder.yml

@@ -48,7 +48,7 @@ AppDir:
     - AppDir/usr/bin/python3.11 get-pip.py
     # Just to bundle certificates with AppImage
     - AppDir/usr/bin/python3.11 -s -m pip install certifi
-    - AppDir/usr/bin/python3.11 -s -m pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04 -r requirements.txt
+    - AppDir/usr/bin/python3.11 -s -m pip --timeout 300 install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04 -r requirements.txt
 
   files:
     exclude:

eos/db/gamedata/attribute.py

@@ -33,6 +33,7 @@
                          Column("attributeID", Integer, primary_key=True),
                          Column("attributeName", String),
                          Column("defaultValue", Float),
+                         Column("minAttributeID", Integer, ForeignKey("dgmattribs.attributeID")),
                          Column("maxAttributeID", Integer, ForeignKey("dgmattribs.attributeID")),
                          Column("description", Unicode),
                          Column("published", Boolean),