Merge branch 'main' into quest_mv_fix

config/Advancedperipherals/world.toml

@@ -4,7 +4,7 @@
 	#Enable the villager structures for the computer scientist.
 	enableVillagerStructures = true
 	#Gives the ap documentation to new players.
-	givePlayerBookOnJoin = true
+	givePlayerBookOnJoin = false
 	#The weight of the villager structures.
 	#Range: 0 ~ 16000
 	villagerStructureWeight = 10

config/create_connected-common.toml

@@ -8,7 +8,6 @@ migrateCopycatsOnInitialize = false
 #.
 #Enable/disable features. Values on server override clients
 [features]
-	#.
 	bamboo_window = false
 	item_silo = true
 	inverted_clutch = true
@@ -35,4 +34,9 @@ migrateCopycatsOnInitialize = false
 	copycat_beam = false
 	copycat_board = false
 	copycat_fence = false
+	#.
+	fluid_vessel = true
+	large_crank_wheel = true
+	crank_wheel = true
+	fan_freezing_catalyst = true
 

config/ftbquests/quests/chapters/primitive_age.snbt

@@ -2304,7 +2304,7 @@
 					Count: 1
 					id: "ftbfiltersystem:smart_filter"
 					tag: {
-						"ftbfiltersystem:filter": "or(item(gtceu:rich_raw_hematite)item(gtceu:raw_hematite)item(tfc:ore/small_hematite)item(gtceu:poor_raw_hematite)item(gtceu:rich_raw_yellow_limonite)item(tfc:ore/small_limonite)item(gtceu:poor_raw_yellow_limonite)item(gtceu:raw_yellow_limonite)item(tfc:ore/small_magnetite)item(gtceu:poor_raw_magnetite)item(gtceu:raw_magnetite)item(gtceu:rich_raw_magnetite)item(gtceu:poor_raw_iron)item(minecraft:raw_iron)item(gtceu:rich_raw_iron)item(gtceu:poor_raw_goethite)item(gtceu:raw_goethite)item(gtceu:rich_raw_goethite)item(gtceu:poor_raw_pyrite)item(gtceu:raw_pyrite)item(gtceu:rich_raw_pyrite))"
+						"ftbfiltersystem:filter": "or(item(gtceu:rich_raw_hematite)item(gtceu:raw_hematite)item(tfc:ore/small_hematite)item(gtceu:poor_raw_hematite)item(gtceu:rich_raw_yellow_limonite)item(tfc:ore/small_limonite)item(gtceu:poor_raw_yellow_limonite)item(gtceu:raw_yellow_limonite)item(tfc:ore/small_magnetite)item(gtceu:poor_raw_magnetite)item(gtceu:raw_magnetite)item(gtceu:rich_raw_magnetite)item(gtceu:poor_raw_iron)item(minecraft:raw_iron)item(gtceu:rich_raw_iron)item(gtceu:poor_raw_goethite)item(gtceu:raw_goethite)item(gtceu:rich_raw_goethite)item(gtceu:poor_raw_pyrite)item(gtceu:raw_pyrite)item(gtceu:rich_raw_pyrite)item(gtceu:crushed_yellow_limonite_ore))"
 					}
 				}
 				title: "Any Iron Ore"

config/letmedespawn.json

@@ -0,0 +1,3 @@
+{
+  "mobNames": []
+}

config/shimmer-client.toml

@@ -0,0 +1,30 @@
+#setting UBO offset
+#-1 for auto setting
+#maximum is limited by your gpu,the OpenGL constant:GL_MAX_UNIFORM_BUFFER_BINDINGS-1,at least 36-1
+#Range: -1 ~ 128
+"UBO offset" = -1
+#setting block bloom
+#true for effect on
+#Block bloom only, does not apply to post-processing
+"Block Bloom Effect" = true
+#using light analyzeShaderProperties for more realistic lighting
+#true for light analyzeShaderProperties ON
+#If using the light analyzeShaderProperties, the light is more realistic and avoid lights through the wall. The light is smoother when closed. It is a tradeoff.
+"Using Light Map" = true
+"enable colored light" = false
+"enable bloom effect" = true
+#using additive blend for colored lights 
+#true - vivid, false - realistic
+"additive effect" = false
+#the color attachment number used for store bloom information
+#range from 1 (0 for vanilla use) to GL_MAX_COLOR_ATTACHMENTS-1, at least 8-1
+#
+#Range: 1 ~ 16
+"bloom color attachment number" = 1
+#whether inset shader name into shader source file or not
+#
+"inset shader" = false
+#whether enable buildin shimmer.json
+#
+"enable buildin setting" = true
+

config/sodium-extra-options.json

@@ -45,20 +45,20 @@
     "overlay_corner": "TOP_LEFT",
     "text_contrast": "NONE",
     "show_fps": false,
-    "show_f_p_s_extended": true,
+    "show_f_p_s_extended": false,
     "show_coords": false,
     "reduce_resolution_on_mac": false,
     "use_adaptive_sync": false,
     "cloud_height": 192,
     "cloud_distance": 100,
-    "toasts": true,
+    "toasts": false,
     "advancement_toast": false,
     "recipe_toast": false,
     "system_toast": false,
     "tutorial_toast": false,
     "instant_sneak": false,
     "prevent_shaders": false,
-    "steady_debug_hud": true,
+    "steady_debug_hud": false,
     "steady_debug_hud_refresh_interval": 10
   },
   "super_secret_settings": {