diff --git a/changelog.txt b/changelog.txt index c71e47c..3753c1a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 0.1.4 +Date: 2021-06-15 + Features: + - FE+ compatibility +--------------------------------------------------------------------------------------------------- Version: 0.1.3 Date: 2021-06-15 Fixes: diff --git a/info.json b/info.json index d09e78b..8ab4f6f 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bztungsten", - "version": "0.1.3", + "version": "0.1.4", "factorio_version": "1.1", "title": "Tungsten", "author": "Brevven", diff --git a/tungsten-ore.lua b/tungsten-ore.lua index 4923624..6030b27 100644 --- a/tungsten-ore.lua +++ b/tungsten-ore.lua @@ -3,10 +3,6 @@ local noise = require('noise'); local util = require("__bztungsten__.tungsten-util"); -if mods["FactorioExtended-Plus-Core"] then - util.remove_raw("item", "tungsten-ore") -end - data:extend({ { type = "autoplace-control", diff --git a/tungsten-recipe-updates.lua b/tungsten-recipe-updates.lua index ef0ce29..17e20f3 100644 --- a/tungsten-recipe-updates.lua +++ b/tungsten-recipe-updates.lua @@ -329,3 +329,9 @@ util.add_ingredient("advanced-oil-refinery-rampant-industry", "tungsten-carbide" -- Endgame Combat util.replace_ingredient("sulfur-bullet-magazine", "copper-plate", "tungsten-plate") + + +-- FE+ +if util.fe_plus("Machines") then + util.add_ingredient("oil-refinery-mk2", "tungsten-carbide", 1) +end diff --git a/tungsten-util.lua b/tungsten-util.lua index 161fff5..4ee501e 100644 --- a/tungsten-util.lua +++ b/tungsten-util.lua @@ -8,6 +8,13 @@ if bobmods and bobmods.lib and bobmods.lib.recipe and bobmods.lib.tech then util.tungsten_processing = "bz-tungsten-processing" end +function util.fe_plus(sub) + if mods["FactorioExtended-Plus-"..sub] then + return true + end +end + + function util.get_setting(name) if settings.startup[name] == nil then return nil