diff --git a/config/aiimprovements-common.toml b/config/aiimprovements-common.toml
new file mode 100644
index 000000000..9b081ebca
--- /dev/null
+++ b/config/aiimprovements-common.toml
@@ -0,0 +1,123 @@
+
+#Entity Settings
+[entity]
+
+	#General
+	[entity.general]
+		#Allow AI tasks to be removed from entities at runtime. If this is disable no per mob or per mob type removes will run.
+		allow_remove_calls = true
+		#Allows repeat remove calls to bubble to the top of the list to improve performance of repeat mob spawning.
+		enable_call_bubbling = true
+
+	#Entity Mob
+	[entity.mob]
+
+		#Remove Look Goal
+		[entity.mob.remove_look_goal]
+			#Remove the look at goal (player or attack target) AI task. This will cause AIs to not face targets or walking directions.
+			remove_look_goal = false
+			#Set this to true to apply this setting to all mobs on the filter list. Set this to false to NOT apply this to mobs on the filter list.
+			is_allowlist = false
+			#The list of mobs that is affected by this setting according to is_allowlist
+			filter_list = []
+
+		#Remove Look Random
+		[entity.mob.remove_look_random]
+			#Remove the look at random position AI task. This will cause AIs to feel a little lifeless as they do not animate head movement while idle.
+			remove_look_random = false
+			#Set this to true to apply this setting to all mobs on the filter list. Set this to false to NOT apply this to mobs on the filter list.
+			is_allowlist = false
+			#The list of mobs that is affected by this setting according to is_allowlist
+			filter_list = []
+
+		#Replace Look Controller
+		[entity.mob.replace_look_controller]
+			#Replaces the default look controller with a version featuring cached tan math improving performance. Only works on vanilla style mobs, if a mod overrides the look controller it will skip.
+			replace_look_controller = true
+			#Set this to true to apply this setting to all mobs on the filter list. Set this to false to NOT apply this to mobs on the filter list.
+			is_allowlist = false
+			#The list of mobs that is affected by this setting according to is_allowlist
+			filter_list = []
+
+	#Entity Fish
+	[entity.fish]
+		#Remove the fish's random swimming pathfinder. This will cause fish to stay in position more often.
+		remove_swim = false
+		#Remove the fish's panic pathfinder. This will cause fish to not run away.
+		remove_panic = false
+		#Remove the fish's AI task to avoid players.
+		remove_avoid_player = false
+		#Remove the fish's AI task to follow a leader fish to act as a group of fish.
+		remove_follow_leader = false
+		#Remove the fish's AI task to puff up when entities are nearby
+		remove_puff = false
+
+	#Squid Fish
+	[entity.squid]
+		#Remove the squid's flee pathfinder. This will cause squid to not run away.
+		remove_flee = false
+		#Remove the squid's random movement pathfinder. This will cause squid to swim around randomly.
+		remove_random_move = false
+
+	#Cow
+	[entity.cow]
+		#Remove the cow's float AI task. This causes cows to no longer swim in water.
+		remove_float = false
+		#Remove the cow's panic AI task. This causes cows to no longer run around after being hit, or search water to extinguish themselves.
+		remove_panic = false
+		#Remove the cow's breed AI task. This causes cows to be unable to breed to create offspring.
+		remove_breed = false
+		#Remove the cow's tempt AI task. This causes cows to no longer follow the player if they're holding an item they like.
+		remove_tempt = false
+		#Remove the cow's follow parent AI task. This causes baby cows to no longer follow their parents.
+		remove_follow_parent = false
+		#Remove the cow's random stroll AI task. This causes cows to no longer walk around randomly.
+		remove_stroll = false
+
+	#Chicken
+	[entity.chicken]
+		#Remove the chicken's float AI task. This causes chickens to no longer swim in water.
+		remove_float = false
+		#Remove the chicken's panic AI task. This causes chickens to no longer run around after being hit, or search water to extinguish themselves.
+		remove_panic = false
+		#Remove the chicken's breed AI task. This causes chickens to be unable to breed to create offspring.
+		remove_breed = false
+		#Remove the chicken's tempt AI task. This causes chickens to no longer follow the player if they're holding an item they like.
+		remove_tempt = false
+		#Remove the chicken's follow parent AI task. This causes baby chickens to no longer follow their parents.
+		remove_follow_parent = false
+		#Remove the chicken's random stroll AI task. This causes chickens to no longer walk around randomly.
+		remove_stroll = false
+
+	#Pig
+	[entity.pig]
+		#Remove the pig's float AI task. This causes pigs to no longer swim in water.
+		remove_float = false
+		#Remove the pig's panic AI task. This causes pigs to no longer run around after being hit, or search water to extinguish themselves.
+		remove_panic = false
+		#Remove the pig's breed AI task. This causes pigs to be unable to breed to create offspring.
+		remove_breed = false
+		#Remove the pig's tempt AI task. This causes pigs to no longer follow the player if they're holding an item they like.
+		remove_tempt = false
+		#Remove the pig's follow parent AI task. This causes baby pigs to no longer follow their parents.
+		remove_follow_parent = false
+		#Remove the pig's random stroll AI task. This causes pigs to no longer walk around randomly.
+		remove_stroll = false
+
+	#Sheep
+	[entity.sheep]
+		#Remove the sheep's float AI task. This causes sheep to no longer swim in water.
+		remove_float = false
+		#Remove the sheep's panic AI task. This causes sheep to no longer run around after being hit, or search water to extinguish themselves.
+		remove_panic = false
+		#Remove the sheep's breed AI task. This causes sheep to be unable to breed to create offspring.
+		remove_breed = false
+		#Remove the sheep's tempt AI task. This causes sheep to no longer follow the player if they're holding an item they like.
+		remove_tempt = false
+		#Remove the sheep's follow parent AI task. This causes baby sheep to no longer follow their parents.
+		remove_follow_parent = false
+		#Remove the sheep's random stroll AI task. This causes sheep to no longer walk around randomly.
+		remove_stroll = false
+		#Remove the sheep's eat block AI task. This causes sheep to no longer eat grass, and thus be unable to regenerate their wool.
+		remove_eat_block = false
+
diff --git a/config/canary.properties b/config/canary.properties
new file mode 100644
index 000000000..d974709af
--- /dev/null
+++ b/config/canary.properties
@@ -0,0 +1,8 @@
+# This is the configuration file for Canary.
+# This file exists for debugging purposes and should not be configured otherwise.
+# Before configuring anything, take a backup of the worlds that will be opened.
+#
+# You can find information on editing this file and all the available options here:
+# https://github.com/AbdElAziz333/Canary/wiki/Configuration-File
+#
+# By default, this file will be empty except for this notice.
diff --git a/config/ftbquests/quests/chapters/large_turbines.snbt b/config/ftbquests/quests/chapters/large_turbines.snbt
index ad79c7824..34b08cabb 100644
--- a/config/ftbquests/quests/chapters/large_turbines.snbt
+++ b/config/ftbquests/quests/chapters/large_turbines.snbt
@@ -146,7 +146,16 @@
 				""
 				"&9-&r A little bit of Math is required to get the expected results."
 			]
