From 0af9d905b4a8bff40f51ab189d443e2c27b5b598 Mon Sep 17 00:00:00 2001 From: Jelmergu Date: Fri, 2 Feb 2018 12:06:03 +0100 Subject: [PATCH] Add allow_as_intermediate to all recipes Signed-off-by: Jelmergu --- CHANGELOG.md | 10 +++++++++- .../Jelmergu.lua | 1 + .../changelog.txt | 6 ++++++ .../data-updates.lua | 0 .../data.lua | 0 .../graphics/icons/burner-to-electric-drill.png | Bin .../icons/burner-to-electric-inserter.png | Bin .../graphics/icons/pistol-to-combat-shotgun.png | Bin .../graphics/icons/pistol-to-shotgun.png | Bin .../graphics/icons/pistol-to-submachine.png | Bin .../icons/steel-chemical-to-electric-furnace.png | Bin .../icons/steel-mixing-to-electric-furnace.png | Bin .../graphics/icons/steel-to-electric-furnace.png | Bin .../icons/stone-chemical-to-steel-furnace.png | Bin .../icons/stone-mixing-to-steel-furnace.png | Bin .../graphics/icons/stone-to-steel-furnace.png | Bin .../info.json | 6 +++--- .../locale/en/recipe-name.cfg | 0 .../migrations/2017-10-08_Factorio_0.15.0.lua | 0 .../migrations/2017-10-26_Factorio_0.15.0.lua | 0 .../migrations/2017-11-19_Factorio_0.15.0.lua | 0 .../prototypes/recipe.lua | 0 .../prototypes/recipes/bobplates.lua | 0 .../prototypes/recipes/vanilla.lua | 14 +++++++------- .../prototypes/technology.lua | 0 .../prototypes/technology/bobplates.lua | 0 .../prototypes/technology/vanilla.lua | 0 27 files changed, 26 insertions(+), 11 deletions(-) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/Jelmergu.lua (97%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/changelog.txt (89%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/data-updates.lua (100%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/data.lua (100%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/graphics/icons/burner-to-electric-drill.png (100%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/graphics/icons/burner-to-electric-inserter.png (100%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/graphics/icons/pistol-to-combat-shotgun.png (100%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/graphics/icons/pistol-to-shotgun.png (100%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/graphics/icons/pistol-to-submachine.png (100%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/graphics/icons/steel-chemical-to-electric-furnace.png (100%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/graphics/icons/steel-mixing-to-electric-furnace.png (100%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/graphics/icons/steel-to-electric-furnace.png (100%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/graphics/icons/stone-chemical-to-steel-furnace.png (100%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/graphics/icons/stone-mixing-to-steel-furnace.png (100%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/graphics/icons/stone-to-steel-furnace.png (100%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/info.json (60%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/locale/en/recipe-name.cfg (100%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/migrations/2017-10-08_Factorio_0.15.0.lua (100%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/migrations/2017-10-26_Factorio_0.15.0.lua (100%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/migrations/2017-11-19_Factorio_0.15.0.lua (100%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/prototypes/recipe.lua (100%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/prototypes/recipes/bobplates.lua (100%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/prototypes/recipes/vanilla.lua (91%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/prototypes/technology.lua (100%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/prototypes/technology/bobplates.lua (100%) rename {upgrade-machines_0.2.7 => upgrade-machines_0.2.8}/prototypes/technology/vanilla.lua (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ef0775..27e64bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,16 @@ +###0.2.8 +- Fixed that recipes were used as intermediates +- Returned the crafting time to the correct time + +###0.2.7 +- Added in-game changelog +- Fixed that burner to electric drill was used as intermediate of burner mining drill recipe + ###0.2.6 - Added in-game changelog - Fixed that burner mining drill used the stone furnace from burner to electric drill recipe as its intermediate(#1) - + ### 0.2.5 - Update to 0.16 - Corrected locales for pistol to (combat) shotgun diff --git a/upgrade-machines_0.2.7/Jelmergu.lua b/upgrade-machines_0.2.8/Jelmergu.lua similarity index 97% rename from upgrade-machines_0.2.7/Jelmergu.lua rename to upgrade-machines_0.2.8/Jelmergu.lua index c3eeadc..dcd35ae 100644 --- a/upgrade-machines_0.2.7/Jelmergu.lua +++ b/upgrade-machines_0.2.8/Jelmergu.lua @@ -11,6 +11,7 @@ function Jelmergu:addRecipe(recipe) recipe.order = self.alphabet[self.currentOrder] self.currentOrder = self.currentOrder+1 end + recipe.allow_as_intermediate = false recipe.subgroup = "upgrade-machines" recipe.type = "recipe" recipe.main_product = recipe.main_product and recipe.main_product or "" diff --git a/upgrade-machines_0.2.7/changelog.txt b/upgrade-machines_0.2.8/changelog.txt similarity index 89% rename from upgrade-machines_0.2.7/changelog.txt rename to upgrade-machines_0.2.8/changelog.txt index c629744..2106f6a 100644 --- a/upgrade-machines_0.2.7/changelog.txt +++ b/upgrade-machines_0.2.8/changelog.txt @@ -1,4 +1,10 @@ --------------------------------------------------------------------------------------------------- +Version: 0.2.8 +Date: 02. 02. 2018 + Fixes: + - Fixed that recipes were used as intermediates + - Returned the crafting time to the correct time +--------------------------------------------------------------------------------------------------- Version: 0.2.7 Date: 15. 01. 2018 General: diff --git a/upgrade-machines_0.2.7/data-updates.lua b/upgrade-machines_0.2.8/data-updates.lua similarity index 100% rename from upgrade-machines_0.2.7/data-updates.lua rename to upgrade-machines_0.2.8/data-updates.lua diff --git a/upgrade-machines_0.2.7/data.lua b/upgrade-machines_0.2.8/data.lua similarity index 100% rename from upgrade-machines_0.2.7/data.lua rename to upgrade-machines_0.2.8/data.lua diff --git a/upgrade-machines_0.2.7/graphics/icons/burner-to-electric-drill.png b/upgrade-machines_0.2.8/graphics/icons/burner-to-electric-drill.png similarity index 100% rename from upgrade-machines_0.2.7/graphics/icons/burner-to-electric-drill.png rename to upgrade-machines_0.2.8/graphics/icons/burner-to-electric-drill.png diff --git a/upgrade-machines_0.2.7/graphics/icons/burner-to-electric-inserter.png b/upgrade-machines_0.2.8/graphics/icons/burner-to-electric-inserter.png similarity index 100% rename from upgrade-machines_0.2.7/graphics/icons/burner-to-electric-inserter.png rename to upgrade-machines_0.2.8/graphics/icons/burner-to-electric-inserter.png diff --git a/upgrade-machines_0.2.7/graphics/icons/pistol-to-combat-shotgun.png b/upgrade-machines_0.2.8/graphics/icons/pistol-to-combat-shotgun.png similarity index 100% rename from upgrade-machines_0.2.7/graphics/icons/pistol-to-combat-shotgun.png rename to upgrade-machines_0.2.8/graphics/icons/pistol-to-combat-shotgun.png diff --git a/upgrade-machines_0.2.7/graphics/icons/pistol-to-shotgun.png b/upgrade-machines_0.2.8/graphics/icons/pistol-to-shotgun.png similarity index 100% rename from upgrade-machines_0.2.7/graphics/icons/pistol-to-shotgun.png rename to upgrade-machines_0.2.8/graphics/icons/pistol-to-shotgun.png diff --git a/upgrade-machines_0.2.7/graphics/icons/pistol-to-submachine.png b/upgrade-machines_0.2.8/graphics/icons/pistol-to-submachine.png similarity index 100% rename from upgrade-machines_0.2.7/graphics/icons/pistol-to-submachine.png rename to upgrade-machines_0.2.8/graphics/icons/pistol-to-submachine.png diff --git a/upgrade-machines_0.2.7/graphics/icons/steel-chemical-to-electric-furnace.png b/upgrade-machines_0.2.8/graphics/icons/steel-chemical-to-electric-furnace.png similarity index 100% rename from upgrade-machines_0.2.7/graphics/icons/steel-chemical-to-electric-furnace.png rename to upgrade-machines_0.2.8/graphics/icons/steel-chemical-to-electric-furnace.png diff --git a/upgrade-machines_0.2.7/graphics/icons/steel-mixing-to-electric-furnace.png b/upgrade-machines_0.2.8/graphics/icons/steel-mixing-to-electric-furnace.png similarity index 100% rename from upgrade-machines_0.2.7/graphics/icons/steel-mixing-to-electric-furnace.png rename to upgrade-machines_0.2.8/graphics/icons/steel-mixing-to-electric-furnace.png diff --git a/upgrade-machines_0.2.7/graphics/icons/steel-to-electric-furnace.png b/upgrade-machines_0.2.8/graphics/icons/steel-to-electric-furnace.png similarity index 100% rename from upgrade-machines_0.2.7/graphics/icons/steel-to-electric-furnace.png rename to upgrade-machines_0.2.8/graphics/icons/steel-to-electric-furnace.png diff --git a/upgrade-machines_0.2.7/graphics/icons/stone-chemical-to-steel-furnace.png b/upgrade-machines_0.2.8/graphics/icons/stone-chemical-to-steel-furnace.png similarity index 100% rename from upgrade-machines_0.2.7/graphics/icons/stone-chemical-to-steel-furnace.png rename to upgrade-machines_0.2.8/graphics/icons/stone-chemical-to-steel-furnace.png diff --git a/upgrade-machines_0.2.7/graphics/icons/stone-mixing-to-steel-furnace.png b/upgrade-machines_0.2.8/graphics/icons/stone-mixing-to-steel-furnace.png similarity index 100% rename from upgrade-machines_0.2.7/graphics/icons/stone-mixing-to-steel-furnace.png rename to upgrade-machines_0.2.8/graphics/icons/stone-mixing-to-steel-furnace.png diff --git a/upgrade-machines_0.2.7/graphics/icons/stone-to-steel-furnace.png b/upgrade-machines_0.2.8/graphics/icons/stone-to-steel-furnace.png similarity index 100% rename from upgrade-machines_0.2.7/graphics/icons/stone-to-steel-furnace.png rename to upgrade-machines_0.2.8/graphics/icons/stone-to-steel-furnace.png diff --git a/upgrade-machines_0.2.7/info.json b/upgrade-machines_0.2.8/info.json similarity index 60% rename from upgrade-machines_0.2.7/info.json rename to upgrade-machines_0.2.8/info.json index bb60807..982c8db 100644 --- a/upgrade-machines_0.2.7/info.json +++ b/upgrade-machines_0.2.8/info.json @@ -1,11 +1,11 @@ { "name": "upgrade-machines", - "version": "0.2.7", + "version": "0.2.8", "title": "Upgrade Machines", "author": "Jelmergu", "contact": "", "homepage": "", - "factorio_version": "0.16", - "dependencies": ["base >= 0.16", "? bobelectronics >= 0.15.2", "? bobplates >= 0.15.12"], + "factorio_version": "0.16.22", + "dependencies": ["base >= 0.16.22", "? bobelectronics >= 0.15.2", "? bobplates >= 0.15.12"], "description": "This mod adds recipes to upgrade all burner stage machines to their next tier machine" } \ No newline at end of file diff --git a/upgrade-machines_0.2.7/locale/en/recipe-name.cfg b/upgrade-machines_0.2.8/locale/en/recipe-name.cfg similarity index 100% rename from upgrade-machines_0.2.7/locale/en/recipe-name.cfg rename to upgrade-machines_0.2.8/locale/en/recipe-name.cfg diff --git a/upgrade-machines_0.2.7/migrations/2017-10-08_Factorio_0.15.0.lua b/upgrade-machines_0.2.8/migrations/2017-10-08_Factorio_0.15.0.lua similarity index 100% rename from upgrade-machines_0.2.7/migrations/2017-10-08_Factorio_0.15.0.lua rename to upgrade-machines_0.2.8/migrations/2017-10-08_Factorio_0.15.0.lua diff --git a/upgrade-machines_0.2.7/migrations/2017-10-26_Factorio_0.15.0.lua b/upgrade-machines_0.2.8/migrations/2017-10-26_Factorio_0.15.0.lua similarity index 100% rename from upgrade-machines_0.2.7/migrations/2017-10-26_Factorio_0.15.0.lua rename to upgrade-machines_0.2.8/migrations/2017-10-26_Factorio_0.15.0.lua diff --git a/upgrade-machines_0.2.7/migrations/2017-11-19_Factorio_0.15.0.lua b/upgrade-machines_0.2.8/migrations/2017-11-19_Factorio_0.15.0.lua similarity index 100% rename from upgrade-machines_0.2.7/migrations/2017-11-19_Factorio_0.15.0.lua rename to upgrade-machines_0.2.8/migrations/2017-11-19_Factorio_0.15.0.lua diff --git a/upgrade-machines_0.2.7/prototypes/recipe.lua b/upgrade-machines_0.2.8/prototypes/recipe.lua similarity index 100% rename from upgrade-machines_0.2.7/prototypes/recipe.lua rename to upgrade-machines_0.2.8/prototypes/recipe.lua diff --git a/upgrade-machines_0.2.7/prototypes/recipes/bobplates.lua b/upgrade-machines_0.2.8/prototypes/recipes/bobplates.lua similarity index 100% rename from upgrade-machines_0.2.7/prototypes/recipes/bobplates.lua rename to upgrade-machines_0.2.8/prototypes/recipes/bobplates.lua diff --git a/upgrade-machines_0.2.7/prototypes/recipes/vanilla.lua b/upgrade-machines_0.2.8/prototypes/recipes/vanilla.lua similarity index 91% rename from upgrade-machines_0.2.7/prototypes/recipes/vanilla.lua rename to upgrade-machines_0.2.8/prototypes/recipes/vanilla.lua index b8e18f5..ceda71c 100644 --- a/upgrade-machines_0.2.7/prototypes/recipes/vanilla.lua +++ b/upgrade-machines_0.2.8/prototypes/recipes/vanilla.lua @@ -29,7 +29,7 @@ Jelmergu:addRecipe( }, }, main_product = "electric-mining-drill", - energy_required = 1.1, + energy_required = 1, enabled = true } ) @@ -42,7 +42,7 @@ Jelmergu:addRecipe( { "burner-inserter", 1 } }, result = "inserter", - energy_required = 1.1, + energy_required = 1, enabled = true } ) @@ -56,7 +56,7 @@ Jelmergu:addRecipe( { "stone-brick", 9 } }, result = "steel-furnace", - energy_required = 3.1, + energy_required = 3, } ) @@ -69,7 +69,7 @@ Jelmergu:addRecipe( { "advanced-circuit", 5 } }, result = "electric-furnace", - energy_required = 5.1, + energy_required = 5, } ) @@ -82,7 +82,7 @@ Jelmergu:addRecipe( { "pistol", 1}, }, result = "submachine-gun", - energy_required = 10.1, + energy_required = 10, enabled = true } ) @@ -98,7 +98,7 @@ Jelmergu:addRecipe( { "pistol", 1}, }, result = "shotgun", - energy_required = 10.1, + energy_required = 10, enabled = true } ) @@ -114,7 +114,7 @@ Jelmergu:addRecipe( { "pistol", 1}, }, result = "combat-shotgun", - energy_required = 10.1, + energy_required = 10, } ) diff --git a/upgrade-machines_0.2.7/prototypes/technology.lua b/upgrade-machines_0.2.8/prototypes/technology.lua similarity index 100% rename from upgrade-machines_0.2.7/prototypes/technology.lua rename to upgrade-machines_0.2.8/prototypes/technology.lua diff --git a/upgrade-machines_0.2.7/prototypes/technology/bobplates.lua b/upgrade-machines_0.2.8/prototypes/technology/bobplates.lua similarity index 100% rename from upgrade-machines_0.2.7/prototypes/technology/bobplates.lua rename to upgrade-machines_0.2.8/prototypes/technology/bobplates.lua diff --git a/upgrade-machines_0.2.7/prototypes/technology/vanilla.lua b/upgrade-machines_0.2.8/prototypes/technology/vanilla.lua similarity index 100% rename from upgrade-machines_0.2.7/prototypes/technology/vanilla.lua rename to upgrade-machines_0.2.8/prototypes/technology/vanilla.lua