Version oops

Bumped version

LICENSE

@@ -1,21 +1,24 @@
-MIT License
+This is free and unencumbered software released into the public domain.
 
-Copyright (c) 2020 Wyrrrd
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
+In jurisdictions that recognize copyright laws, the author or authors
-of this software and associated documentation files (the "Software"), to deal
+of this software dedicate any and all copyright interest in the
-in the Software without restriction, including without limitation the rights
+software to the public domain. We make this dedication for the benefit
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+of the public at large and to the detriment of our heirs and
-copies of the Software, and to permit persons to whom the Software is
+successors. We intend this dedication to be an overt act of
-furnished to do so, subject to the following conditions:
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
 
-The above copyright notice and this permission notice shall be included in all
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-copies or substantial portions of the Software.
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+For more information, please refer to <http://unlicense.org>
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -4,5 +4,10 @@
 ### Features
 Changes the recipes of BBR to depend on rails to be more in line with modded rail recipes. You can also enable more expensive recipes via mod settings.
 
+### Examples
+The stone in the rail recipe gets replaced by the bridge material (wood, iron plate or stone brick).
+
+So if your modded rail costs 1x stone, 1x steel and 1x turret (don't ask why), with expensive recipes **disabled**, wooden bridge rail will cost **1x** wood, 1x steel and 1x turret. With expensive recipes **enabled**, wooden bridge rail will cost **5x** wood, 1x steel and 1x turret.
+
 ### Credits
 Thanks to [kapaer](https://mods.factorio.com/user/kapaer) for the [mod](https://mods.factorio.com/mod/beautiful_bridge_railway) this depends on.

changelog.txt

@@ -1,4 +1,24 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.1.0
+Date: 2020-12-02
+  Changes:
+    - Version bump for base game 1.1
+---------------------------------------------------------------------------------------------------
+Version: 0.18.4
+Date: 2020-05-25
+  Changes:
+    - Changed license to the Unlicense
+---------------------------------------------------------------------------------------------------
+Version: 0.18.3
+Date: 2020-03-25
+  Changes:
+    - Updated thumbnail
+---------------------------------------------------------------------------------------------------
+Version: 0.18.2
+Date: 2020-03-20
+  Changes:
+    - Replaced rail ingredient with dynamic recipe ingredients of rail recipe
+---------------------------------------------------------------------------------------------------
 Version: 0.18.1
 Date: 2020-03-19
   Changes:

data-final-fixes.lua

@@ -0,0 +1,23 @@
+local base_recipe = {}
+-- grab rail recipe ingredients except stone
+for _,component in pairs(data.raw["recipe"]["rail"].ingredients) do
+	cname = component[1] or component["name"]
+	camount = component[2] or component["amount"]
+	if cname ~= "stone" then
+		table.insert(base_recipe,{cname,camount})
+	end
+end
+
+data.raw["recipe"]["bbr-rail-wood"].ingredients = table.deepcopy(base_recipe)
+data.raw["recipe"]["bbr-rail-iron"].ingredients = table.deepcopy(base_recipe)
+data.raw["recipe"]["bbr-rail-brick"].ingredients = table.deepcopy(base_recipe)
+
+if settings.startup["bbr_fix_expensive"].value then
+	table.insert(data.raw["recipe"]["bbr-rail-wood"].ingredients,{"wood",5})
+	table.insert(data.raw["recipe"]["bbr-rail-iron"].ingredients,{"iron-plate",5})
+	table.insert(data.raw["recipe"]["bbr-rail-brick"].ingredients,{"stone-brick",5})
+else
+	table.insert(data.raw["recipe"]["bbr-rail-wood"].ingredients,{"wood",1})
+	table.insert(data.raw["recipe"]["bbr-rail-iron"].ingredients,{"iron-plate",1})
+	table.insert(data.raw["recipe"]["bbr-rail-brick"].ingredients,{"stone-brick",1})
+end

data-updates.lua

@@ -1,9 +0,0 @@
-if settings.startup["bbr_fix_expensive"].value then
-	data.raw["recipe"]["bbr-rail-wood"].ingredients = {{"rail",2},{"wood",5}}
-	data.raw["recipe"]["bbr-rail-iron"].ingredients = {{"rail",2},{"iron-plate",5}}
-	data.raw["recipe"]["bbr-rail-brick"].ingredients = {{"rail",2},{"stone-brick",5}}
-else
-	data.raw["recipe"]["bbr-rail-wood"].ingredients = {{"rail",2},{"wood",1}}
-	data.raw["recipe"]["bbr-rail-iron"].ingredients = {{"rail",2},{"iron-plate",1}}
-	data.raw["recipe"]["bbr-rail-brick"].ingredients = {{"rail",2},{"stone-brick",1}}
-end

info.json

@@ -1,12 +1,12 @@
 {
     "name": "bbr-fix",
-    "version": "0.18.1",
+    "version": "1.1.0",
     "title": "Beautiful Bridge Railway - Recipe Fix",
     "author": "Wyrrrd",
-    "factorio_version": "0.18",
+    "factorio_version": "1.1",
     "dependencies": [
-		"base >= 0.18",
+		"base >= 1.1.0",
-		"beautiful_bridge_railway >= 0.18.1"
+		"beautiful_bridge_railway >= 1.1.1"
 	],
     "description": "Adds rails to recipes."
 }