diff --git a/src/changelog.txt b/src/changelog.txt index cd9947f..2a46fa7 100644 --- a/src/changelog.txt +++ b/src/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 1.99.15 +Date: ??. ??. ???? + Bugfixes: + - Fixed inventory combinator outputting virtual signals named the same as item or fluid signals. +--------------------------------------------------------------------------------------------------- Version: 1.99.12 Date: 09. 09. 2022 Features: diff --git a/src/control.lua b/src/control.lua index baebe78..26a2b19 100644 --- a/src/control.lua +++ b/src/control.lua @@ -914,12 +914,12 @@ function UpdateInvCombinators() for name, count in pairs(global.invdata) do -- Combinator signals are limited to a max value of 2^31-1 count = math.min(count, 0x7fffffff) - if virtuals[name] then - invframe[#invframe+1] = {count=count,index=#invframe+1,signal={name=name,type="virtual"}} + if items[name] then + invframe[#invframe+1] = {count=count,index=#invframe+1,signal={name=name,type="item"}} elseif fluids[name] then invframe[#invframe+1] = {count=count,index=#invframe+1,signal={name=name,type="fluid"}} - elseif items[name] then - invframe[#invframe+1] = {count=count,index=#invframe+1,signal={name=name,type="item"}} + elseif virtuals[name] then + invframe[#invframe+1] = {count=count,index=#invframe+1,signal={name=name,type="virtual"}} end end end diff --git a/src/info.json b/src/info.json index 3ddc292..47d4f68 100644 --- a/src/info.json +++ b/src/info.json @@ -2,17 +2,17 @@ "name": "subspace_storage", "variants": [ { - "version": "1.99.12", + "version": "1.99.15", "factorio_version": "0.17", "additional_files": { "compat.lua": ["compat", "factorio_0.17.lua"] } }, { - "version": "1.99.13", + "version": "1.99.16", "factorio_version": "1.0", "additional_files": { "compat.lua": ["compat", "factorio_1.0.lua"] } }, { - "version": "1.99.14", + "version": "1.99.17", "factorio_version": "1.1", "additional_files": { "compat.lua": ["compat", "factorio_1.1.lua"] } }