diff --git a/eve.db b/eve.db index dabaaf2d2..055aa6091 100644 Binary files a/eve.db and b/eve.db differ diff --git a/imgs/icons/10886@1x.png b/imgs/icons/10886@1x.png new file mode 100644 index 000000000..bc33a7cea Binary files /dev/null and b/imgs/icons/10886@1x.png differ diff --git a/imgs/icons/10886@2x.png b/imgs/icons/10886@2x.png new file mode 100644 index 000000000..72b667cce Binary files /dev/null and b/imgs/icons/10886@2x.png differ diff --git a/imgs/icons/10887@1x.png b/imgs/icons/10887@1x.png new file mode 100644 index 000000000..0dc4ceb8d Binary files /dev/null and b/imgs/icons/10887@1x.png differ diff --git a/imgs/icons/10887@2x.png b/imgs/icons/10887@2x.png new file mode 100644 index 000000000..8a85f1071 Binary files /dev/null and b/imgs/icons/10887@2x.png differ diff --git a/imgs/icons/21981@1x.png b/imgs/icons/21981@1x.png deleted file mode 100644 index 38ba32ef5..000000000 Binary files a/imgs/icons/21981@1x.png and /dev/null differ diff --git a/imgs/icons/21981@2x.png b/imgs/icons/21981@2x.png deleted file mode 100644 index 218950733..000000000 Binary files a/imgs/icons/21981@2x.png and /dev/null differ diff --git a/imgs/icons/22042@1x.png b/imgs/icons/22042@1x.png new file mode 100644 index 000000000..ec2b2dd8e Binary files /dev/null and b/imgs/icons/22042@1x.png differ diff --git a/imgs/icons/22042@2x.png b/imgs/icons/22042@2x.png new file mode 100644 index 000000000..064a09a3d Binary files /dev/null and b/imgs/icons/22042@2x.png differ diff --git a/imgs/renders/11865@1x.png b/imgs/renders/11865@1x.png index afd8ac559..c5ce92f59 100644 Binary files a/imgs/renders/11865@1x.png and b/imgs/renders/11865@1x.png differ diff --git a/imgs/renders/11865@2x.png b/imgs/renders/11865@2x.png index 0f15fe5b5..9153f64d0 100644 Binary files a/imgs/renders/11865@2x.png and b/imgs/renders/11865@2x.png differ diff --git a/imgs/renders/1771@1x.png b/imgs/renders/1771@1x.png index cbfa225c0..594a31207 100644 Binary files a/imgs/renders/1771@1x.png and b/imgs/renders/1771@1x.png differ diff --git a/imgs/renders/1771@2x.png b/imgs/renders/1771@2x.png index 93a87718d..a537d8778 100644 Binary files a/imgs/renders/1771@2x.png and b/imgs/renders/1771@2x.png differ diff --git a/imgs/renders/1784@1x.png b/imgs/renders/1784@1x.png index 317f897e0..c7e1587de 100644 Binary files a/imgs/renders/1784@1x.png and b/imgs/renders/1784@1x.png differ diff --git a/imgs/renders/1784@2x.png b/imgs/renders/1784@2x.png index 8b704d704..1579a3866 100644 Binary files a/imgs/renders/1784@2x.png and b/imgs/renders/1784@2x.png differ diff --git a/imgs/renders/1824@1x.png b/imgs/renders/1824@1x.png index 2746fc8ac..3c39a4920 100644 Binary files a/imgs/renders/1824@1x.png and b/imgs/renders/1824@1x.png differ diff --git a/imgs/renders/1824@2x.png b/imgs/renders/1824@2x.png index 5cf64b3aa..caf7fe570 100644 Binary files a/imgs/renders/1824@2x.png and b/imgs/renders/1824@2x.png differ diff --git a/imgs/renders/1840@1x.png b/imgs/renders/1840@1x.png index 5b829445b..d66c9ea5f 100644 Binary files a/imgs/renders/1840@1x.png and b/imgs/renders/1840@1x.png differ diff --git a/imgs/renders/1840@2x.png b/imgs/renders/1840@2x.png index 4d8350c65..188428352 100644 Binary files a/imgs/renders/1840@2x.png and b/imgs/renders/1840@2x.png differ diff --git a/imgs/renders/20137@1x.png b/imgs/renders/20137@1x.png index 50b114455..f3e96ae7a 100644 Binary files a/imgs/renders/20137@1x.png and b/imgs/renders/20137@1x.png differ diff --git a/imgs/renders/20137@2x.png b/imgs/renders/20137@2x.png index 78c64a8dd..1779892e0 100644 Binary files a/imgs/renders/20137@2x.png and b/imgs/renders/20137@2x.png differ diff --git a/imgs/renders/21052@1x.png b/imgs/renders/21052@1x.png index 18f36ce65..5ae1cc314 100644 Binary files a/imgs/renders/21052@1x.png and b/imgs/renders/21052@1x.png differ diff --git a/imgs/renders/21052@2x.png b/imgs/renders/21052@2x.png index 0da5c8fab..88fe72edc 100644 Binary files a/imgs/renders/21052@2x.png and b/imgs/renders/21052@2x.png differ diff --git a/imgs/renders/21217@1x.png b/imgs/renders/21217@1x.png index 243cc6fb6..1db6f4399 100644 Binary files a/imgs/renders/21217@1x.png and b/imgs/renders/21217@1x.png differ diff --git a/imgs/renders/21217@2x.png b/imgs/renders/21217@2x.png index dd6595460..9f33cae74 100644 Binary files a/imgs/renders/21217@2x.png and b/imgs/renders/21217@2x.png differ diff --git a/imgs/renders/21280@1x.png b/imgs/renders/21280@1x.png index 551b3fcee..a69ccc58f 100644 Binary files a/imgs/renders/21280@1x.png and b/imgs/renders/21280@1x.png differ diff --git a/imgs/renders/21280@2x.png b/imgs/renders/21280@2x.png index 60591d1c2..8e71c1f4e 100644 Binary files a/imgs/renders/21280@2x.png and b/imgs/renders/21280@2x.png differ diff --git a/imgs/renders/2160@1x.png b/imgs/renders/2160@1x.png index 9672f7bc9..3699c211a 100644 Binary files a/imgs/renders/2160@1x.png and b/imgs/renders/2160@1x.png differ diff --git a/imgs/renders/2160@2x.png b/imgs/renders/2160@2x.png index 92879afed..3b02baf32 100644 Binary files a/imgs/renders/2160@2x.png and b/imgs/renders/2160@2x.png differ diff --git a/imgs/renders/21766@1x.png b/imgs/renders/21766@1x.png index 1c86ba6dd..c4dacd372 100644 Binary files a/imgs/renders/21766@1x.png and b/imgs/renders/21766@1x.png differ diff --git a/imgs/renders/21766@2x.png b/imgs/renders/21766@2x.png index 02087abae..746d9f943 100644 Binary files a/imgs/renders/21766@2x.png and b/imgs/renders/21766@2x.png differ diff --git a/imgs/renders/21864@1x.png b/imgs/renders/21864@1x.png index 8efe3b7e2..55b34dc6a 100644 Binary files a/imgs/renders/21864@1x.png and b/imgs/renders/21864@1x.png differ diff --git a/imgs/renders/21864@2x.png b/imgs/renders/21864@2x.png index 458bfc02f..c3f37a42e 100644 Binary files a/imgs/renders/21864@2x.png and b/imgs/renders/21864@2x.png differ diff --git a/imgs/renders/21976@1x.png b/imgs/renders/21976@1x.png index c52f0aa6b..29d5502a0 100644 Binary files a/imgs/renders/21976@1x.png and b/imgs/renders/21976@1x.png differ diff --git a/imgs/renders/21976@2x.png b/imgs/renders/21976@2x.png index 93f7ddb54..96ba704b8 100644 Binary files a/imgs/renders/21976@2x.png and b/imgs/renders/21976@2x.png differ diff --git a/imgs/renders/21993@1x.png b/imgs/renders/21993@1x.png index 5269a530f..dd556f7e5 100644 Binary files a/imgs/renders/21993@1x.png and b/imgs/renders/21993@1x.png differ diff --git a/imgs/renders/21993@2x.png b/imgs/renders/21993@2x.png index b008a7731..613f33632 100644 Binary files a/imgs/renders/21993@2x.png and b/imgs/renders/21993@2x.png differ diff --git a/imgs/renders/22007@1x.png b/imgs/renders/22007@1x.png index d5861b6fd..9fd047486 100644 Binary files a/imgs/renders/22007@1x.png and b/imgs/renders/22007@1x.png differ diff --git a/imgs/renders/22007@2x.png b/imgs/renders/22007@2x.png index 4c9328c8c..4f7daa73d 100644 Binary files a/imgs/renders/22007@2x.png and b/imgs/renders/22007@2x.png differ diff --git a/imgs/renders/22142@1x.png b/imgs/renders/22142@1x.png index 9697779ee..bbd81ce5a 100644 Binary files a/imgs/renders/22142@1x.png and b/imgs/renders/22142@1x.png differ diff --git a/imgs/renders/22142@2x.png b/imgs/renders/22142@2x.png index 3e60c06f3..b2dfe5322 100644 Binary files a/imgs/renders/22142@2x.png and b/imgs/renders/22142@2x.png differ diff --git a/imgs/renders/22150@1x.png b/imgs/renders/22150@1x.png index 3124c9d54..3f0a62a40 100644 Binary files a/imgs/renders/22150@1x.png and b/imgs/renders/22150@1x.png differ diff --git a/imgs/renders/22150@2x.png b/imgs/renders/22150@2x.png index 4646d5363..750a4aad6 100644 Binary files a/imgs/renders/22150@2x.png and b/imgs/renders/22150@2x.png differ diff --git a/imgs/renders/22161@1x.png b/imgs/renders/22161@1x.png index 24bd5f37a..2d5a611d2 100644 Binary files a/imgs/renders/22161@1x.png and b/imgs/renders/22161@1x.png differ diff --git a/imgs/renders/22161@2x.png b/imgs/renders/22161@2x.png index 80162ef01..26f32ac08 100644 Binary files a/imgs/renders/22161@2x.png and b/imgs/renders/22161@2x.png differ diff --git a/imgs/renders/22189@1x.png b/imgs/renders/22189@1x.png index d60a33c87..b247ba1a4 100644 Binary files a/imgs/renders/22189@1x.png and b/imgs/renders/22189@1x.png differ diff --git a/imgs/renders/22189@2x.png b/imgs/renders/22189@2x.png index 9330dd283..b6fff3a88 100644 Binary files a/imgs/renders/22189@2x.png and b/imgs/renders/22189@2x.png differ diff --git a/imgs/renders/22233@1x.png b/imgs/renders/22233@1x.png new file mode 100644 index 000000000..22c110277 Binary files /dev/null and b/imgs/renders/22233@1x.png differ diff --git a/imgs/renders/22233@2x.png b/imgs/renders/22233@2x.png new file mode 100644 index 000000000..a33bc7820 Binary files /dev/null and b/imgs/renders/22233@2x.png differ diff --git a/imgs/renders/22234@1x.png b/imgs/renders/22234@1x.png new file mode 100644 index 000000000..27ffbbbd0 Binary files /dev/null and b/imgs/renders/22234@1x.png differ diff --git a/imgs/renders/22234@2x.png b/imgs/renders/22234@2x.png new file mode 100644 index 000000000..00dde9e58 Binary files /dev/null and b/imgs/renders/22234@2x.png differ diff --git a/imgs/renders/2642@1x.png b/imgs/renders/2642@1x.png index 22781db4f..0385a2fd2 100644 Binary files a/imgs/renders/2642@1x.png and b/imgs/renders/2642@1x.png differ diff --git a/imgs/renders/2642@2x.png b/imgs/renders/2642@2x.png index bcc1f5c89..827b32d53 100644 Binary files a/imgs/renders/2642@2x.png and b/imgs/renders/2642@2x.png differ diff --git a/imgs/renders/2737@1x.png b/imgs/renders/2737@1x.png index b52180477..fd4694f0c 100644 Binary files a/imgs/renders/2737@1x.png and b/imgs/renders/2737@1x.png differ diff --git a/imgs/renders/2737@2x.png b/imgs/renders/2737@2x.png index b0de175c7..48c2b48c4 100644 Binary files a/imgs/renders/2737@2x.png and b/imgs/renders/2737@2x.png differ diff --git a/imgs/renders/2930@1x.png b/imgs/renders/2930@1x.png index cb53959f7..38633f3c3 100644 Binary files a/imgs/renders/2930@1x.png and b/imgs/renders/2930@1x.png differ diff --git a/imgs/renders/2930@2x.png b/imgs/renders/2930@2x.png index ef9fe0fa3..0fa786dfa 100644 Binary files a/imgs/renders/2930@2x.png and b/imgs/renders/2930@2x.png differ diff --git a/imgs/renders/301@1x.png b/imgs/renders/301@1x.png index 7289b5453..ca566e6b9 100644 Binary files a/imgs/renders/301@1x.png and b/imgs/renders/301@1x.png differ diff --git a/imgs/renders/301@2x.png b/imgs/renders/301@2x.png index 4ef0ded7c..de7f133cf 100644 Binary files a/imgs/renders/301@2x.png and b/imgs/renders/301@2x.png differ diff --git a/imgs/renders/3205@1x.png b/imgs/renders/3205@1x.png index 322d9d27a..eee980b50 100644 Binary files a/imgs/renders/3205@1x.png and b/imgs/renders/3205@1x.png differ diff --git a/imgs/renders/3205@2x.png b/imgs/renders/3205@2x.png index 746e554e8..967ee07f5 100644 Binary files a/imgs/renders/3205@2x.png and b/imgs/renders/3205@2x.png differ diff --git a/imgs/renders/3207@1x.png b/imgs/renders/3207@1x.png index 769c51579..72621e35d 100644 Binary files a/imgs/renders/3207@1x.png and b/imgs/renders/3207@1x.png differ diff --git a/imgs/renders/3207@2x.png b/imgs/renders/3207@2x.png index 662c6bf83..df46f232d 100644 Binary files a/imgs/renders/3207@2x.png and b/imgs/renders/3207@2x.png differ diff --git a/imgs/renders/3353@1x.png b/imgs/renders/3353@1x.png index ee643cfa1..0b5a566e6 100644 Binary files a/imgs/renders/3353@1x.png and b/imgs/renders/3353@1x.png differ diff --git a/imgs/renders/3353@2x.png b/imgs/renders/3353@2x.png index 9a1d32154..4ab820b78 100644 Binary files a/imgs/renders/3353@2x.png and b/imgs/renders/3353@2x.png differ diff --git a/imgs/renders/3354@1x.png b/imgs/renders/3354@1x.png index 5137bb437..4f06805cc 100644 Binary files a/imgs/renders/3354@1x.png and b/imgs/renders/3354@1x.png differ diff --git a/imgs/renders/3354@2x.png b/imgs/renders/3354@2x.png index 8152458ba..8fd971282 100644 Binary files a/imgs/renders/3354@2x.png and b/imgs/renders/3354@2x.png differ diff --git a/imgs/renders/3356@1x.png b/imgs/renders/3356@1x.png index a24de44ec..70dbdf5a8 100644 Binary files a/imgs/renders/3356@1x.png and b/imgs/renders/3356@1x.png differ diff --git a/imgs/renders/3356@2x.png b/imgs/renders/3356@2x.png index 65a7e4bc5..1d5f6c266 100644 Binary files a/imgs/renders/3356@2x.png and b/imgs/renders/3356@2x.png differ diff --git a/imgs/renders/3360@1x.png b/imgs/renders/3360@1x.png index bb2a89a6c..9f2d144c7 100644 Binary files a/imgs/renders/3360@1x.png and b/imgs/renders/3360@1x.png differ diff --git a/imgs/renders/3360@2x.png b/imgs/renders/3360@2x.png index 706cdb9d9..20f7e1684 100644 Binary files a/imgs/renders/3360@2x.png and b/imgs/renders/3360@2x.png differ diff --git a/imgs/renders/41@1x.png b/imgs/renders/41@1x.png index 935f3daef..71ab534ae 100644 Binary files a/imgs/renders/41@1x.png and b/imgs/renders/41@1x.png differ diff --git a/imgs/renders/41@2x.png b/imgs/renders/41@2x.png index 7272f4b4f..9bc8a9601 100644 Binary files a/imgs/renders/41@2x.png and b/imgs/renders/41@2x.png differ diff --git a/imgs/renders/48@1x.png b/imgs/renders/48@1x.png index 275d097c6..9de44dde9 100644 Binary files a/imgs/renders/48@1x.png and b/imgs/renders/48@1x.png differ diff --git a/imgs/renders/48@2x.png b/imgs/renders/48@2x.png index 6740c0cff..eb69a54f5 100644 Binary files a/imgs/renders/48@2x.png and b/imgs/renders/48@2x.png differ diff --git a/imgs/renders/49@1x.png b/imgs/renders/49@1x.png index 9fd16706e..2cde9edcd 100644 Binary files a/imgs/renders/49@1x.png and b/imgs/renders/49@1x.png differ diff --git a/imgs/renders/49@2x.png b/imgs/renders/49@2x.png index d0834d761..c06572017 100644 Binary files a/imgs/renders/49@2x.png and b/imgs/renders/49@2x.png differ diff --git a/imgs/renders/59@1x.png b/imgs/renders/59@1x.png index 3fafda545..4a97e584f 100644 Binary files a/imgs/renders/59@1x.png and b/imgs/renders/59@1x.png differ diff --git a/imgs/renders/59@2x.png b/imgs/renders/59@2x.png index a67933fc7..1150ec746 100644 Binary files a/imgs/renders/59@2x.png and b/imgs/renders/59@2x.png differ diff --git a/imgs/renders/61@1x.png b/imgs/renders/61@1x.png index 169752d86..8be84d9a0 100644 Binary files a/imgs/renders/61@1x.png and b/imgs/renders/61@1x.png differ diff --git a/imgs/renders/61@2x.png b/imgs/renders/61@2x.png index a8fb1189e..3b5694ffd 100644 Binary files a/imgs/renders/61@2x.png and b/imgs/renders/61@2x.png differ diff --git a/scripts/icons_update.py b/scripts/icons_update.py index 2443b6ed4..50945ff1c 100644 --- a/scripts/icons_update.py +++ b/scripts/icons_update.py @@ -65,8 +65,8 @@ graphics = graphicIDsLoader.load(os.path.join(to_path, 'graphicIDs.fsdbinary')) graphics_py_ob = {} for x, v in graphics.items(): - if hasattr(v, 'iconFolder'): - graphics_py_ob[x] = v.iconFolder + if hasattr(v, 'iconInfo') and hasattr(v.iconInfo, 'folder'): + graphics_py_ob[x] = v.iconInfo.folder # Add children to market group list # {parent: {children}} @@ -230,7 +230,11 @@ if toadd: print(('Adding {} icons...'.format(len(toadd)))) missing = set() for fname in sorted(toadd): - key = graphics_py_ob[int(fname)] + try: + key = graphics_py_ob[int(fname)] + except KeyError: + print("Can't find graphicID {}".format(fname)) + key = "{}/{}_64.png".format(key, fname) for i in range(2):