diff --git a/bobassembly/changelog.txt b/bobassembly/changelog.txt
index a3308e07..b48aad7a 100644
--- a/bobassembly/changelog.txt
+++ b/bobassembly/changelog.txt
@@ -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:
diff --git a/bobassembly/info.json b/bobassembly/info.json
index 8dee841d..49447ccf 100644
--- a/bobassembly/info.json
+++ b/bobassembly/info.json
@@ -1,6 +1,6 @@
 {
   "name": "bobassembly",
-  "version": "1.1.6",
+  "version": "1.2.0",
   "factorio_version": "1.1",
   "title": "Bob's Assembling machines mod",
   "author": "Bobingabout",
@@ -8,8 +8,8 @@
   "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."
diff --git a/bobassembly/prototypes/assembly-burner.lua b/bobassembly/prototypes/assembly-burner.lua
index 0c09d274..7f85be17 100644
--- a/bobassembly/prototypes/assembly-burner.lua
+++ b/bobassembly/prototypes/assembly-burner.lua
@@ -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",
diff --git a/bobassembly/settings.lua b/bobassembly/settings.lua
index 9d57b65d..b9b14b16 100644
--- a/bobassembly/settings.lua
+++ b/bobassembly/settings.lua
@@ -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",