Add allow_as_intermediate to all recipes

Signed-off-by: Jelmergu <[email protected]>
Jelmergu · Feb 2, 2018 · 0af9d90 · 0af9d90
1 parent bd9f39d
commit 0af9d90
Show file tree

Hide file tree

Showing 27 changed files with 26 additions and 11 deletions.
diff --git 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 → upgrade-machines_0.2.8/Jelmergu.lua b/upgrade-machines_0.2.7/Jelmergu.lua → 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 → upgrade-machines_0.2.8/changelog.txt b/upgrade-machines_0.2.7/changelog.txt → 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 → upgrade-machines_0.2.8/data-updates.lua b/upgrade-machines_0.2.7/data-updates.lua → upgrade-machines_0.2.8/data-updates.lua
diff --git a/upgrade-machines_0.2.7/data.lua → upgrade-machines_0.2.8/data.lua b/upgrade-machines_0.2.7/data.lua → upgrade-machines_0.2.8/data.lua
diff --git a/...aphics/icons/burner-to-electric-drill.png → ...aphics/icons/burner-to-electric-drill.png b/...aphics/icons/burner-to-electric-drill.png → ...aphics/icons/burner-to-electric-drill.png
diff --git a/...ics/icons/burner-to-electric-inserter.png → ...ics/icons/burner-to-electric-inserter.png b/...ics/icons/burner-to-electric-inserter.png → ...ics/icons/burner-to-electric-inserter.png
diff --git a/...aphics/icons/pistol-to-combat-shotgun.png → ...aphics/icons/pistol-to-combat-shotgun.png b/...aphics/icons/pistol-to-combat-shotgun.png → ...aphics/icons/pistol-to-combat-shotgun.png
diff --git a/....2.7/graphics/icons/pistol-to-shotgun.png → ....2.8/graphics/icons/pistol-to-shotgun.png b/....2.7/graphics/icons/pistol-to-shotgun.png → ....2.8/graphics/icons/pistol-to-shotgun.png
diff --git a/...7/graphics/icons/pistol-to-submachine.png → ...8/graphics/icons/pistol-to-submachine.png b/...7/graphics/icons/pistol-to-submachine.png → ...8/graphics/icons/pistol-to-submachine.png
diff --git a/...ns/steel-chemical-to-electric-furnace.png → ...ns/steel-chemical-to-electric-furnace.png b/...ns/steel-chemical-to-electric-furnace.png → ...ns/steel-chemical-to-electric-furnace.png
diff --git a/...cons/steel-mixing-to-electric-furnace.png → ...cons/steel-mixing-to-electric-furnace.png b/...cons/steel-mixing-to-electric-furnace.png → ...cons/steel-mixing-to-electric-furnace.png
diff --git a/...phics/icons/steel-to-electric-furnace.png → ...phics/icons/steel-to-electric-furnace.png b/...phics/icons/steel-to-electric-furnace.png → ...phics/icons/steel-to-electric-furnace.png
diff --git a/...icons/stone-chemical-to-steel-furnace.png → ...icons/stone-chemical-to-steel-furnace.png b/...icons/stone-chemical-to-steel-furnace.png → ...icons/stone-chemical-to-steel-furnace.png
diff --git a/...s/icons/stone-mixing-to-steel-furnace.png → ...s/icons/stone-mixing-to-steel-furnace.png b/...s/icons/stone-mixing-to-steel-furnace.png → ...s/icons/stone-mixing-to-steel-furnace.png
diff --git a/...graphics/icons/stone-to-steel-furnace.png → ...graphics/icons/stone-to-steel-furnace.png b/...graphics/icons/stone-to-steel-furnace.png → ...graphics/icons/stone-to-steel-furnace.png
diff --git a/upgrade-machines_0.2.7/info.json → upgrade-machines_0.2.8/info.json b/upgrade-machines_0.2.7/info.json → 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"
 }
diff --git a/...-machines_0.2.7/locale/en/recipe-name.cfg → ...-machines_0.2.8/locale/en/recipe-name.cfg b/...-machines_0.2.7/locale/en/recipe-name.cfg → ...-machines_0.2.8/locale/en/recipe-name.cfg
diff --git a/...migrations/2017-10-08_Factorio_0.15.0.lua → ...migrations/2017-10-08_Factorio_0.15.0.lua b/...migrations/2017-10-08_Factorio_0.15.0.lua → ...migrations/2017-10-08_Factorio_0.15.0.lua
diff --git a/...migrations/2017-10-26_Factorio_0.15.0.lua → ...migrations/2017-10-26_Factorio_0.15.0.lua b/...migrations/2017-10-26_Factorio_0.15.0.lua → ...migrations/2017-10-26_Factorio_0.15.0.lua
diff --git a/...migrations/2017-11-19_Factorio_0.15.0.lua → ...migrations/2017-11-19_Factorio_0.15.0.lua b/...migrations/2017-11-19_Factorio_0.15.0.lua → ...migrations/2017-11-19_Factorio_0.15.0.lua
diff --git a/upgrade-machines_0.2.7/prototypes/recipe.lua → upgrade-machines_0.2.8/prototypes/recipe.lua b/upgrade-machines_0.2.7/prototypes/recipe.lua → upgrade-machines_0.2.8/prototypes/recipe.lua
diff --git a/...es_0.2.7/prototypes/recipes/bobplates.lua → ...es_0.2.8/prototypes/recipes/bobplates.lua b/...es_0.2.7/prototypes/recipes/bobplates.lua → ...es_0.2.8/prototypes/recipes/bobplates.lua
diff --git a/...ines_0.2.7/prototypes/recipes/vanilla.lua → ...ines_0.2.8/prototypes/recipes/vanilla.lua b/...ines_0.2.7/prototypes/recipes/vanilla.lua → ...ines_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/...-machines_0.2.7/prototypes/technology.lua → ...-machines_0.2.8/prototypes/technology.lua b/...-machines_0.2.7/prototypes/technology.lua → ...-machines_0.2.8/prototypes/technology.lua
diff --git a/...0.2.7/prototypes/technology/bobplates.lua → ...0.2.8/prototypes/technology/bobplates.lua b/...0.2.7/prototypes/technology/bobplates.lua → ...0.2.8/prototypes/technology/bobplates.lua
diff --git a/...s_0.2.7/prototypes/technology/vanilla.lua → ...s_0.2.8/prototypes/technology/vanilla.lua b/...s_0.2.7/prototypes/technology/vanilla.lua → ...s_0.2.8/prototypes/technology/vanilla.lua