diff --git a/README.md b/README.md index 05ccdac..393978e 100644 --- a/README.md +++ b/README.md @@ -18,12 +18,13 @@ See changelog.txt ### Testing -- Sakuro -- Fuuryuu -- Shadowreaper -- Baisius -- agmech -- Wonder Ginger -- GeneralTank -- JonathanF -- Berkelear +- [Sakuro](https://mods.factorio.com/user/sakuro) +- [Fuuryuu](https://mods.factorio.com/user/fuuryuu) +- [Shadowreaper](https://mods.factorio.com/user/shadowreaper) +- [Baisius](https://mods.factorio.com/user/baisius) +- [agmech](https://mods.factorio.com/user/agmech) +- [Wonder Ginger](https://mods.factorio.com/user/WonderGinger) +- [GeneralTank](https://mods.factorio.com/user/GeneralTank) +- [JonathanF](https://mods.factorio.com/user/JonathanF) +- [Berkelear](https://mods.factorio.com/user/Berkelear) +- [Elanu](https://mods.factorio.com/user/elanu) diff --git a/changelog.txt b/changelog.txt index fea4482..a13e00a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,8 +1,9 @@ --------------------------------------------------------------------------------------------------- Version: 0.0.7 -Date: 2023-03-23 +Date: 2023-03-24 Fixes: - Compatibility fixes for some loadouts + - Fix silicon in CPUs in some loadouts --------------------------------------------------------------------------------------------------- Version: 0.0.6 Date: 2023-03-22 diff --git a/description.md b/description.md index bcb805b..66afb55 100644 --- a/description.md +++ b/description.md @@ -38,3 +38,4 @@ Thanks for testing - [GeneralTank](https://mods.factorio.com/user/GeneralTank) - [JonathanF](https://mods.factorio.com/user/JonathanF) - [Berkelear](https://mods.factorio.com/user/Berkelear) +- [Elanu](https://mods.factorio.com/user/elanu) diff --git a/prototypes/cpu.lua b/prototypes/cpu.lua index 700d07d..0df7919 100644 --- a/prototypes/cpu.lua +++ b/prototypes/cpu.lua @@ -1,11 +1,12 @@ local util = require("data-util"); local silicon = {"stone", 30} -if data.raw.item["sand"] then - local silicon = {"sand", 30} -elseif mods.bzsilicon then +if mods.bzsilicon or mods.Krastorio2 then silicon = data.raw.item["silicon-wafer"] and {"silicon-wafer", 30} or {"silicon", 15} +elseif data.raw.item["sand"] then + silicon = {"sand", 30} end + local spreader = data.raw.item["cuw"] and {"cuw", 2} or {"copper-plate", 2} data:extend({ {