diff --git a/cybersyn/changelog.txt b/cybersyn/changelog.txt index 6041ef7..5a514ba 100644 --- a/cybersyn/changelog.txt +++ b/cybersyn/changelog.txt @@ -1,4 +1,13 @@ --------------------------------------------------------------------------------------------------- +Version: 1.2.16 +Date: 2023-5-14 + Bugfixes: + - Fixed Nullius recipe being broken again + Translation: + - Chinese language update contributed by luaotix + - Russian language correction contributed by Eldrinn-Elantey + - Korean language contributed by manmen-mi +--------------------------------------------------------------------------------------------------- Version: 1.2.15 Date: 2023-4-30 Bugfixes: @@ -12,7 +21,6 @@ Date: 2023-4-30 Features: - Added opt-in WIP trains, inventory, and station manager gui (highly experimental, use at your own risk) Changes: - - Improved the recipe derivation logic for the cybernetic combinator, in all modpacks it should now consistently be about as difficult to craft as an arthmetic combinator. Vanilla recipe is unchanged, but several overhaul mods will receive new recipes. - The automatic allow list now consistently looks 3 tiles down the first curved rail it finds along a station for inserters or pumps. Previously it would conditionally look only 1 tile down. This should lead to more intuitive allow list behaviour for stations with trains that park slightly on curved rails. Bugfixes: - Provider override thresholds now correctly override the required train capacity as well; fix contributed by shopt diff --git a/cybersyn/data-final-fixes.lua b/cybersyn/data-final-fixes.lua index 5d5037c..c16f853 100644 --- a/cybersyn/data-final-fixes.lua +++ b/cybersyn/data-final-fixes.lua @@ -9,22 +9,4 @@ if mods["nullius"] then -- Nullius makes modded technologies part of its research tree -- Place combinator in the same place on the research tree as LTN table.insert(data.raw.technology["nullius-broadcasting-1"].prerequisites, "cybersyn-train-network") -else - -- Reset the combinator recipe back to arithmetic combinator recipe in case a mod has changed it - local recipe = flib.deep_copy(data.raw["recipe"]["arithmetic-combinator"].ingredients) - for k, _ in pairs(recipe) do - local mult = 2 - for i, _ in pairs(recipe) do - if recipe[k][i] == "copper-cable" then - mult = 4 - break; - end - end - for i, _ in pairs(recipe) do - if type(recipe[k][i]) == "number" then - recipe[k][i] = mult*recipe[k][i] - end - end - end - data.raw["recipe"][COMBINATOR_NAME].ingredients = recipe end diff --git a/cybersyn/info.json b/cybersyn/info.json index 06ebe55..739a874 100644 --- a/cybersyn/info.json +++ b/cybersyn/info.json @@ -1,6 +1,6 @@ { "name": "cybersyn", - "version": "1.2.15", + "version": "1.2.16", "title": "Project Cybersyn", "author": "Mami", "factorio_version": "1.1", diff --git a/cybersyn/scripts/migrations.lua b/cybersyn/scripts/migrations.lua index 51d406a..108688b 100644 --- a/cybersyn/scripts/migrations.lua +++ b/cybersyn/scripts/migrations.lua @@ -300,15 +300,6 @@ local migrations_table = { ---@type MapData local map_data = global - if not global.manager then - global.manager = { - players = {}, - } - for i, v in pairs(game.players) do - manager_gui.on_player_created({player_index = i}) - end - end - for _, e in pairs(map_data.refuelers) do if e.network_flag then e.network_mask = e.network_flag @@ -328,6 +319,18 @@ local migrations_table = { end end end, + ["1.2.16"] = function() + ---@type MapData + local map_data = global + if not map_data.manager then + map_data.manager = { + players = {}, + } + for i, v in pairs(game.players) do + manager_gui.on_player_created({player_index = i}) + end + end + end } --STATUS_R_TO_D = 5 ---@param data ConfigurationChangedData