diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index 17c66fe..75f736a 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -1468,7 +1468,7 @@ if settings.startup['PHI-CT'].value then item.icon = nil item.icon_size = nil item.icon_mipmaps = nil - item.localised_name = {'name.trash-pipe'} + item.localised_name = {'', {'name.trash-entity'}, {'entity-name.pipe'}} data:extend({item}) entity = table.deepcopy(data.raw['pipe']['pipe']) @@ -1487,7 +1487,7 @@ if settings.startup['PHI-CT'].value then end end - entity.localised_name = {'name.trash-pipe'} + entity.localised_name = {'', {'name.trash-entity'}, {'entity-name.pipe'}} data:extend({entity}) data:extend({{ @@ -1498,7 +1498,7 @@ if settings.startup['PHI-CT'].value then ingredients = {{type = 'item', name = 'iron-plate', amount = 1}}, results = {{type = 'item', name = item.name, amount = 1}}, main_product = item.name, - localised_name = {'name.trash-pipe'} + localised_name = {'', {'name.trash-entity'}, {'entity-name.pipe'}} }}) table.insert(data.raw.technology['automation'].effects, {type = 'unlock-recipe', recipe = item.name}) @@ -1508,7 +1508,7 @@ if settings.startup['PHI-CT'].value then item.place_result = item.name item.subgroup = 'energy' item.order = 'b[steam-power]-a[electric-boiler]' - item.localised_name = {'name.electric-boiler'} + item.localised_name = {'', {'name.electric-entity'}, {'entity-name.boiler'}} data:extend({item}) entity = table.deepcopy(data.raw['boiler']['boiler']) @@ -1532,7 +1532,7 @@ if settings.startup['PHI-CT'].value then entity.fire_flicker_enabled = false entity.fire_glow_flicker_enabled = false entity.fire = {} - entity.localised_name = {'name.electric-boiler'} + entity.localised_name = {'', {'name.electric-entity'}, {'entity-name.boiler'}} data:extend({entity}) data:extend({{ @@ -1543,7 +1543,7 @@ if settings.startup['PHI-CT'].value then ingredients = {{type = 'item', name = 'boiler', amount = 1}, {type = 'item', name = 'electronic-circuit', amount = 1}}, results = {{type = 'item', name = item.name, amount = 1}}, main_product = item.name, - localised_name = {'name.electric-boiler'} + localised_name = {'', {'name.electric-entity'}, {'entity-name.boiler'}} }}) data.raw['boiler']['boiler'].fast_replaceable_group = 'boiler' @@ -1555,7 +1555,7 @@ if settings.startup['PHI-CT'].value then item.place_result = item.name item.subgroup = 'storage' item.order = 'b[storage]-h[basic-' .. c .. ']' - item.localised_name = {'phi-cl.combine', {'name.basic-entity'}, {'name.' .. c}} + item.localised_name = {'', {'name.basic-entity'}, {'entity-name.' .. c}} data:extend({item}) entity = (c == 'steel-chest' and table.deepcopy(data.raw['container'][c])) or table.deepcopy(data.raw['logistic-container'][c]) @@ -1566,7 +1566,7 @@ if settings.startup['PHI-CT'].value then entity.quality_affects_inventory_size = false entity.max_logistic_slots = (c == 'steel-chest' and nil) or 1 entity.trash_inventory_size = (c == 'steel-chest' and nil) or 1 - entity.localised_name = {'phi-cl.combine', {'name.basic-entity'}, {'name.' .. c}} + entity.localised_name = {'', {'name.basic-entity'}, {'entity-name.' .. c}} data:extend({entity}) data:extend({{ @@ -1577,7 +1577,7 @@ if settings.startup['PHI-CT'].value then ingredients = {{type = 'item', name =c, amount = 1}}, results = {{type = 'item', name = item.name, amount = 1}}, main_product = item.name, - localised_name = {'phi-cl.combine', {'name.basic-entity'}, {'name.' .. c}} + localised_name = {'', {'name.basic-entity'}, {'entity-name.' .. c}} }}) end diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg index 770707f..2b0de96 100644 --- a/PHI-CL/locale/en/locale.cfg +++ b/PHI-CL/locale/en/locale.cfg @@ -1,7 +1,6 @@ [phi-cl] combine=__1__ __2__ combine-gen=__1__ MK__2__ -default=Default [name] basic-entity=Basic diff --git a/PHI-CL/locale/ja/locale.cfg b/PHI-CL/locale/ja/locale.cfg index 96d83cb..5e8a6cb 100644 --- a/PHI-CL/locale/ja/locale.cfg +++ b/PHI-CL/locale/ja/locale.cfg @@ -1,7 +1,6 @@ [phi-cl] combine=__1__ __2__ combine-gen=__1__ __2__代目 -default=デフォルト [name] basic-entity=基本的な diff --git a/PHI-CL/locale/zh-CN/locale.cfg b/PHI-CL/locale/zh-CN/locale.cfg index 1245760..26cc234 100644 --- a/PHI-CL/locale/zh-CN/locale.cfg +++ b/PHI-CL/locale/zh-CN/locale.cfg @@ -1,7 +1,6 @@ [phi-cl] combine=__1__ __2__ combine-gen=__1__ __2__代 -default=預設 [name] basic-entity=基本 diff --git a/PHI-CL/locale/zh-TW/locale.cfg b/PHI-CL/locale/zh-TW/locale.cfg index 1245760..26cc234 100644 --- a/PHI-CL/locale/zh-TW/locale.cfg +++ b/PHI-CL/locale/zh-TW/locale.cfg @@ -1,7 +1,6 @@ [phi-cl] combine=__1__ __2__ combine-gen=__1__ __2__代 -default=預設 [name] basic-entity=基本