Skip to content

Commit

Permalink
AAI Industry Compatibility #133
Browse files Browse the repository at this point in the history
  • Loading branch information
KiwiHawk committed Aug 2, 2023
1 parent f89da9d commit 8ddf423
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
5 changes: 5 additions & 0 deletions bobassembly/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
---------------------------------------------------------------------------------------------------
Version: 1.2.0
Date: ???
Changes:
- Hid setting "Burner and steam assembling machines" when AAI Industry mod is enabled #133
---------------------------------------------------------------------------------------------------
Version: 1.1.6
Date: 01. 01. 2023
Bugfixes:
Expand Down
6 changes: 3 additions & 3 deletions bobassembly/info.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "bobassembly",
"version": "1.1.6",
"version": "1.2.0",
"factorio_version": "1.1",
"title": "Bob's Assembling machines mod",
"author": "Bobingabout",
"contact": "[email protected]",
"homepage": "https://forums.factorio.com/viewforum.php?f=51",
"dependencies": [
"base >= 1.1.0",
"boblibrary >= 1.1.6",
"? bobplates >= 1.1.6",
"boblibrary >= 1.2.0",
"? bobplates >= 1.2.0",
"(?) space-exploration"
],
"description": "Requires Bob's functions library mod\n\nThis mod adds assembling machines 4, 5 and 6, and updates the recipe for assembling machine 3 to fit my progression pattern.\nThe mod also adds higher tiers of Electric furnace, Chemical plant and Oil refinery.\nIt also includes the Electronic assembling machine chain, and additional tiers of machines added by Bob's Metals, Chemicals and Intermediates mod.\n\nDesigned to work best with my full mod pack.\nAll additional machine tiers other than assembling machines can be turned off in the mod options."
Expand Down
2 changes: 1 addition & 1 deletion bobassembly/prototypes/assembly-burner.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
if settings.startup["bobmods-assembly-burner"].value == true then
if not mods["aai-industry"] and settings.startup["bobmods-assembly-burner"].value == true then
data:extend({
{
type = "item",
Expand Down
1 change: 1 addition & 0 deletions bobassembly/settings.lua
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ data:extend({
name = "bobmods-assembly-burner",
setting_type = "startup",
default_value = true,
hidden = mods["aai-industry"] and true or false,
},
{
type = "bool-setting",
Expand Down

0 comments on commit 8ddf423

Please sign in to comment.