From ab57094041f99f25e8bc26b5bde7572e1d7deb6a Mon Sep 17 00:00:00 2001 From: Aleksei-bird Date: Sun, 26 May 2024 17:10:02 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=D1=8B=20?= =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D1=8C=D1=8E=D0=BD=D0=B8=D1=82=D0=B8=2066,68,?= =?UTF-8?q?70,71=20=D0=A2=D0=B0=D0=BA=D0=B6=D0=B5=20=D0=B2=D0=BD=D0=B5?= =?UTF-8?q?=D1=81=D0=B5=D0=BD=D1=8B=20=D0=BC=D0=BE=D0=B8=20=D0=B8=D0=B7?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=20=D1=87?= =?UTF-8?q?=D0=B0=D1=81=D1=82=D0=B8=20=D1=81=D1=82=D0=B5=D0=BA=D0=B0=20?= =?UTF-8?q?=D1=80=D1=83=D0=B4=20=D0=B8=20=D0=BA=D0=B0=D0=BC=D0=BD=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/angelsbioprocessing.bio-processing.cfg | 15 ++++--- QuickItemSearch/changelog.txt | 14 +++++++ QuickItemSearch/info.json | 3 +- .../scripts/gui/infinity-filter.lua | 4 +- .../scripts/gui/logistic-request.lua | 6 ++- QuickItemSearch/scripts/gui/search.lua | 42 ++++++++++++------- .../prototypes/items/angels-aluminium.lua | 2 +- .../prototypes/items/angels-chrome.lua | 2 +- .../prototypes/items/angels-cobalt.lua | 2 +- .../prototypes/items/angels-copper.lua | 2 +- .../prototypes/items/angels-gold.lua | 2 +- .../prototypes/items/angels-iron.lua | 2 +- .../prototypes/items/angels-lead.lua | 2 +- .../prototypes/items/angels-manganese.lua | 2 +- .../prototypes/items/angels-nickel.lua | 2 +- .../prototypes/items/angels-platinum.lua | 2 +- .../prototypes/items/angels-silicon.lua | 2 +- .../prototypes/items/angels-silver.lua | 2 +- .../prototypes/items/angels-stone.lua | 2 +- .../prototypes/items/angels-tin.lua | 2 +- .../prototypes/items/angels-titanium.lua | 2 +- .../prototypes/items/angels-tungsten.lua | 2 +- .../prototypes/items/angels-zinc.lua | 2 +- mod-list.json | 5 --- zzzparanoidal/prototypes/micro-final-fix.lua | 8 +++- 25 files changed, 83 insertions(+), 48 deletions(-) diff --git a/ParanoidalLocale/locale/ru/angelsbioprocessing.bio-processing.cfg b/ParanoidalLocale/locale/ru/angelsbioprocessing.bio-processing.cfg index 5658ad3f..1f40c9e6 100644 --- a/ParanoidalLocale/locale/ru/angelsbioprocessing.bio-processing.cfg +++ b/ParanoidalLocale/locale/ru/angelsbioprocessing.bio-processing.cfg @@ -28,11 +28,12 @@ bio-refugium-fish=Аквариум bio-refugium-hogger=Мясорубка кусак bio-refugium-puffer=Заповедник фугу bio-butchery=Бойня -bio-hatchery=Рыбная ферма alien-fish-1=Рыба Левак alien-fish-2=Дорфлурповая медуза alien-fish-3=Луч Санты - +bio-hatchery=Инкубатор1 +bio-hatchery-2=Инкубатор-2 +bio-hatchery-3=Инкубатор-3 [entity-description] algae-farm=Место для выращивания водорослей в контролируемой аквакультуре. algae-farm-2=Место для выращивания водорослей в контролируемой аквакультуре. @@ -50,7 +51,7 @@ nutrient-extractor=Производит питательную массу из temperate-garden=Источник образцов чужеродных растений и семян, предназначенных для умеренного климата. desert-garden=Источник образцов чужеродных растений и семян, предназначенных для пустынного климата. swamp-garden=Источник образцов чужеродных растений и семян, предназначенных для болотистого климата. -puffer-nest=Обитающие на этой планете иглобрюхи выделяют полезные газы. +puffer-nest=Обитающие на этой планете фугу выделяют полезные газы. temperate-tree=Редкий сорт дерева, богатый органической смолой. desert-tree=Редкий сорт дерева, богатый органическим каучуком. swamp-tree=Редкий сорт дерева, богатый органическими полимерами. @@ -58,12 +59,14 @@ bio-generator-temperate-1=Превращает саженцы в семена д bio-generator-desert-1=Превращает саженцы в семена деревьев. Специализируется на условиях пустынного климата. bio-generator-swamp-1=Превращает саженцы в семена деревьев. Специализируется на условиях болотистого климата. bio-arboretum-1=Защищенное место для выращивания и сбора деревьев. -bio-hatchery=Уютное место, где могут вылупляться яйца иглобрюха. bio-refugium-biter="Изолировано от внешнего мира, здесь можно разводить кусак" bio-refugium-fish="Не только украшение, но и разведение разных рыб" bio-refugium-hogger="Роющие землю существа чувствует здесь себя как дома" bio-refugium-puffer="Оно воняет, но фугу чувствуют себя как дома в этой наполненной газом башне" bio-butchery=Используется для забоя животных и производства мяса. +bio-hatchery=Уютное место, где могут вылупляться яйца фугу +bio-hatchery-2=Уютное место, где могут вылупляться яйца фугу +bio-hatchery-3=Уютное место, где могут вылупляться яйца фугу [item-name] algae-green=Зелёные водоросли @@ -523,9 +526,9 @@ bio-arboretum-desert=Извлечение каучука из редких по bio-arboretum-temperate=Извлечение смолы из редких пород деревьев, растущих на этой чужеродной планете. bio-arboretum-swamp=Извлечение пластмассы из редких пород деревьев, растущих на этой чужеродной планете. bio-refugium-fish=Приручение и переработка рыбы, живущей в водоёмах этой чужеродной планеты. -bio-refugium-hatchery=Технология инкубации яиц иглобрюхов, живущих на этой планете. +bio-refugium-hatchery=Технология инкубации яиц фугу, живущих на этой планете. bio-refugium-butchery=Производство мяса из животных. -bio-refugium-puffer=Приручение и переработка иглобрюхов, живущих на этой чужеродной планете. +bio-refugium-puffer=Приручение и переработка фугу, живущих на этой чужеродной планете. bio-refugium-biter=Приручение и переработка кусак, живущих на этой чужеродной планете. bio-refugium-hogger=Приручение и переработка дробителей, живущих на этой чужеродной планете. angels-bio-yield-module=Специализированный модуль, повышающий производительность, но используемый только для сельскохозяйственных рецептов. diff --git a/QuickItemSearch/changelog.txt b/QuickItemSearch/changelog.txt index 90930fc6..b778099b 100644 --- a/QuickItemSearch/changelog.txt +++ b/QuickItemSearch/changelog.txt @@ -1,3 +1,17 @@ +Version: 2.1.11 +Date: ???? + Changes: +--------------------------------------------------------------------------------------------------- +Version: 2.1.10 +Date: 2024-05-08 + Bugfixes: + - Fixed somehow orphaned windows not being destroyed before a new window is created. (#38) +--------------------------------------------------------------------------------------------------- +Version: 2.1.9 +Date: 2024-05-07 + Bugfixes: + - Fixed a crash in certain cases when translations complete after a mod migration. (#35) + - Fixed a crash when inputting a value greater than 4,294,967,295. (#37) --------------------------------------------------------------------------------------------------- Version: 2.1.8 Date: 2023-05-06 diff --git a/QuickItemSearch/info.json b/QuickItemSearch/info.json index 8ba2e284..cfaa7474 100644 --- a/QuickItemSearch/info.json +++ b/QuickItemSearch/info.json @@ -1,6 +1,6 @@ { "name": "QuickItemSearch", - "version": "2.1.8", + "version": "2.1.11", "title": "Quick Item Search", "description": "Quickly and easily search for items in your inventory or connected logistic network. Set temporary requests and quickly trash any items above your minimum requests.", "author": "raiguard", @@ -13,6 +13,7 @@ "(?) space-exploration" ], "package": { + "git_publish_branch": "master", "ignore": [ "stylua.toml", "screenshots" ] } } diff --git a/QuickItemSearch/scripts/gui/infinity-filter.lua b/QuickItemSearch/scripts/gui/infinity-filter.lua index d925e172..6ac051f9 100644 --- a/QuickItemSearch/scripts/gui/infinity-filter.lua +++ b/QuickItemSearch/scripts/gui/infinity-filter.lua @@ -244,7 +244,7 @@ function infinity_filter_gui.cycle_filter_mode(gui_data) local state = gui_data.state state.infinity_filter.mode = ( - next(constants.infinity_filter_modes, state.infinity_filter.mode) or next(constants.infinity_filter_modes) + next(constants.infinity_filter_modes, state.infinity_filter.mode) or next(constants.infinity_filter_modes) ) refs.filter_setter.dropdown.selected_index = constants.infinity_filter_mode_to_index[state.infinity_filter.mode] @@ -271,7 +271,7 @@ function infinity_filter_gui.handle_action(e, msg) filter_data.count = count refs.filter_setter.textfield.text = tostring(count) else - local count = tonumber(e.element.text) or 0 + local count = math.clamp(tonumber(e.element.text) or 0, 0, math.max_uint) filter_data.count = count refs.filter_setter.slider.slider_value = math.round(count, item_data.stack_size) end diff --git a/QuickItemSearch/scripts/gui/logistic-request.lua b/QuickItemSearch/scripts/gui/logistic-request.lua index ce510ad0..0273d813 100644 --- a/QuickItemSearch/scripts/gui/logistic-request.lua +++ b/QuickItemSearch/scripts/gui/logistic-request.lua @@ -227,7 +227,7 @@ function logistic_request_gui.open(player, player_table, item_data) local elems = logistic_setter[type] local count = request_data[type] elems.textfield.enabled = true - if count == math.max_uint then + if count >= math.max_uint then elems.textfield.text = constants.infinity_rep else elems.textfield.text = tostring(count) @@ -309,7 +309,9 @@ function logistic_request_gui.update_request(refs, state, element) local count if element.type == "textfield" then count = tonumber(element.text) - if not count then + if count then + count = math.clamp(count, 0, math.max_uint) + else count = bound == "min" and 0 or math.max_uint end elems.slider.slider_value = math.round(count / item_data.stack_size) * item_data.stack_size diff --git a/QuickItemSearch/scripts/gui/search.lua b/QuickItemSearch/scripts/gui/search.lua index 9bbe499c..8dad15b8 100644 --- a/QuickItemSearch/scripts/gui/search.lua +++ b/QuickItemSearch/scripts/gui/search.lua @@ -11,6 +11,17 @@ local logistic_request_gui = require("__QuickItemSearch__/scripts/gui/logistic-r local search_gui = {} function search_gui.build(player, player_table) +-- At some point it's possible for the player table to get out of sync... somehow. + local orphaned_dimmer = player.gui.screen.qis_window_dimmer + if orphaned_dimmer and orphaned_dimmer.valid then + orphaned_dimmer.destroy() + end + local orphaned_window = player.gui.screen.qis_search_window + if orphaned_window and orphaned_window.valid then + orphaned_window.destroy() + end + search_gui.destroy(player_table) + local refs = gui.build(player.gui.screen, { { type = "frame", @@ -144,7 +155,14 @@ function search_gui.build(player, player_table) end function search_gui.destroy(player_table) - player_table.guis.search.refs.window.destroy() + local gui_data = player_table.guis.search + if not gui_data then + return + end + if not gui_data.window or not gui_data.window.valid then + return + end + gui_data.window.valid.destroy() player_table.guis.search = nil end @@ -251,12 +269,8 @@ function search_gui.perform_search(player, player_table, updated_query, combined if #state.raw_query > 1 then local i = 0 - local results, connected_to_network, logistic_requests_available = search.run( - player, - player_table, - query, - combined_contents - ) + local results, connected_to_network, logistic_requests_available = + search.run(player, player_table, query, combined_contents) for _, row in ipairs(results) do i = i + 1 local i3 = i * 3 @@ -286,13 +300,13 @@ function search_gui.perform_search(player, player_table, updated_query, combined -- item counts if player.controller_type == defines.controllers.character and connected_to_network then children[i3 + 2].caption = ( - (row.inventory or 0) - .. " / [color=" - .. constants.colors.logistic_str - .. "]" - .. (row.logistic or 0) - .. "[/color]" - ) + (row.inventory or 0) + .. " / [color=" + .. constants.colors.logistic_str + .. "]" + .. (row.logistic or 0) + .. "[/color]" + ) else children[i3 + 2].caption = (row.inventory or 0) end diff --git a/angelssmelting/prototypes/items/angels-aluminium.lua b/angelssmelting/prototypes/items/angels-aluminium.lua index 0e0149de..36db7333 100644 --- a/angelssmelting/prototypes/items/angels-aluminium.lua +++ b/angelssmelting/prototypes/items/angels-aluminium.lua @@ -7,7 +7,7 @@ data:extend({ icon_size = 32, subgroup = "angels-aluminium", order = "a", - stack_size = 200, + stack_size = 2000, }, -- SMELTING INTERMEDIATE { diff --git a/angelssmelting/prototypes/items/angels-chrome.lua b/angelssmelting/prototypes/items/angels-chrome.lua index ee855adc..f6424c87 100644 --- a/angelssmelting/prototypes/items/angels-chrome.lua +++ b/angelssmelting/prototypes/items/angels-chrome.lua @@ -7,7 +7,7 @@ data:extend({ icon_size = 32, subgroup = "angels-chrome", order = "a", - stack_size = 200, + stack_size = 2000, }, -- SMELTING INTERMEDIATE { diff --git a/angelssmelting/prototypes/items/angels-cobalt.lua b/angelssmelting/prototypes/items/angels-cobalt.lua index a7e0ebcb..0a25259b 100644 --- a/angelssmelting/prototypes/items/angels-cobalt.lua +++ b/angelssmelting/prototypes/items/angels-cobalt.lua @@ -7,7 +7,7 @@ data:extend({ icon_size = 32, subgroup = "angels-cobalt", order = "a", - stack_size = 200, + stack_size = 2000, }, -- SMELTING INTERMEDIATE { diff --git a/angelssmelting/prototypes/items/angels-copper.lua b/angelssmelting/prototypes/items/angels-copper.lua index e674fdad..a0e72425 100644 --- a/angelssmelting/prototypes/items/angels-copper.lua +++ b/angelssmelting/prototypes/items/angels-copper.lua @@ -10,7 +10,7 @@ data:extend({ icon_mipmaps = 4, subgroup = "angels-copper", order = "b", - stack_size = 200, + stack_size = 2000, }, { type = "item", diff --git a/angelssmelting/prototypes/items/angels-gold.lua b/angelssmelting/prototypes/items/angels-gold.lua index 3da6746f..15092307 100644 --- a/angelssmelting/prototypes/items/angels-gold.lua +++ b/angelssmelting/prototypes/items/angels-gold.lua @@ -9,7 +9,7 @@ data:extend({ icon_size = 32, subgroup = "angels-gold", order = "a", - stack_size = 200, + stack_size = 2000, }, -- SMELTING INTERMEDIATE { diff --git a/angelssmelting/prototypes/items/angels-iron.lua b/angelssmelting/prototypes/items/angels-iron.lua index 7e281a01..79654744 100644 --- a/angelssmelting/prototypes/items/angels-iron.lua +++ b/angelssmelting/prototypes/items/angels-iron.lua @@ -10,7 +10,7 @@ data:extend({ icon_mipmaps = 4, subgroup = "angels-iron", order = "b", - stack_size = 200, + stack_size = 2000, }, { type = "item", diff --git a/angelssmelting/prototypes/items/angels-lead.lua b/angelssmelting/prototypes/items/angels-lead.lua index a2fd9f3f..6d6cf5f4 100644 --- a/angelssmelting/prototypes/items/angels-lead.lua +++ b/angelssmelting/prototypes/items/angels-lead.lua @@ -9,7 +9,7 @@ data:extend({ icon_size = 32, subgroup = "angels-lead", order = "a", - stack_size = 200, + stack_size = 2000, }, -- SMELTING INTERMEDIATE { diff --git a/angelssmelting/prototypes/items/angels-manganese.lua b/angelssmelting/prototypes/items/angels-manganese.lua index d267bb5a..f0f1e5c7 100644 --- a/angelssmelting/prototypes/items/angels-manganese.lua +++ b/angelssmelting/prototypes/items/angels-manganese.lua @@ -7,7 +7,7 @@ data:extend({ icon_size = 32, subgroup = "angels-manganese", order = "a", - stack_size = 200, + stack_size = 2000, }, -- SMELTING INTERMEDIATE { diff --git a/angelssmelting/prototypes/items/angels-nickel.lua b/angelssmelting/prototypes/items/angels-nickel.lua index ed3d51e4..dcb2a925 100644 --- a/angelssmelting/prototypes/items/angels-nickel.lua +++ b/angelssmelting/prototypes/items/angels-nickel.lua @@ -7,7 +7,7 @@ data:extend({ icon_size = 32, subgroup = "angels-nickel", order = "a", - stack_size = 200, + stack_size = 2000, }, -- SMELTING INTERMEDIATE { diff --git a/angelssmelting/prototypes/items/angels-platinum.lua b/angelssmelting/prototypes/items/angels-platinum.lua index b1096c16..1f9900a4 100644 --- a/angelssmelting/prototypes/items/angels-platinum.lua +++ b/angelssmelting/prototypes/items/angels-platinum.lua @@ -9,7 +9,7 @@ data:extend({ icon_size = 32, subgroup = "angels-platinum", order = "a", - stack_size = 200, + stack_size = 2000, }, -- SMELTING INTERMEDIATE { diff --git a/angelssmelting/prototypes/items/angels-silicon.lua b/angelssmelting/prototypes/items/angels-silicon.lua index 6a4201fa..2ec444db 100644 --- a/angelssmelting/prototypes/items/angels-silicon.lua +++ b/angelssmelting/prototypes/items/angels-silicon.lua @@ -9,7 +9,7 @@ data:extend({ icon_size = 32, subgroup = "angels-silicon", order = "a", - stack_size = 200, + stack_size = 2000, }, -- SMELTING INTERMEDIATE { diff --git a/angelssmelting/prototypes/items/angels-silver.lua b/angelssmelting/prototypes/items/angels-silver.lua index 58b68bc0..c6f77ba4 100644 --- a/angelssmelting/prototypes/items/angels-silver.lua +++ b/angelssmelting/prototypes/items/angels-silver.lua @@ -7,7 +7,7 @@ data:extend({ icon_size = 32, subgroup = "angels-silver", order = "a", - stack_size = 200, + stack_size = 2000, }, -- SMELTING INTERMEDIATE { diff --git a/angelssmelting/prototypes/items/angels-stone.lua b/angelssmelting/prototypes/items/angels-stone.lua index a648fd7e..577bc11f 100644 --- a/angelssmelting/prototypes/items/angels-stone.lua +++ b/angelssmelting/prototypes/items/angels-stone.lua @@ -8,7 +8,7 @@ data:extend({ icon_size = 32, subgroup = "angels-stone", order = "b", - stack_size = 200, + stack_size = 2000, }, -- SMELTING RESULTS { diff --git a/angelssmelting/prototypes/items/angels-tin.lua b/angelssmelting/prototypes/items/angels-tin.lua index 5bc65a6f..e92df6b5 100644 --- a/angelssmelting/prototypes/items/angels-tin.lua +++ b/angelssmelting/prototypes/items/angels-tin.lua @@ -7,7 +7,7 @@ data:extend({ icon_size = 32, subgroup = "angels-tin", order = "a", - stack_size = 200, + stack_size = 2000, }, -- SMELTING INTERMEDIATE { diff --git a/angelssmelting/prototypes/items/angels-titanium.lua b/angelssmelting/prototypes/items/angels-titanium.lua index d807655e..ec806cd2 100644 --- a/angelssmelting/prototypes/items/angels-titanium.lua +++ b/angelssmelting/prototypes/items/angels-titanium.lua @@ -9,7 +9,7 @@ data:extend({ icon_size = 32, subgroup = "angels-titanium", order = "a", - stack_size = 200, + stack_size = 2000, }, -- SMELTING INTERMEDIATE { diff --git a/angelssmelting/prototypes/items/angels-tungsten.lua b/angelssmelting/prototypes/items/angels-tungsten.lua index 43dd47cd..f0215a38 100644 --- a/angelssmelting/prototypes/items/angels-tungsten.lua +++ b/angelssmelting/prototypes/items/angels-tungsten.lua @@ -9,7 +9,7 @@ data:extend({ icon_size = 32, subgroup = "angels-tungsten", order = "a", - stack_size = 200, + stack_size = 2000, }, -- SMELTING INTERMEDIATE { diff --git a/angelssmelting/prototypes/items/angels-zinc.lua b/angelssmelting/prototypes/items/angels-zinc.lua index c6ea1820..1343851f 100644 --- a/angelssmelting/prototypes/items/angels-zinc.lua +++ b/angelssmelting/prototypes/items/angels-zinc.lua @@ -7,7 +7,7 @@ data:extend({ icon_size = 32, subgroup = "angels-zinc", order = "a", - stack_size = 200, + stack_size = 2000, }, -- SMELTING INTERMEDIATE { diff --git a/mod-list.json b/mod-list.json index aa672c39..523feae1 100644 --- a/mod-list.json +++ b/mod-list.json @@ -833,11 +833,6 @@ "enabled": true }, - { - "name": "RecipeBook", - "enabled": false - }, - { "name": "RemoteConfiguration", "enabled": true diff --git a/zzzparanoidal/prototypes/micro-final-fix.lua b/zzzparanoidal/prototypes/micro-final-fix.lua index 8008569a..b8c1ba6c 100644 --- a/zzzparanoidal/prototypes/micro-final-fix.lua +++ b/zzzparanoidal/prototypes/micro-final-fix.lua @@ -1168,8 +1168,10 @@ bobmods.lib.tech.add_recipe_unlock("angels-metallurgy-2", "intermediate-structur --Перенос Каркаса 3, примитивного Титана и Кобальта в Металлургию 3 (AKMF https://discord.com/channels/569536773701500928/1196117081691795496) bobmods.lib.tech.remove_recipe_unlock("angels-cobalt-smelting-1", "cobalat-electrolysis-x") +bobmods.lib.tech.remove_recipe_unlock("angels-cobalt-steel-smelting-1", "cobalt-steel-alloy-x") bobmods.lib.tech.remove_recipe_unlock("angels-titanium-smelting-1", "titanium-electrolysis-x") bobmods.lib.tech.add_recipe_unlock("angels-metallurgy-3", "cobalat-electrolysis-x") +bobmods.lib.tech.add_recipe_unlock("angels-metallurgy-3", "cobalt-steel-alloy-x") bobmods.lib.tech.add_recipe_unlock("angels-metallurgy-3", "titanium-electrolysis-x") bobmods.lib.tech.remove_recipe_unlock("titanium-processing", "advanced-structure-components") bobmods.lib.tech.add_recipe_unlock("angels-metallurgy-3", "advanced-structure-components") @@ -1407,4 +1409,8 @@ bobmods.lib.tech.remove_recipe_unlock("angels-nitinol-smelting-1", "angels-nitin bobmods.lib.tech.add_recipe_unlock("nitinol-processing", "angels-nitinol-pipe-to-ground-casting") --Для сборщика электроники нужны фиол. манипуляторы (AKMF) -bobmods.lib.tech.add_prerequisite("electronics-machine-3", "turbo-inserter") \ No newline at end of file +bobmods.lib.tech.add_prerequisite("electronics-machine-3", "turbo-inserter") + +--Убрана левая печь из электо печи для сплавов (AKMF) +bobmods.lib.recipe.remove_ingredient("electric-mixing-furnace", "electric-chemical-furnace") +KaoExtended.recipe.addtorecipe("electric-mixing-furnace", {"electric-furnace", 1}) \ No newline at end of file