From 7d0cef7fe06f0b48ae7fae87ebd7a6bdc1e298b8 Mon Sep 17 00:00:00 2001 From: Marximus Maximus Date: Mon, 21 Feb 2022 18:11:05 -0800 Subject: [PATCH 1/3] Reading of more types of recipes --- .vscode/settings.json | 5 +++++ crafting_combinator/changelog.txt | 7 +++++++ crafting_combinator/config.lua | 1 + crafting_combinator/data.lua | 2 +- crafting_combinator/info.json | 4 ++-- crafting_combinator/locale/cs/cs.cfg | 1 + crafting_combinator/locale/de/de.cfg | 1 + crafting_combinator/locale/en/en.cfg | 1 + crafting_combinator/migrations/0.17.0.lua | 11 ++++++++++ crafting_combinator/script/cc.lua | 25 ++++++++++++++++++++--- 10 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 crafting_combinator/migrations/0.17.0.lua diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..e363135 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "files.eol": "\n", + "files.insertFinalNewline": true, + "files.trimFinalNewlines": true +} diff --git a/crafting_combinator/changelog.txt b/crafting_combinator/changelog.txt index 402a3ab..a374cfa 100644 --- a/crafting_combinator/changelog.txt +++ b/crafting_combinator/changelog.txt @@ -1,4 +1,11 @@ --------------------------------------------------------------------------------------------------- +Version: 0.17.0 +Date: 11. 23. 2021 + Features: + - Crafting combinator can now read and output ingredients of set recipe (new setting) + - Crafting combinator can now read from rocket silos + - Crafting combinator can now read product and ingredients for machines that have fixed (static) recipes (like a rocket silo and modded assemblers) +--------------------------------------------------------------------------------------------------- Version: 0.16.3 Date: 11. 12. 2021 Changes: diff --git a/crafting_combinator/config.lua b/crafting_combinator/config.lua index 9512f34..e400370 100644 --- a/crafting_combinator/config.lua +++ b/crafting_combinator/config.lua @@ -23,6 +23,7 @@ return { read_recipe = true, read_speed = false, read_bottleneck = false, + read_ingredients = false, }, RC_DEFAULT_SETTINGS = { mode = 'ing', diff --git a/crafting_combinator/data.lua b/crafting_combinator/data.lua index 344ed71..00784ed 100644 --- a/crafting_combinator/data.lua +++ b/crafting_combinator/data.lua @@ -8,7 +8,7 @@ local cc = table.deepcopy(data.raw['constant-combinator']['constant-combinator'] cc.name = config.CC_NAME cc.icon = '__crafting_combinator__/graphics/icon-crafting-combinator.png' cc.icon_size = 32 -cc.item_slot_count = 3 +cc.item_slot_count = 255 cc.minable.result = cc.name table.insert(cc.flags, 'not-deconstructable') diff --git a/crafting_combinator/info.json b/crafting_combinator/info.json index 63a9ce3..de3ac5a 100644 --- a/crafting_combinator/info.json +++ b/crafting_combinator/info.json @@ -1,9 +1,9 @@ { "name": "crafting_combinator", - "version": "0.16.3", + "version": "0.17.0", "factorio_version": "1.1", "title": "Crafting Combinator", - "author": "LuziferSenpai and TheRustyKnife", + "author": "LuziferSenpai, TheRustyKnife, MarximusMaximus", "description": "Includes combinators that allow you to set or read the recipe of any crafting machine, get ingredients or products of a recipe and more!", "dependencies": ["base", "rusty-locale"] } diff --git a/crafting_combinator/locale/cs/cs.cfg b/crafting_combinator/locale/cs/cs.cfg index abf5b4b..5d0bd90 100644 --- a/crafting_combinator/locale/cs/cs.cfg +++ b/crafting_combinator/locale/cs/cs.cfg @@ -52,6 +52,7 @@ empty-inserters=Vyprazdňovat překladače (zamezuje zasekávání) read-recipe=Číst aktuální recept read-speed=Číst rychlost výrobny read-machine-status=Číst status výrobny +read-ingredients=Číst ingredience výrobny multiply-by-input=Vynásobit výsledky vstupní hodnotou multiply-by-input:tooltip=Každý výstupní signál bude před nastavením na výstup vynásoben hodnotou vybraného vstupního signálu divide-by-output=Vydělit výsledky počtem produktu/ingredience diff --git a/crafting_combinator/locale/de/de.cfg b/crafting_combinator/locale/de/de.cfg index 6e1b55f..4079ac7 100644 --- a/crafting_combinator/locale/de/de.cfg +++ b/crafting_combinator/locale/de/de.cfg @@ -46,6 +46,7 @@ discard-fluids=Flüssigkeiten verwerfen empty-inserters=Greifer leeren (verhindert Blockierungen) read-speed=Herstellungsgeschwindigkeit auslesen read-machine-status=Status auslesen +read-ingredients=Zutaten auslesen multiply-by-input=Ergebnisse mit der Einganssignalstärke multiplizieren multiply-by-input:tooltip=Mulpiziert jedes Signal mit der Signalstärke des ausgewählten Einganssignals bevor es ausgegeben wird divide-by-output=Ergebnisse durch die Menge im Rezept teilen diff --git a/crafting_combinator/locale/en/en.cfg b/crafting_combinator/locale/en/en.cfg index 5926cd4..16dadaf 100644 --- a/crafting_combinator/locale/en/en.cfg +++ b/crafting_combinator/locale/en/en.cfg @@ -56,6 +56,7 @@ empty-inserters=Empty inserters' hands (prevents jamming) read-recipe=Read the current recipe read-speed=Read the machine's crafting speed read-machine-status=Read machine status +read-ingredients=Read ingredients multiply-by-input=Multiply results by input count multiply-by-input:tooltip=Take each resulting signal and multiply it by the strength of the chosen input signal before outputting it divide-by-output=Divide results by product/ingredient count diff --git a/crafting_combinator/migrations/0.17.0.lua b/crafting_combinator/migrations/0.17.0.lua new file mode 100644 index 0000000..23ddfa9 --- /dev/null +++ b/crafting_combinator/migrations/0.17.0.lua @@ -0,0 +1,11 @@ +if not late_migrations then return end + +local config = require 'config' +local cc_control = require 'script.cc' +local settings_parser = require 'script.settings-parser' + + +log("Adding missing settings to combinators...") +for _, combinator in pairs(global.cc.data) do + settings_parser.fill_defaults(combinator.settings, config.CC_DEFAULT_SETTINGS) +end diff --git a/crafting_combinator/script/cc.lua b/crafting_combinator/script/cc.lua index 3319a1c..1be5ba1 100644 --- a/crafting_combinator/script/cc.lua +++ b/crafting_combinator/script/cc.lua @@ -39,6 +39,7 @@ _M.settings_parser = settings_parser { read_speed = {'s', 'bool'}, read_machine_status = {'st', 'bool'}, wait_for_output_to_clear = {'wo', 'bool'}, + read_ingredients = {'ing', 'bool'}, } @@ -194,6 +195,7 @@ function _M:update() if self.settings.read_recipe then self:read_recipe(params); end if self.settings.read_speed then self:read_speed(params); end if self.settings.read_machine_status then self:read_machine_status(params); end + if self.settings.read_ingredients then self:read_ingredients(params); end end end @@ -223,6 +225,7 @@ function _M:open(player_index) gui.checkbox('read-recipe', self.settings.read_recipe), gui.checkbox('read-speed', self.settings.read_speed), gui.checkbox('read-machine-status', self.settings.read_machine_status), + gui.checkbox('read-ingredients', self.settings.read_ingredients), } }):open(player_index) @@ -259,6 +262,7 @@ function _M:update_disabled_checkboxes(root) self:disable_checkbox(root, 'misc:read-recipe', 'r') self:disable_checkbox(root, 'misc:read-speed', 'r') self:disable_checkbox(root, 'misc:read-machine-status', 'r') + self:disable_checkbox(root, 'misc:read-ingredients', 'r') end function _M:disable_checkbox(root, name, mode) @@ -313,6 +317,21 @@ function _M:read_machine_status(params) }) end +function _M:read_ingredients(params) + local recipe = self.assembler.get_recipe() + if recipe then + local append_index = 4 + for k, v in pairs(recipe.ingredients) do + table.insert(params, { + signal = recipe_selector.get_signal(v.name), + count = v.amount, + index = append_index, + }) + append_index = append_index + 1 + end + end +end + function _M:set_recipe() local changed, recipe if self.settings.craft_until_zero then @@ -496,9 +515,9 @@ end function _M:find_assembler(assembler_to_ignore) self.assembler = self.entity.surface.find_entities_filtered { position = util.position(self.entity.position):shift(self.entity.direction, config.ASSEMBLER_DISTANCE), - type = 'assembling-machine', - }[1] - if self.assembler and (self.assembler == assembler_to_ignore or self.assembler.prototype.fixed_recipe) then + type = {'assembling-machine', 'rocket-silo'}, + }[1] + if self.assembler and (self.assembler == assembler_to_ignore) then self.assembler = nil end From 6a7be80e29ffeb49cdc1af12fdce60ab299e4858 Mon Sep 17 00:00:00 2001 From: Marximus Maximus Date: Thu, 24 Feb 2022 15:13:59 -0800 Subject: [PATCH 2/3] Renaming from crafting_combinator to crafting-combinator-extended --- .../changelog.txt | 0 .../config.lua | 0 .../control.lua | 0 .../data-final-fixes.lua | 0 .../data.lua | 0 .../graphics/entities.png | Bin .../graphics/hr-combinator-displays.png | Bin .../graphics/icon-crafting-combinator.png | Bin .../graphics/recipe-book.png | Bin .../graphics/speed-icon.png | Bin .../graphics/trans.png | Bin .../info.json | 4 ++-- .../locale/cs/cs.cfg | 0 .../locale/de/de.cfg | 0 .../locale/en/en.cfg | 0 .../migrations/0.10.12.lua | 0 .../migrations/0.10.16.lua | 0 .../migrations/0.10.8.lua | 0 .../migrations/0.11.2.lua | 0 .../migrations/0.13.1.lua | 0 .../migrations/0.13.3.lua | 0 .../migrations/0.15.0.lua | 0 .../migrations/0.15.2.lua | 0 .../migrations/0.17.0.lua | 0 .../script/bootstrap.lua | 0 .../script/cc.lua | 0 .../script/gui.lua | 0 .../script/rc.lua | 0 .../script/recipe-selector.lua | 0 .../script/semver.lua | 0 .../script/settings-parser.lua | 0 .../script/signals.lua | 0 .../script/util.lua | 0 .../settings.lua | 0 .../thumbnail.png | Bin 35 files changed, 2 insertions(+), 2 deletions(-) rename {crafting_combinator => crafting-combinator-extended}/changelog.txt (100%) rename {crafting_combinator => crafting-combinator-extended}/config.lua (100%) rename {crafting_combinator => crafting-combinator-extended}/control.lua (100%) rename {crafting_combinator => crafting-combinator-extended}/data-final-fixes.lua (100%) rename {crafting_combinator => crafting-combinator-extended}/data.lua (100%) rename {crafting_combinator => crafting-combinator-extended}/graphics/entities.png (100%) rename {crafting_combinator => crafting-combinator-extended}/graphics/hr-combinator-displays.png (100%) rename {crafting_combinator => crafting-combinator-extended}/graphics/icon-crafting-combinator.png (100%) rename {crafting_combinator => crafting-combinator-extended}/graphics/recipe-book.png (100%) rename {crafting_combinator => crafting-combinator-extended}/graphics/speed-icon.png (100%) rename {crafting_combinator => crafting-combinator-extended}/graphics/trans.png (100%) rename {crafting_combinator => crafting-combinator-extended}/info.json (78%) rename {crafting_combinator => crafting-combinator-extended}/locale/cs/cs.cfg (100%) rename {crafting_combinator => crafting-combinator-extended}/locale/de/de.cfg (100%) rename {crafting_combinator => crafting-combinator-extended}/locale/en/en.cfg (100%) rename {crafting_combinator => crafting-combinator-extended}/migrations/0.10.12.lua (100%) rename {crafting_combinator => crafting-combinator-extended}/migrations/0.10.16.lua (100%) rename {crafting_combinator => crafting-combinator-extended}/migrations/0.10.8.lua (100%) rename {crafting_combinator => crafting-combinator-extended}/migrations/0.11.2.lua (100%) rename {crafting_combinator => crafting-combinator-extended}/migrations/0.13.1.lua (100%) rename {crafting_combinator => crafting-combinator-extended}/migrations/0.13.3.lua (100%) rename {crafting_combinator => crafting-combinator-extended}/migrations/0.15.0.lua (100%) rename {crafting_combinator => crafting-combinator-extended}/migrations/0.15.2.lua (100%) rename {crafting_combinator => crafting-combinator-extended}/migrations/0.17.0.lua (100%) rename {crafting_combinator => crafting-combinator-extended}/script/bootstrap.lua (100%) rename {crafting_combinator => crafting-combinator-extended}/script/cc.lua (100%) rename {crafting_combinator => crafting-combinator-extended}/script/gui.lua (100%) rename {crafting_combinator => crafting-combinator-extended}/script/rc.lua (100%) rename {crafting_combinator => crafting-combinator-extended}/script/recipe-selector.lua (100%) rename {crafting_combinator => crafting-combinator-extended}/script/semver.lua (100%) rename {crafting_combinator => crafting-combinator-extended}/script/settings-parser.lua (100%) rename {crafting_combinator => crafting-combinator-extended}/script/signals.lua (100%) rename {crafting_combinator => crafting-combinator-extended}/script/util.lua (100%) rename {crafting_combinator => crafting-combinator-extended}/settings.lua (100%) rename {crafting_combinator => crafting-combinator-extended}/thumbnail.png (100%) diff --git a/crafting_combinator/changelog.txt b/crafting-combinator-extended/changelog.txt similarity index 100% rename from crafting_combinator/changelog.txt rename to crafting-combinator-extended/changelog.txt diff --git a/crafting_combinator/config.lua b/crafting-combinator-extended/config.lua similarity index 100% rename from crafting_combinator/config.lua rename to crafting-combinator-extended/config.lua diff --git a/crafting_combinator/control.lua b/crafting-combinator-extended/control.lua similarity index 100% rename from crafting_combinator/control.lua rename to crafting-combinator-extended/control.lua diff --git a/crafting_combinator/data-final-fixes.lua b/crafting-combinator-extended/data-final-fixes.lua similarity index 100% rename from crafting_combinator/data-final-fixes.lua rename to crafting-combinator-extended/data-final-fixes.lua diff --git a/crafting_combinator/data.lua b/crafting-combinator-extended/data.lua similarity index 100% rename from crafting_combinator/data.lua rename to crafting-combinator-extended/data.lua diff --git a/crafting_combinator/graphics/entities.png b/crafting-combinator-extended/graphics/entities.png similarity index 100% rename from crafting_combinator/graphics/entities.png rename to crafting-combinator-extended/graphics/entities.png diff --git a/crafting_combinator/graphics/hr-combinator-displays.png b/crafting-combinator-extended/graphics/hr-combinator-displays.png similarity index 100% rename from crafting_combinator/graphics/hr-combinator-displays.png rename to crafting-combinator-extended/graphics/hr-combinator-displays.png diff --git a/crafting_combinator/graphics/icon-crafting-combinator.png b/crafting-combinator-extended/graphics/icon-crafting-combinator.png similarity index 100% rename from crafting_combinator/graphics/icon-crafting-combinator.png rename to crafting-combinator-extended/graphics/icon-crafting-combinator.png diff --git a/crafting_combinator/graphics/recipe-book.png b/crafting-combinator-extended/graphics/recipe-book.png similarity index 100% rename from crafting_combinator/graphics/recipe-book.png rename to crafting-combinator-extended/graphics/recipe-book.png diff --git a/crafting_combinator/graphics/speed-icon.png b/crafting-combinator-extended/graphics/speed-icon.png similarity index 100% rename from crafting_combinator/graphics/speed-icon.png rename to crafting-combinator-extended/graphics/speed-icon.png diff --git a/crafting_combinator/graphics/trans.png b/crafting-combinator-extended/graphics/trans.png similarity index 100% rename from crafting_combinator/graphics/trans.png rename to crafting-combinator-extended/graphics/trans.png diff --git a/crafting_combinator/info.json b/crafting-combinator-extended/info.json similarity index 78% rename from crafting_combinator/info.json rename to crafting-combinator-extended/info.json index de3ac5a..56cc077 100644 --- a/crafting_combinator/info.json +++ b/crafting-combinator-extended/info.json @@ -1,8 +1,8 @@ { - "name": "crafting_combinator", + "name": "crafting-combinator-extended", "version": "0.17.0", "factorio_version": "1.1", - "title": "Crafting Combinator", + "title": "Crafting Combinator Extended", "author": "LuziferSenpai, TheRustyKnife, MarximusMaximus", "description": "Includes combinators that allow you to set or read the recipe of any crafting machine, get ingredients or products of a recipe and more!", "dependencies": ["base", "rusty-locale"] diff --git a/crafting_combinator/locale/cs/cs.cfg b/crafting-combinator-extended/locale/cs/cs.cfg similarity index 100% rename from crafting_combinator/locale/cs/cs.cfg rename to crafting-combinator-extended/locale/cs/cs.cfg diff --git a/crafting_combinator/locale/de/de.cfg b/crafting-combinator-extended/locale/de/de.cfg similarity index 100% rename from crafting_combinator/locale/de/de.cfg rename to crafting-combinator-extended/locale/de/de.cfg diff --git a/crafting_combinator/locale/en/en.cfg b/crafting-combinator-extended/locale/en/en.cfg similarity index 100% rename from crafting_combinator/locale/en/en.cfg rename to crafting-combinator-extended/locale/en/en.cfg diff --git a/crafting_combinator/migrations/0.10.12.lua b/crafting-combinator-extended/migrations/0.10.12.lua similarity index 100% rename from crafting_combinator/migrations/0.10.12.lua rename to crafting-combinator-extended/migrations/0.10.12.lua diff --git a/crafting_combinator/migrations/0.10.16.lua b/crafting-combinator-extended/migrations/0.10.16.lua similarity index 100% rename from crafting_combinator/migrations/0.10.16.lua rename to crafting-combinator-extended/migrations/0.10.16.lua diff --git a/crafting_combinator/migrations/0.10.8.lua b/crafting-combinator-extended/migrations/0.10.8.lua similarity index 100% rename from crafting_combinator/migrations/0.10.8.lua rename to crafting-combinator-extended/migrations/0.10.8.lua diff --git a/crafting_combinator/migrations/0.11.2.lua b/crafting-combinator-extended/migrations/0.11.2.lua similarity index 100% rename from crafting_combinator/migrations/0.11.2.lua rename to crafting-combinator-extended/migrations/0.11.2.lua diff --git a/crafting_combinator/migrations/0.13.1.lua b/crafting-combinator-extended/migrations/0.13.1.lua similarity index 100% rename from crafting_combinator/migrations/0.13.1.lua rename to crafting-combinator-extended/migrations/0.13.1.lua diff --git a/crafting_combinator/migrations/0.13.3.lua b/crafting-combinator-extended/migrations/0.13.3.lua similarity index 100% rename from crafting_combinator/migrations/0.13.3.lua rename to crafting-combinator-extended/migrations/0.13.3.lua diff --git a/crafting_combinator/migrations/0.15.0.lua b/crafting-combinator-extended/migrations/0.15.0.lua similarity index 100% rename from crafting_combinator/migrations/0.15.0.lua rename to crafting-combinator-extended/migrations/0.15.0.lua diff --git a/crafting_combinator/migrations/0.15.2.lua b/crafting-combinator-extended/migrations/0.15.2.lua similarity index 100% rename from crafting_combinator/migrations/0.15.2.lua rename to crafting-combinator-extended/migrations/0.15.2.lua diff --git a/crafting_combinator/migrations/0.17.0.lua b/crafting-combinator-extended/migrations/0.17.0.lua similarity index 100% rename from crafting_combinator/migrations/0.17.0.lua rename to crafting-combinator-extended/migrations/0.17.0.lua diff --git a/crafting_combinator/script/bootstrap.lua b/crafting-combinator-extended/script/bootstrap.lua similarity index 100% rename from crafting_combinator/script/bootstrap.lua rename to crafting-combinator-extended/script/bootstrap.lua diff --git a/crafting_combinator/script/cc.lua b/crafting-combinator-extended/script/cc.lua similarity index 100% rename from crafting_combinator/script/cc.lua rename to crafting-combinator-extended/script/cc.lua diff --git a/crafting_combinator/script/gui.lua b/crafting-combinator-extended/script/gui.lua similarity index 100% rename from crafting_combinator/script/gui.lua rename to crafting-combinator-extended/script/gui.lua diff --git a/crafting_combinator/script/rc.lua b/crafting-combinator-extended/script/rc.lua similarity index 100% rename from crafting_combinator/script/rc.lua rename to crafting-combinator-extended/script/rc.lua diff --git a/crafting_combinator/script/recipe-selector.lua b/crafting-combinator-extended/script/recipe-selector.lua similarity index 100% rename from crafting_combinator/script/recipe-selector.lua rename to crafting-combinator-extended/script/recipe-selector.lua diff --git a/crafting_combinator/script/semver.lua b/crafting-combinator-extended/script/semver.lua similarity index 100% rename from crafting_combinator/script/semver.lua rename to crafting-combinator-extended/script/semver.lua diff --git a/crafting_combinator/script/settings-parser.lua b/crafting-combinator-extended/script/settings-parser.lua similarity index 100% rename from crafting_combinator/script/settings-parser.lua rename to crafting-combinator-extended/script/settings-parser.lua diff --git a/crafting_combinator/script/signals.lua b/crafting-combinator-extended/script/signals.lua similarity index 100% rename from crafting_combinator/script/signals.lua rename to crafting-combinator-extended/script/signals.lua diff --git a/crafting_combinator/script/util.lua b/crafting-combinator-extended/script/util.lua similarity index 100% rename from crafting_combinator/script/util.lua rename to crafting-combinator-extended/script/util.lua diff --git a/crafting_combinator/settings.lua b/crafting-combinator-extended/settings.lua similarity index 100% rename from crafting_combinator/settings.lua rename to crafting-combinator-extended/settings.lua diff --git a/crafting_combinator/thumbnail.png b/crafting-combinator-extended/thumbnail.png similarity index 100% rename from crafting_combinator/thumbnail.png rename to crafting-combinator-extended/thumbnail.png From 1b1b3ffe48fb81a5afd43ba68094a7cf4589d1cb Mon Sep 17 00:00:00 2001 From: Marximus Maximus Date: Thu, 24 Feb 2022 16:14:29 -0800 Subject: [PATCH 3/3] Fix paths to graphics due to rename. --- crafting-combinator-extended/data.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/crafting-combinator-extended/data.lua b/crafting-combinator-extended/data.lua index 00784ed..afcae10 100644 --- a/crafting-combinator-extended/data.lua +++ b/crafting-combinator-extended/data.lua @@ -6,7 +6,7 @@ local config = require 'config' -- Crafting Combinator local cc = table.deepcopy(data.raw['constant-combinator']['constant-combinator']) cc.name = config.CC_NAME -cc.icon = '__crafting_combinator__/graphics/icon-crafting-combinator.png' +cc.icon = '__crafting-combinator-extended__/graphics/icon-crafting-combinator.png' cc.icon_size = 32 cc.item_slot_count = 255 cc.minable.result = cc.name @@ -14,7 +14,7 @@ table.insert(cc.flags, 'not-deconstructable') for _, image in pairs(cc.sprites) do local im = image.layers[1] - im.filename = '__crafting_combinator__/graphics/entities.png' + im.filename = '__crafting-combinator-extended__/graphics/entities.png' im.y = 0 im.hr_version = nil end @@ -38,7 +38,7 @@ rc.minable.result = rc.name rc.energy_source = { type = 'void' } rc.energy_usage_per_tick = '1W' for direction, definition in pairs(rc.multiply_symbol_sprites) do - definition.hr_version.filename = '__crafting_combinator__/graphics/hr-combinator-displays.png' + definition.hr_version.filename = '__crafting-combinator-extended__/graphics/hr-combinator-displays.png' rc.multiply_symbol_sprites[direction] = definition.hr_version end @@ -56,7 +56,7 @@ table.insert(data.raw['technology']['circuit-network'].effects, {type = 'unlock- local trans = { - filename = '__crafting_combinator__/graphics/trans.png', + filename = '__crafting-combinator-extended__/graphics/trans.png', width = 1, height = 1, } @@ -169,7 +169,7 @@ data:extend { type = 'item-group', name = config.GROUP_NAME, order = 'fb', - icon = '__crafting_combinator__/graphics/recipe-book.png', + icon = '__crafting-combinator-extended__/graphics/recipe-book.png', icon_size = 64, }, { @@ -195,7 +195,7 @@ data:extend { { type = 'virtual-signal', name = config.SPEED_SIGNAL_NAME, - icon = '__crafting_combinator__/graphics/speed-icon.png', + icon = '__crafting-combinator-extended__/graphics/speed-icon.png', subgroup = 'crafting_combinator:signals', order = 'b[crafting-speed]', icon_size = 32,