diff --git a/client/ext-resources/all/world.xml b/client/ext-resources/all/world.xml index 90150e8..552e348 100644 --- a/client/ext-resources/all/world.xml +++ b/client/ext-resources/all/world.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/client/src/main/resources/lang/locale.properties b/client/src/main/resources/lang/locale.properties index b98954d..033374b 100644 --- a/client/src/main/resources/lang/locale.properties +++ b/client/src/main/resources/lang/locale.properties @@ -180,14 +180,17 @@ item.cryolite=Cryolite item.gallite=Gallite item.goslarite=Goslarite item.indite=Indite +item.jadeite=Jadeite item.lepidolite=Lepidolite item.lithium_hydroxide=Lithium Hydroxide item.low_temperature_diamond=Low Temperature Diamond item.methane_clathrate=Methane Clathrate item.methanol_monohydrate_crystals=Methanol Monohydrate +item.moissanite=Moissanite item.painite=Painite item.pyrophyllite=Pyrophyllite item.rutile=Rutile +item.taaffeite=Taaffeite item.uraninite=Uraninite item.group.salvage=Salvage item.sap8corecontainer=Sap 8 Core Container diff --git a/client/src/main/resources/lang/locale_ru_RU_FULL.properties b/client/src/main/resources/lang/locale_ru_RU_FULL.properties index d7bc4eb..82df33c 100644 --- a/client/src/main/resources/lang/locale_ru_RU_FULL.properties +++ b/client/src/main/resources/lang/locale_ru_RU_FULL.properties @@ -182,14 +182,17 @@ item.cryolite=\u041A\u0440\u0438\u043E\u043B\u0438\u0442 item.gallite=\u0413\u0430\u043B\u043B\u0438\u0442 item.goslarite=\u0413\u043E\u0441\u043B\u0430\u0440\u0438\u0442 item.indite=\u0418\u043D\u0434\u0438\u0442 +item.jadeite=\u0416\u0430\u0434\u0435\u0438\u0442 item.lepidolite=\u041B\u0435\u043F\u0438\u0434\u043E\u043B\u0438\u0442 item.lithium_hydroxide=\u0413\u0438\u0434\u0440\u043E\u043A\u0441\u0438\u0434 \u043B\u0438\u0442\u0438\u044F item.low_temperature_diamond=\u041D\u0438\u0437\u043A\u043E\u0442\u0435\u043C\u043F\u0435\u0440\u0430\u0442\u0443\u0440\u043D\u044B\u0439 \u0430\u043B\u043C\u0430\u0437 item.methane_clathrate=\u041A\u043B\u0430\u0442\u0440\u0430\u0442 \u043C\u0435\u0442\u0430\u043D\u0430 item.methanol_monohydrate_crystals=\u041A\u0440\u0438\u0441\u0442\u0430\u043B\u043B\u044B \u043C\u043E\u043D\u043E\u0433\u0438\u0434\u0440\u0430\u0442\u0430 \u043C\u0435\u0442\u0430\u043D\u043E\u043B\u0430 +item.moissanite=\u041C\u0443\u0430\u0441\u0441\u0430\u043D\u0438\u0442 item.painite=\u041F\u0435\u0439\u043D\u0438\u0442 item.pyrophyllite=\u041F\u0438\u0440\u043E\u0444\u0438\u043B\u043B\u0438\u0442 item.rutile=\u0420\u0443\u0442\u0438\u043B +item.taaffeite=\u0422\u0430\u0430\u0444\u0444\u0435\u0438\u0442 item.uraninite=\u0423\u0440\u0430\u043D\u0438\u043D\u0438\u0442 item.group.salvage=\u0421\u043F\u0430\u0441\u0435\u043D\u043D\u043E\u0435 \u0438\u043C\u0443\u0449\u0435\u0441\u0442\u0432\u043E item.sap8corecontainer=\u041A\u043E\u043D\u0442\u0435\u0439\u043D\u0435\u0440 SAP 8 Core diff --git a/utils/src/main/java/ru/trader/edce/Converter.java b/utils/src/main/java/ru/trader/edce/Converter.java index ce63f3c..b469105 100644 --- a/utils/src/main/java/ru/trader/edce/Converter.java +++ b/utils/src/main/java/ru/trader/edce/Converter.java @@ -152,7 +152,9 @@ public class Converter { ITEM_ID.put(128673874L, "ion_distributor"); ITEM_ID.put(128673871L, "nanobreakers"); ITEM_ID.put(128673872L, "telemetry_suite"); - + ITEM_ID.put(128672776L, "jadeite"); + ITEM_ID.put(128672296L, "moissanite"); + ITEM_ID.put(128672775L, "taaffeite"); GROUP_ID.put("Chemicals", "chemicals"); GROUP_ID.put("Consumer Items", "consumer_items"); GROUP_ID.put("Foods", "foods"); diff --git a/utils/src/main/java/ru/trader/maddavo/ItemConverter.java b/utils/src/main/java/ru/trader/maddavo/ItemConverter.java index 0523556..228cb1a 100644 --- a/utils/src/main/java/ru/trader/maddavo/ItemConverter.java +++ b/utils/src/main/java/ru/trader/maddavo/ItemConverter.java @@ -162,7 +162,9 @@ public class ItemConverter { IDS.put("Ion Distributor", "ion_distributor"); IDS.put("Nanobreakers", "nanobreakers"); IDS.put("Telemetry Suite", "telemetry_suite"); - + IDS.put("Jadeite", "jadeite"); + IDS.put("Moissanite", "moissanite"); + IDS.put("Taaffeite", "taaffeite"); } public static String getItemId(String name){