diff --git a/config.py b/config.py index 86c4a16d3..cf1c3f3e3 100644 --- a/config.py +++ b/config.py @@ -18,7 +18,7 @@ debug = False saveInRoot = False # Version data -version = "1.22.1" +version = "1.22.2" tag = "git" expansionName = "YC 118.6" expansionVersion = "1.0" diff --git a/eve.db b/eve.db index 0c2623139..85b72599d 100644 Binary files a/eve.db and b/eve.db differ diff --git a/imgs/icons/123_10.png b/imgs/icons/123_10.png new file mode 100644 index 000000000..8c62c922f Binary files /dev/null and b/imgs/icons/123_10.png differ diff --git a/imgs/icons/123_11.png b/imgs/icons/123_11.png new file mode 100644 index 000000000..1829dfd0b Binary files /dev/null and b/imgs/icons/123_11.png differ diff --git a/imgs/icons/123_5.png b/imgs/icons/123_5.png new file mode 100644 index 000000000..c360369ca Binary files /dev/null and b/imgs/icons/123_5.png differ diff --git a/imgs/icons/123_6.png b/imgs/icons/123_6.png new file mode 100644 index 000000000..f0e032248 Binary files /dev/null and b/imgs/icons/123_6.png differ diff --git a/imgs/icons/123_8.png b/imgs/icons/123_8.png new file mode 100644 index 000000000..4bf986d3d Binary files /dev/null and b/imgs/icons/123_8.png differ diff --git a/imgs/icons/123_9.png b/imgs/icons/123_9.png new file mode 100644 index 000000000..5b35e2d10 Binary files /dev/null and b/imgs/icons/123_9.png differ diff --git a/imgs/icons/127_1.png b/imgs/icons/127_1.png new file mode 100644 index 000000000..8ecbeda0f Binary files /dev/null and b/imgs/icons/127_1.png differ diff --git a/imgs/icons/127_10.png b/imgs/icons/127_10.png new file mode 100644 index 000000000..135a33de0 Binary files /dev/null and b/imgs/icons/127_10.png differ diff --git a/imgs/icons/127_2.png b/imgs/icons/127_2.png new file mode 100644 index 000000000..5c5177a73 Binary files /dev/null and b/imgs/icons/127_2.png differ diff --git a/imgs/icons/127_3.png b/imgs/icons/127_3.png new file mode 100644 index 000000000..7f67bbee4 Binary files /dev/null and b/imgs/icons/127_3.png differ diff --git a/imgs/icons/127_4.png b/imgs/icons/127_4.png new file mode 100644 index 000000000..c0206012f Binary files /dev/null and b/imgs/icons/127_4.png differ diff --git a/imgs/icons/127_7.png b/imgs/icons/127_7.png new file mode 100644 index 000000000..c76cc4f0b Binary files /dev/null and b/imgs/icons/127_7.png differ diff --git a/imgs/icons/127_9.png b/imgs/icons/127_9.png new file mode 100644 index 000000000..122f363a8 Binary files /dev/null and b/imgs/icons/127_9.png differ diff --git a/imgs/icons/45_12.png b/imgs/icons/45_12.png new file mode 100644 index 000000000..a9cc45916 Binary files /dev/null and b/imgs/icons/45_12.png differ diff --git a/imgs/icons/64_12.png b/imgs/icons/64_12.png index b1afaf334..f4831e81f 100644 Binary files a/imgs/icons/64_12.png and b/imgs/icons/64_12.png differ diff --git a/imgs/icons/89_4.png b/imgs/icons/89_4.png index 2b7790645..f5134aee1 100644 Binary files a/imgs/icons/89_4.png and b/imgs/icons/89_4.png differ diff --git a/scripts/icons_update.py b/scripts/icons_update.py index a88ad4283..a466cf558 100644 --- a/scripts/icons_update.py +++ b/scripts/icons_update.py @@ -38,7 +38,8 @@ ITEM_CATEGORIES = ( 16, # Skill 18, # Drone 20, # Implant - 32 # Subsystem + 32, # Subsystem + 66 # Structure Module ) MARKET_ROOTS = { @@ -48,7 +49,8 @@ MARKET_ROOTS = { 11, # Ammo 1112, # Subsystems 24, # Implants & Boosters - 404 # Deployables + 404, # Deployables + 2202 # Structure Equipment } # Add children to market group list @@ -153,7 +155,7 @@ for fname in os.listdir(icons_dir): print fname,"exists" existing.add(fname) -# Get a list of all the icons currently available +# Get a list of all the icons currently available in export for dir in dirs: for fname in os.listdir(dir): if not os.path.isfile(os.path.join(dir, fname)): @@ -164,7 +166,7 @@ for dir in dirs: # convention without size specification sizeless = re.sub('^(?P[^_]+)_(?P\d+)_(?P[^_]+)$', r'\1_\3', stripped) # Often items referred to with 01_01 format, - fnames = export.setdefault(stripped.lower(), set()) + fnames = export.setdefault(sizeless.lower(), set()) fnames.add(fname) def crop_image(img):