diff --git a/eos b/eos index 0fa72ad05..ed6c0c124 160000 --- a/eos +++ b/eos @@ -1 +1 @@ -Subproject commit 0fa72ad054e2bae40995da966566b1eb49578445 +Subproject commit ed6c0c124f737dfbe17a76db799f74bfa81f81b4 diff --git a/service/market.py b/service/market.py index f2a7ecee5..7cc214339 100644 --- a/service/market.py +++ b/service/market.py @@ -217,7 +217,8 @@ class Market(): "Iteron Mark IV Quafe Ultramarine Edition": False, # Vanity "Iteron Mark IV Amastris Edition": False, # Vanity "Goru's Shuttle": False, # Vanity - "Guristas Shuttle": False } # Vanity + "Guristas Shuttle": False, # Vanity + "Tash-Murkon Magnate": False } # Vanity # List of groups which are forcibly published self.GROUPS_FORCEPUBLISHED = { @@ -244,10 +245,10 @@ class Market(): # Dictionary of items with forced market group (service assumes they have no # market group assigned in db, otherwise they'll appear in both original and forced groups) self.ITEMS_FORCEDMARKETGROUP = { - "'Alpha' Codebreaker I": 714, # Ship Equipment > Electronics and Sensor Upgrades > Scanners > Data and Composition Scanners - "'Codex' Codebreaker I": 714, # Ship Equipment > Electronics and Sensor Upgrades > Scanners > Data and Composition Scanners - "'Daemon' Codebreaker I": 714, # Ship Equipment > Electronics and Sensor Upgrades > Scanners > Data and Composition Scanners - "'Libram' Codebreaker I": 714, # Ship Equipment > Electronics and Sensor Upgrades > Scanners > Data and Composition Scanners + "'Alpha' Data Analyzer I": 714, # Ship Equipment > Electronics and Sensor Upgrades > Scanners > Data and Composition Scanners + "'Codex' Data Analyzer I": 714, # Ship Equipment > Electronics and Sensor Upgrades > Scanners > Data and Composition Scanners + "'Daemon' Data Analyzer I": 714, # Ship Equipment > Electronics and Sensor Upgrades > Scanners > Data and Composition Scanners + "'Libram' Data Analyzer I": 714, # Ship Equipment > Electronics and Sensor Upgrades > Scanners > Data and Composition Scanners "Advanced Cerebral Accelerator": 977, # Implants & Boosters > Booster "Civilian Damage Control": 760, # Ship Equipment > Civilian Modules "Civilian EM Ward Field": 760, # Ship Equipment > Civilian Modules diff --git a/staticdata b/staticdata index aae9a0366..5aedabd1e 160000 --- a/staticdata +++ b/staticdata @@ -1 +1 @@ -Subproject commit aae9a03665da3cb07704a96995e93d92270a95de +Subproject commit 5aedabd1e8bd4112791e985977742edfb50f965a