Found a 0.2.6 version on modportal

Signed-off-by: Jelmergu <[email protected]>
Jelmergu · Jan 15, 2018 · bd9f39d · bd9f39d
1 parent f4cf88b
commit bd9f39d
Show file tree

Hide file tree

Showing 29 changed files with 19 additions and 74 deletions.
diff --git a/upgrade-machines_0.2.5/Jelmergu.lua b/upgrade-machines_0.2.5/Jelmergu.lua
diff --git a/upgrade-machines_0.2.6/addRecipe.lua b/upgrade-machines_0.2.6/addRecipe.lua
diff --git a/upgrade-machines_0.2.6/prototypes/technology.lua b/upgrade-machines_0.2.6/prototypes/technology.lua
diff --git a/upgrade-machines_0.2.6/Jelmergu.lua → upgrade-machines_0.2.7/Jelmergu.lua b/upgrade-machines_0.2.6/Jelmergu.lua → upgrade-machines_0.2.7/Jelmergu.lua
@@ -31,6 +31,10 @@ function Jelmergu:addConditionalRecipe(conditionalItems, recipe)
         end
     end
 
+    if execute ~= true then
+        return
+    end
+
     if not recipe.results then
         recipe.result = conditionalItems[2]
     else

diff --git a/upgrade-machines_0.2.6/changelog.txt → upgrade-machines_0.2.7/changelog.txt b/upgrade-machines_0.2.6/changelog.txt → upgrade-machines_0.2.7/changelog.txt
@@ -1,8 +1,15 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.2.7
+Date: 15. 01. 2018
+  General:
+    - Added changelog
+  Fixes:
+    - Fixed that burner to electric drill was used as intermediate of burner mining drill recipe
+---------------------------------------------------------------------------------------------------
 Version: 0.2.5
 Date: 14. 12. 2017
   General:
-  - Update for Factorio version 0.16
+    - Update for Factorio version 0.16
   Fixes:
     - Corrected locales for pistol to (combat) shotgun
 ---------------------------------------------------------------------------------------------------
@@ -33,7 +40,7 @@ Date: 31. 10. 2017
 ---------------------------------------------------------------------------------------------------
 Version: 0.2.0
 Date: 28. 10. 2017
-  Extramod support
+  Extramod support:
     - Add Bobs Plates support with new recipes
   New recipes:
     - Mixing to Steel Mixing furnace

diff --git a/upgrade-machines_0.2.6/data-updates.lua → upgrade-machines_0.2.7/data-updates.lua b/upgrade-machines_0.2.6/data-updates.lua → upgrade-machines_0.2.7/data-updates.lua
diff --git a/upgrade-machines_0.2.6/data.lua → upgrade-machines_0.2.7/data.lua b/upgrade-machines_0.2.6/data.lua → upgrade-machines_0.2.7/data.lua
@@ -1,4 +1,4 @@
-require ("addRecipe")
+require ("Jelmergu")
 
 require ("prototypes.recipe")
 require ("prototypes.technology")
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.6/graphics/icons/pistol-to-shotgun.png → ....2.7/graphics/icons/pistol-to-shotgun.png b/....2.6/graphics/icons/pistol-to-shotgun.png → ....2.7/graphics/icons/pistol-to-shotgun.png
diff --git a/...6/graphics/icons/pistol-to-submachine.png → ...7/graphics/icons/pistol-to-submachine.png b/...6/graphics/icons/pistol-to-submachine.png → ...7/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.6/info.json → upgrade-machines_0.2.7/info.json b/upgrade-machines_0.2.6/info.json → upgrade-machines_0.2.7/info.json
@@ -1,11 +1,11 @@
 {
     "name": "upgrade-machines",
-    "version": "0.2.6",
+    "version": "0.2.7",
     "title": "Upgrade Machines",
     "author": "Jelmergu",
     "contact": "",
     "homepage": "",
-    "factorio_version": "0.15",
+    "factorio_version": "0.16",
     "dependencies": ["base >= 0.16", "? 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.6/locale/en/recipe-name.cfg → ...-machines_0.2.7/locale/en/recipe-name.cfg b/...-machines_0.2.6/locale/en/recipe-name.cfg → ...-machines_0.2.7/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.6/prototypes/recipe.lua → upgrade-machines_0.2.7/prototypes/recipe.lua b/upgrade-machines_0.2.6/prototypes/recipe.lua → upgrade-machines_0.2.7/prototypes/recipe.lua
diff --git a/...es_0.2.6/prototypes/recipes/bobplates.lua → ...es_0.2.7/prototypes/recipes/bobplates.lua b/...es_0.2.6/prototypes/recipes/bobplates.lua → ...es_0.2.7/prototypes/recipes/bobplates.lua
diff --git a/...ines_0.2.6/prototypes/recipes/vanilla.lua → ...ines_0.2.7/prototypes/recipes/vanilla.lua b/...ines_0.2.6/prototypes/recipes/vanilla.lua → ...ines_0.2.7/prototypes/recipes/vanilla.lua
diff --git a/upgrade-machines_0.2.7/prototypes/technology.lua b/upgrade-machines_0.2.7/prototypes/technology.lua
@@ -0,0 +1,3 @@
+require("technology.vanilla")
+
+--if mods.bobplates then require("technology.bobplates") end
diff --git a/...0.2.6/prototypes/technology/bobplates.lua → ...0.2.7/prototypes/technology/bobplates.lua b/...0.2.6/prototypes/technology/bobplates.lua → ...0.2.7/prototypes/technology/bobplates.lua
diff --git a/...s_0.2.6/prototypes/technology/vanilla.lua → ...s_0.2.7/prototypes/technology/vanilla.lua b/...s_0.2.6/prototypes/technology/vanilla.lua → ...s_0.2.7/prototypes/technology/vanilla.lua
-Original file line number
+Diff line change
@@ Expand Up @@
             end
         end
+        if execute ~= true then
+            return
+        end
         if not recipe.results then
             recipe.result = conditionalItems[2]
         else
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		require("technology.vanilla")

		--if mods.bobplates then require("technology.bobplates") end