-			icon: "minecraft:barrier"
+			icon: {
+				Count: 1b
+				ForgeCaps: {
+					"tfc:item_heat": {
+						heat: 0.0f
+						ticks: 0L
+					}
+				}
+				id: "minecraft:barrier"
+			}
 			id: "33F0EA149F3705CF"
 			size: 0.76d
 			tasks: [{
diff --git a/config/ftbquests/quests/chapters/the_cleanroom.snbt b/config/ftbquests/quests/chapters/the_cleanroom.snbt
index c9932b369..5b665c8ac 100644
--- a/config/ftbquests/quests/chapters/the_cleanroom.snbt
+++ b/config/ftbquests/quests/chapters/the_cleanroom.snbt
@@ -145,7 +145,16 @@
 		{
 			dependencies: ["6177B1FCB7B40394"]
 			description: ["Placing &3Generators&r or &3Mufflers&r inside is &cnot allowed&r. The Cleanroom will unform."]
-			icon: "minecraft:barrier"
+			icon: {
+				Count: 1b
+				ForgeCaps: {
+					"tfc:item_heat": {
+						heat: 0.0f
+						ticks: 0L
+					}
+				}
+				id: "minecraft:barrier"
+			}
 			id: "5A3AC1DD5EC6E4C3"
 			shape: "rsquare"
 			size: 0.75d
diff --git a/config/gtceu.yaml b/config/gtceu.yaml
index 4ab8022fe..adca00fea 100644
--- a/config/gtceu.yaml
+++ b/config/gtceu.yaml
@@ -118,6 +118,11 @@ worldgen:
     # Default: 512 (requires restarting the server / re-opening the world)
     oreGenerationChunkCacheSize: 512
 
+    # Sets the maximum number of chunks for which ore indicators may be cached.
+    # If you register any custom veins with very large indicator ranges (or modify existing ones that way), you may need to increase this value.
+    # Default: 2048 (requires restarting the server / re-opening the world)
+    oreIndicatorChunkCacheSize: 2048
+
 machines:
   # Whether insufficient energy supply should reset Machine recipe progress to zero.
   # If true, progress will reset.
@@ -201,6 +206,10 @@ machines:
   # Default: false
   highTierContent: false
 
+  # Whether search for recipes asynchronously.
+  #  Default: true
+  asyncRecipeSearching: true
+
 client:
   # Whether or not to enable Emissive Textures for GregTech Machines.
   # Default: true
diff --git a/config/jade/plugins.json b/config/jade/plugins.json
index 425d9a312..d90f9b942 100644
--- a/config/jade/plugins.json
+++ b/config/jade/plugins.json
@@ -66,6 +66,20 @@
     "painting": true,
     "chiseled_bookshelf": true
   },
+  "firmalife": {
+    "oven_top": true,
+    "solar_drier": true,
+    "string": true,
+    "vat": true,
+    "oven_bottom": true,
+    "fruit_tree_sapling": true,
+    "jarbnet": true,
+    "drying_mat": true,
+    "tumbler": true,
+    "hanger": true,
+    "cheese": true,
+    "shelf": true
+  },
   "tfc": {
     "bloomery": true,
     "nest_box": true,
diff --git a/config/jade/sort-order.json b/config/jade/sort-order.json
index 09adbf441..4b5277e9e 100644
--- a/config/jade/sort-order.json
+++ b/config/jade/sort-order.json
@@ -247,5 +247,17 @@
   "ae2:part_icon": null,
   "ae2:part_tooltip": null,
   "ae2:part_mod_name": null,
-  "treetap:tap": null
+  "treetap:tap": null,
+  "firmalife:drying_mat": null,
+  "firmalife:solar_drier": null,
+  "firmalife:string": null,
+  "firmalife:cheese": null,
+  "firmalife:oven_bottom": null,
+  "firmalife:oven_top": null,
+  "firmalife:shelf": null,
+  "firmalife:hanger": null,
+  "firmalife:vat": null,
+  "firmalife:tumbler": null,
+  "firmalife:fruit_tree_sapling": null,
+  "firmalife:jarbnet": null
 }
\ No newline at end of file
diff --git a/config/modernfix-mixins.properties b/config/modernfix-mixins.properties
index 1c6ca9543..d293693f4 100644
--- a/config/modernfix-mixins.properties
+++ b/config/modernfix-mixins.properties
@@ -66,6 +66,7 @@
 #  mixin.perf.fast_registry_validation=true # (default)
 #  mixin.perf.faster_item_rendering=false # (default)
 #  mixin.perf.faster_texture_stitching=true # (default)
+#  mixin.perf.forge_registry_lambda=true # (default)
 #  mixin.perf.kubejs=true # (default)
 #  mixin.perf.model_optimizations=true # (default)
 #  mixin.perf.mojang_registry_size=true # (default)
diff --git a/config/xaerominimap_entities.json b/config/xaerominimap_entities.json
index 46474f8c6..c2360d359 100644
--- a/config/xaerominimap_entities.json
+++ b/config/xaerominimap_entities.json
@@ -22,8 +22,8 @@
     "startFadingAt": 0.0,
     "renderOverMinimapFrame": 1.0,
     "icons": 1.0,
-    "heightLimit": 20.0,
     "names": 0.0,
+    "heightLimit": 20.0,
     "iconScale": 1.0
   },
   "subCategories": [
diff --git a/mods/Firmalife-1.20.1-2.0.0-beta.jar b/mods/Firmalife-1.20.1-2.0.2-beta.jar
similarity index 80%
rename from mods/Firmalife-1.20.1-2.0.0-beta.jar
rename to mods/Firmalife-1.20.1-2.0.2-beta.jar
index 978ca9cc8..56bd9b20b 100644
Binary files a/mods/Firmalife-1.20.1-2.0.0-beta.jar and b/mods/Firmalife-1.20.1-2.0.2-beta.jar differ
diff --git a/mods/PuzzlesLib-v8.1.9-1.20.1-Forge.jar b/mods/PuzzlesLib-v8.1.11-1.20.1-Forge.jar
similarity index 79%
rename from mods/PuzzlesLib-v8.1.9-1.20.1-Forge.jar
rename to mods/PuzzlesLib-v8.1.11-1.20.1-Forge.jar
index e74728958..7bd1fa814 100644
Binary files a/mods/PuzzlesLib-v8.1.9-1.20.1-Forge.jar and b/mods/PuzzlesLib-v8.1.11-1.20.1-Forge.jar differ
diff --git a/mods/canary-mc1.20.1-0.2.7.jar b/mods/canary-mc1.20.1-0.2.7.jar
new file mode 100644
index 000000000..123307d32
Binary files /dev/null and b/mods/canary-mc1.20.1-0.2.7.jar differ
diff --git a/mods/gtceu-forge-1.20.1-1.0.16.jar b/mods/gtceu-forge-1.20.1-1.0.17.jar
similarity index 82%
rename from mods/gtceu-forge-1.20.1-1.0.16.jar
rename to mods/gtceu-forge-1.20.1-1.0.17.jar
index d039a55a0..1d4b19cca 100644
Binary files a/mods/gtceu-forge-1.20.1-1.0.16.jar and b/mods/gtceu-forge-1.20.1-1.0.17.jar differ
diff --git a/mods/modernfix-forge-5.9.3+mc1.20.1.jar b/mods/modernfix-forge-5.10.0+mc1.20.1.jar
similarity index 86%
rename from mods/modernfix-forge-5.9.3+mc1.20.1.jar
rename to mods/modernfix-forge-5.10.0+mc1.20.1.jar
index 522a43f4e..34c92d6a4 100644
Binary files a/mods/modernfix-forge-5.9.3+mc1.20.1.jar and b/mods/modernfix-forge-5.10.0+mc1.20.1.jar differ