merged from upstream

config/InventoryHUD/curios.json

@@ -13,6 +13,13 @@
         "halign": "LEFT",
         "valign": "BOTTOM"
     },
+    "face": {
+        "x": 2,
+        "y": 134,
+        "enabled": true,
+        "halign": "LEFT",
+        "valign": "BOTTOM"
+    },
     "hands": {
         "x": 2,
         "y": 44,

config/ModernUI/bootstrap.properties

@@ -0,0 +1,3 @@
+#Modern UI bootstrap file
+#Fri Dec 19 22:14:20 EST 2025
+modernui_mc_disableSmoothScrolling=true

config/ModernUI/client.toml

@@ -0,0 +1,188 @@
+
+#Screen Config
+[screen]
+	#The duration of GUI background color and blur radius animation in milliseconds. (0 = OFF)
+	#Range: 0 ~ 800
+	animationDuration = 200
+	#The GUI background color in #RRGGBB or #AARRGGBB format. Default value: #99000000
+	#Can be one to four values representing top left, top right, bottom right and bottom left color.
+	#Multiple values produce a gradient effect, whereas one value produce a solid color.
+	#When values is less than 4, the rest of the corner color will be replaced by the last value.
+	backgroundColor = ["#99000000"]
+	#Add Gaussian blur effect to GUI background when opened.
+	#Disable this if you run into a problem or are on low-end PCs
+	blurEffect = true
+	#This option means that blur effect only applies to GUI screens with a background.
+	#Similar to Minecraft 1.20.6. Enable this for better optimization & compatibility.
+	blurWithBackground = true
+	#The kernel radius for gaussian convolution blur effect, 0 = disable.
+	#samples per pixel = ((radius * 2) + 1) * 2, sigma = radius / 2.
+	#Range: 0 ~ 18
+	blurRadius = 7
+	#A list of GUI screen superclasses that won't activate blur effect when opened.
+	blurBlacklist = ["net.minecraft.client.gui.screens.ChatScreen"]
+	#(Beta) Pause the game when inventory (also includes creative mode) opened.
+	inventoryPause = false
+	#Framerate limit on window inactive (out of focus or minimized), 0 = no change.
+	#Range: 0 ~ 255
+	framerateInactive = 10
+	#Framerate limit on window minimized, 0 = same as framerate inactive.
+	#This value will be no greater than framerate inactive.
+	#Range: 0 ~ 255
+	framerateMinimized = 0
+	#Master volume multiplier on window inactive (out of focus or minimized), 1 = no change.
+	#Range: 0.0 ~ 1.0
+	masterVolumeInactive = 0.5
+	#Master volume multiplier on window minimized, 1 = same as master volume inactive.
+	#This value will be no greater than master volume inactive.
+	#Range: 0.0 ~ 1.0
+	masterVolumeMinimized = 0.25
+
+#Tooltip Config
+[tooltip]
+	#Whether to enable Modern UI enhanced tooltip, or back to vanilla default.
+	enable = true
+	#Whether to use rounded tooltip shapes, or to use vanilla style.
+	roundedShape = false
+	#True to center the tooltip title if rendering an item's tooltip.
+	#Following lines are not affected by this option.
+	centerTitle = true
+	#True to add a title break below the tooltip title line.
+	#TitleBreak and CenterTitle will work/appear at the same time.
+	titleBreak = true
+	#True to exactly position tooltip to pixel grid, smoother movement.
+	exactPositioning = true
+	#The tooltip background color in #RRGGBB or #AARRGGBB format. Default: #E6000000
+	#Can be one to four values representing top left, top right, bottom right and bottom left color.
+	#Multiple values produce a gradient effect, whereas one value produces a solid color.
+	#If less than 4 are provided, repeat the last value.
+	colorFill = ["#E6000000"]
+	#The tooltip border color in #RRGGBB or #AARRGGBB format. Default: #F0AADCF0, #F0DAD0F4, #F0FFC3F7 and #F0DAD0F4
+	#Can be one to four values representing top left, top right, bottom right and bottom left color.
+	#Multiple values produce a gradient effect, whereas one value produces a solid color.
+	#If less than 4 are provided, repeat the last value.
+	colorStroke = ["#FFC2D0D6", "#FFE7DAE5", "#FFCCDAC8", "#FFC8B9AC"]
+	#The cycle time of tooltip border color in milliseconds. (0 = OFF)
+	#Range: 0 ~ 5000
+	borderCycleTime = 1000
+	#The width of tooltip border, if rounded, in GUI Scale Independent Pixels.
+	#Range: 0.5 ~ 2.5
+	borderWidth = 1.3333333333333333
+	#The corner radius of tooltip border, if rounded, in GUI Scale Independent Pixels.
+	#Range: 0.0 ~ 8.0
+	cornerRadius = 4.0
+	#The shadow radius of tooltip, if rounded, in GUI Scale Independent Pixels.
+	#No impact on performance.
+	#Range: 0.0 ~ 32.0
+	shadowRadius = 10.0
+	#The shadow opacity of tooltip, if rounded. No impact on performance.
+	#Range: 0.0 ~ 1.0
+	shadowOpacity = 0.25
+	#When true, tooltip border colors adapt to item's name and rarity.
+	adaptiveColors = true
+	#Amount to scroll the tooltip in response to a arrow key pressed event.
+	#Range: 0 ~ 320
+	arrowScrollFactor = 60
+
+#General Config
+[general]
+	#Play a sound effect when the game is loaded.
+	ding = true
+	#Specify a sound event to custom the ding sound effect.
+	#The default is "minecraft:entity.experience_orb.pickup"
+	dingSound = ""
+	#Specify a volume multiplier to the ding sound effect.
+	#Range: 0.0 ~ 10.0
+	dingVolume = 0.25
+	#Press 'C' key (by default) to zoom 4x, the same as OptiFine's.
+	#This is auto disabled when OptiFine is installed.
+	zoom = false
+	#Control the window mode, normal mode does nothing.
+	#Allowed Values: NORMAL, FULLSCREEN, FULLSCREEN_BORDERLESS, MAXIMIZED, MAXIMIZED_BORDERLESS, WINDOWED, WINDOWED_BORDERLESS
+	windowMode = "NORMAL"
+	#Whether to replace vanilla GUI scale button to slider with tips.
+	useNewGuiScale = true
+	#Remove telemetry event of client behaviors.
+	removeTelemetry = false
+	#Allow Slack or Discord shortcodes to replace Unicode Emoji Sequences in chat.
+	emojiShortcodes = true
+
+#View Config
+[view]
+	#Force layout direction to RTL, otherwise, the current Locale setting.
+	forceRtl = false
+	#The global font scale used with sp units.
+	#Range: 0.5 ~ 2.0
+	fontScale = 1.1
+	#Default scrollbar size in dips.
+	#Range: 0 ~ 1024
+	scrollbarSize = 4
+	#Distance a touch can wander before we think the user is scrolling in dips.
+	#Range: 0 ~ 1024
+	touchSlop = 4
+	#Distance a hover can wander while it is still considered "stationary" in dips.
+	#Range: 0 ~ 1024
+	hoverSlop = 4
+	#Minimum size of the touch target for a scrollbar in dips.
+	#Range: 0 ~ 1024
+	minScrollbarTouchTarget = 16
+	#Minimum velocity to initiate a fling in dips per second.
+	#Range: 0 ~ 32767
+	minimumFlingVelocity = 50
+	#Maximum velocity to initiate a fling in dips per second.
+	#Range: 0 ~ 32767
+	maximumFlingVelocity = 8000
+	#The coefficient of friction applied to flings/scrolls.
+	#Range: 0.001 ~ 7.389
+	scrollFriction = 0.014999999664723873
+	#Max distance in dips to overscroll for edge effects.
+	#Range: 0 ~ 1024
+	overscrollDistance = 0
+	#Max distance in dips to overfling for edge effects.
+	#Range: 0 ~ 1024
+	overflingDistance = 12
+	#Amount to scroll in response to a vertical scroll event, in dips per axis value.
+	#Range: 0.0 ~ 1024.0
+	verticalScrollFactor = 64.0
+	#Amount to scroll in response to a horizontal scroll event, in dips per axis value.
+	#Range: 0.0 ~ 1024.0
+	horizontalScrollFactor = 64.0
+	#The duration in milliseconds before a hover event causes a tooltip to be shown.
+	#Range: 0 ~ 1200
+	hoverTooltipShowTimeout = 500
+	#The duration in milliseconds before mouse inactivity causes a tooltip to be hidden.
+	#Range: 3000 ~ 120000
+	hoverTooltipHideTimeout = 30000
+
+#Font Config
+[font]
+	#The first font family to use. See fallbackFontFamilyList
+	firstFontFamily = ".\\config\\ModernUI\\unifont-17.0.03.otf"
+	#A set of fallback font families to determine the typeface to use.
+	#The order is first > fallbacks. TrueType & OpenType are supported.
+	#Each element can be one of the following two cases:
+	#1) Name of registered font family, for instance: Segoe UI
+	#2) Path of font files on your PC, for instance: /usr/shared/fonts/x.otf
+	#Registered font families include:
+	#1) OS builtin fonts.
+	#2) Font files in fontRegistrationList.
+	#3) Font files in '/resourcepacks' directory.
+	#4) Font files under 'modernui:font' in resource packs.
+	#Note that for TTC/OTC font, you should register it and select one of font families.
+	#Otherwise, only the first font family from the TrueType/OpenType Collection will be used.
+	#This is only read once when the game is loaded, you can reload via in-game GUI.
+	fallbackFontFamilyList = ["Source Han Sans CN Medium", "Noto Sans", "Segoe UI Variable", "Segoe UI", "San Francisco", "Open Sans", "SimHei", "STHeiti", "Segoe UI Symbol", "mui-i18n-compat"]
+	#A set of additional font files (or directories) to register.
+	#For TrueType/OpenType Collections, all contained font families will be registered.
+	#Registered fonts can be referenced in Modern UI and Minecraft (Modern Text Engine).
+	#For example, "E:/Fonts" means all font files in that directory will be registered.
+	#System requires random access to these files, you should not remove them while running.
+	#This is only read once when the game is loaded, i.e. registration.
+	fontRegistrationList = []
+	#Whether to use Google Noto Color Emoji, otherwise grayscale emoji (faster).
+	#See Unicode 15.0 specification for details on how this affects text layout.
+	useColorEmoji = true
+	#When enabled, text layout uses fractional metrics with no font hinting and applies sub-pixel positioning.
+	#When disabled, text layout uses integer metrics with full font hinting.
+	linearMetrics = true
+

config/ModernUI/text.toml

@@ -0,0 +1,102 @@
+
+#Text Engine Config
+[text]
+	#Allow text renderer to drop shadow, setting to false can improve performance.
+	allowShadow = true
+	#Fix resolution level at 2. When the GUI scale increases, the resolution level remains.
+	#Then GUI scale should be even numbers (2, 4, 6...), based on Minecraft GUI system.
+	#If your fonts are not bitmap fonts, then you should keep this setting false.
+	fixedResolution = false
+	#Control base font size, in GUI scaled pixels. The default and vanilla value is 8.
+	#For bitmap fonts, 8 represents a glyph size of 8x or 16x if fixed resolution.
+	#This option only applies to TrueType fonts.
+	#Range: 6.5 ~ 9.5
+	baseFontSize = 7.4
+	#Control vertical baseline for vanilla text layout, in GUI scaled pixels.
+	#The vanilla default value is 7.
+	#Range: 4.0 ~ 10.0
+	baselineShift = 7.0
+	#Control the text shadow offset for vanilla text rendering, in GUI scaled pixels.
+	#Range: 0.20000000298023224 ~ 2.0
+	shadowOffset = 0.5
+	#Control the text outline offset for vanilla text rendering, in GUI scaled pixels.
+	#Range: 0.20000000298023224 ~ 2.0
+	outlineOffset = 0.5
+	#Control the horizontal offset for bitmap fonts, in GUI scaled pixels.
+	#Range: 0.0 ~ 1.0
+	bitmapOffset = 0.5
+	#Set the recycle time of layout cache in seconds, using least recently used algorithm.
+	#Range: 2 ~ 15
+	cacheLifespan = 6
+	#The bidirectional text heuristic algorithm. The default is FirstStrong (Locale).
+	#This will affect which BiDi algorithm to use during text layout.
+	#Allowed Values: FIRST_STRONG, ANY_RTL, LTR, RTL, LOCALE, FIRST_STRONG_LTR, FIRST_STRONG_RTL
+	textDirection = "FIRST_STRONG"
+	#Whether to use Modern UI text rendering pipeline in 3D world.
+	#Disabling this means that SDF text and rendering optimization are no longer effective.
+	#But text rendering can be compatible with OptiFine Shaders and Iris Shaders.
+	#This does not affect text rendering in GUI.
+	#This option only applies to TrueType fonts.
+	useTextShadersInWorld = true
+	#For "minecraft:default" font, should we keep some glyph providers of them?
+	#Ignore All: Only use Modern UI typeface list.
+	#Keep ASCII: Include minecraft:font/ascii.png, minecraft:font/accented.png, minecraft:font/nonlatin_european.png
+	#Keep Other: Include providers other than ASCII and Unicode font.
+	#Keep All: Include all except Unicode font.
+	#Only Include: Only include providers that specified by defaultFontRuleSet.
+	#Only Exclude: Only exclude providers that specified by defaultFontRuleSet.
+	#Allowed Values: IGNORE_ALL, KEEP_ASCII, KEEP_OTHER, KEEP_ALL, ONLY_INCLUDE, ONLY_EXCLUDE
+	defaultFontBehavior = "KEEP_ALL"
+	#Used when defaultFontBehavior is either ONLY_INCLUDE or ONLY_EXCLUDE.
+	#This specifies a set of regular expressions to match the glyph provider name.
+	#For bitmap providers, this is the texture path without 'textures/'.
+	#For TTF providers, this is the TTF file path without 'font/'.
+	#For space providers, this is "font_name / minecraft:space",
+	#where font_name is font definition path without 'font/'.
+	defaultFontRuleSet = ["^minecraft:font\\/(nonlatin_european|accented|ascii|element_ideographs|cjk_punctuations|ellipsis|2em_dash)\\.png$", "^minecraft:include\\/space \\/ minecraft:space$", "^minecraft:font\\/(mcsans|emoji)_05_00\\d.png$", "minecraft:uniform"]
+	#Whether to use text component object as hash key to lookup in layout cache.
+	#If you find that Modern UI text rendering is not compatible with some mods,
+	#you can disable this option for compatibility, but this will decrease performance a bit.
+	#Modern UI will use another cache strategy if this is disabled.
+	useComponentCache = true
+	#Allow text layout to be computed from background threads (not cached).
+	#Otherwise, block the current thread and wait for main thread.
+	allowAsyncLayout = true
+	#See CSS line-break property, https://developer.mozilla.org/en-US/docs/Web/CSS/line-break
+	#Allowed Values: AUTO, LOOSE, NORMAL, STRICT
+	lineBreakStyle = "AUTO"
+	#Allowed Values: AUTO, PHRASE
+	lineBreakWordStyle = "AUTO"
+	#When enabled, Modern UI will compute texel density in device-space to determine whether to use SDF text or bilinear sampling.
+	#This feature requires GLSL 400 or has no effect.
+	#This generally decreases performance but provides better rendering quality.
+	#This option only applies to TrueType fonts. May not be compatible with OptiFine.
+	smartSDFShaders = true
+	#When rendering in 2D, this option allows Modern UI to exactly compute font size in device-space from the current coordinate transform matrix.
+	#This provides perfect text rendering for scaling-down texts in vanilla, but may increase GPU memory usage.
+	#When disabled, Modern UI will use SDF text rendering if appropriate.
+	#This option only applies to TrueType fonts.
+	computeDeviceFontSize = true
+	#When enabled, Modern UI will use SDF text rendering if appropriate.
+	#Otherwise, it uses nearest-neighbor or bilinear sampling based on texel density.
+	#This option only applies to TrueType fonts.
+	allowSDFTextIn2D = true
+	#When enabled, the outline of the experience level text will be tweaked.
+	tweakExperienceText = true
+	#Control the anti-aliasing of raw glyph rasterization.
+	antiAliasing = false
+	#When enabled, text layout uses fractional metrics with no font hinting.
+	#When disabled, text layout uses integer metrics with full font hinting.
+	#Disable if on low-res monitor; enable for linear text.
+	linearMetrics = false
+	#Control the minimum pixel density for SDF text and text in 3D world rendering.
+	#This value will be no less than current GUI scale.
+	#Recommend setting a higher value on high-res monitor and powerful PC hardware.
+	#Range: 4 ~ 10
+	minPixelDensityForSDF = 10
+	#Enable linear sampling for A8 font atlases with mipmaps, mag filter will be always
+	#NEAREST. We prefer computeDeviceFontSize and allowSDFTextIn2D, then setting this to
+	#false can improve performance. If either of the above two is false or Shaders are active,
+	#then setting this to true can improve readability.
+	linearSamplingA8Atlas = false
+

config/additionalplacements-startup.toml

@@ -14,13 +14,13 @@
 			[startup.types.additionalplacements.slab]
 				#Blocklist for controlling which blocks (that are valid for this type) will generate variants of this type
 				#See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format
-				enabled = ["+*"]
+				enabled = ["+*", "-rnr:roof_frame_slab"]
 
 			#Stairs
 			[startup.types.additionalplacements.stairs]
 				#Blocklist for controlling which blocks (that are valid for this type) will generate variants of this type
 				#See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format
-				enabled = ["+*"]
+				enabled = ["+*", "-rnr:roof_frame_stairs"]
 				#Blocklist to control which blocks will allow for vertical stair connections.
 				#Keep in mind vertical is RELATIVE to the placement of the stair - "vertical" for a vertically placed stair will be one of the two horizontal directions.
 				#See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format

config/blockrunner.json

@@ -1,11 +1,26 @@
 {
-  "schema_version": "2",
-  "minecraft:dirt_path": 1.35,
-  "#blockrunner:slow_blocks": 0.65,
-  "#blockrunner:very_slow_blocks": 0.45,
-  "#blockrunner:quick_blocks": 1.35,
-  "#blockrunner:very_quick_blocks": 1.55,
-  "#blockrunner:slightly_slow_blocks": 0.85,
-  "#blockrunner:slightly_quick_blocks": 1.15,
-  "#minecraft:stone_bricks": 1.15
+	"schema_version": "2",
+	"#tfc:paths": 1,
+	"rnr:hoggin": 1.1,
+	"rnr:hoggin_slab": 1.1,
+	"rnr:hoggin_stairs": 1.1,
+	"#rnr:gravel_road_blocks": 1.1,
+	"#rnr:gravel_road_stairs": 1.1,
+	"#rnr:gravel_road_slabs": 1.1,
+	"#rnr:overheight_gravel_blocks": 1.1,
+	"#rnr:macadam_road_blocks": 1.2,
+	"#rnr:macadam_road_stairs": 1.2,
+	"#rnr:macadam_road_slabs": 1.2,
+	"#rnr:sett_road_blocks": 1.2,
+	"#rnr:sett_road_stairs": 1.2,
+	"#rnr:sett_road_slabs": 1.2,
+	"#rnr:flagstones_blocks": 1.2,
+	"#rnr:flagstones_stairs": 1.2,
+	"#rnr:flagstones_slabs": 1.2,
+	"#rnr:cobbled_road_blocks": 1.2,
+	"#rnr:cobbled_road_stairs": 1.2,
+	"#rnr:cobbled_road_slabs": 1.2,
+	"#rnr:functional_concrete_roads": 1.3,
+	"#rnr:functional_concrete_road_stairs": 1.3,
+	"#rnr:functional_concrete_road_slabs": 1.3
 }

config/bluemap/packs/TFG_fix/assets/afc/blockColors.json

@@ -0,0 +1,95 @@
+{
+//AFC leaves
+  "afc:wood/leaves/boabab": "@foliage",
+  "afc:wood/leaves/eucalyptus": "@foliage",
+  "afc:wood/leaves/mahogany": "@foliage",
+  "afc:wood/leaves/hevea": "@foliage",
+  "afc:wood/leaves/tualang": "@foliage",
+  "afc:wood/leaves/teak": "@foliage",
+  "afc:wood/leaves/cypress": "@foliage",
+  "afc:wood/leaves/fig": "@foliage",
+  "afc:wood/leaves/ironwood": "@foliage",
+  "afc:wood/leaves/ipe": "@foliage",
+  "afc:wood/leaves/gum_arabic": "@foliage",
+  "afc:wood/leaves/acacia_koa": "@foliage",
+  "afc:wood/leaves/poplar": "@foliage",
+  "afc:wood/leaves/mpingo_blackwood": "@foliage",
+  "afc:wood/leaves/mountain_fir": "@foliage",
+  "afc:wood/leaves/balsam_fir": "@foliage",
+  "afc:wood/leaves/scrub_hickory": "@foliage",
+  "afc:wood/leaves/red_silk_cotton": "@foliage",
+  "afc:wood/leaves/bigleaf_maple": "@foliage",
+  "afc:wood/leaves/weeping_maple": "@foliage",
+  "afc:wood/leaves/black_oak": "@foliage",
+  "afc:wood/leaves/live_oak": "@foliage",
+  "afc:wood/leaves/jaggery_palm": "@foliage",
+  "afc:wood/leaves/stone_pine": "@foliage",
+  "afc:wood/leaves/red_pine": "@foliage",
+  "afc:wood/leaves/tamarack": "@foliage",
+  "afc:wood/leaves/giant_rosewood": "@foliage",
+  "afc:wood/leaves/coast_redwood": "@foliage",
+  "afc:wood/leaves/coast_spruce": "@foliage",
+  "afc:wood/leaves/sitka_spruce": "@foliage",
+  "afc:wood/leaves/black_spruce": "@foliage",
+  "afc:wood/leaves/atlas_cedar": "@foliage",
+  "afc:wood/leaves/weeping_willow": "@foliage",
+  "afc:wood/leaves/rainbow_eucalyptus": "@foliage",
+  "afc:wood/leaves/mountain_ash": "@foliage",
+  "afc:wood/leaves/rubber_fig": "@foliage",
+  "afc:wood/leaves/redcedar": "@foliage",
+  "afc:wood/leaves/weeping_cypress": "@foliage",
+  "afc:wood/leaves/bald_cypress": "@foliage",
+  "afc:wood/leaves/sapele_mahogany": "@foliage",
+  "afc:wood/leaves/small_leaf_mahogany": "@foliage",
+  "afc:wood/leaves/iroko_teak": "@foliage",
+  "afc:wood/leaves/flame_of_the_forest": "@foliage",
+  "afc:wood/leaves/lebombo_ironwood": "@foliage",
+  "afc:wood/leaves/horsetail_ironwood": "@foliage",
+
+//AFC fallen_leaves
+  "afc:wood/fallen_leaves/boabab": "@foliage",
+  "afc:wood/fallen_leaves/eucalyptus": "@foliage",
+  "afc:wood/fallen_leaves/mahogany": "@foliage",
+  "afc:wood/fallen_leaves/hevea": "@foliage",
+  "afc:wood/fallen_leaves/tualang": "@foliage",
+  "afc:wood/fallen_leaves/teak": "@foliage",
+  "afc:wood/fallen_leaves/cypress": "@foliage",
+  "afc:wood/fallen_leaves/fig": "@foliage",
+  "afc:wood/fallen_leaves/ironwood": "@foliage",
+  "afc:wood/fallen_leaves/ipe": "@foliage",
+  "afc:wood/fallen_leaves/gum_arabic": "@foliage",
+  "afc:wood/fallen_leaves/acacia_koa": "@foliage",
+  "afc:wood/fallen_leaves/poplar": "@foliage",
+  "afc:wood/fallen_leaves/mpingo_blackwood": "@foliage",
+  "afc:wood/fallen_leaves/mountain_fir": "@foliage",
+  "afc:wood/fallen_leaves/balsam_fir": "@foliage",
+  "afc:wood/fallen_leaves/scrub_hickory": "@foliage",
+  "afc:wood/fallen_leaves/red_silk_cotton": "@foliage",
+  "afc:wood/fallen_leaves/bigleaf_maple": "@foliage",
+  "afc:wood/fallen_leaves/weeping_maple": "@foliage",
+  "afc:wood/fallen_leaves/black_oak": "@foliage",
+  "afc:wood/fallen_leaves/live_oak": "@foliage",
+  "afc:wood/fallen_leaves/jaggery_palm": "@foliage",
+  "afc:wood/fallen_leaves/stone_pine": "@foliage",
+  "afc:wood/fallen_leaves/red_pine": "@foliage",
+  "afc:wood/fallen_leaves/tamarack": "@foliage",
+  "afc:wood/fallen_leaves/giant_rosewood": "@foliage",
+  "afc:wood/fallen_leaves/coast_redwood": "@foliage",
+  "afc:wood/fallen_leaves/coast_spruce": "@foliage",
+  "afc:wood/fallen_leaves/sitka_spruce": "@foliage",
+  "afc:wood/fallen_leaves/black_spruce": "@foliage",
+  "afc:wood/fallen_leaves/atlas_cedar": "@foliage",
+  "afc:wood/fallen_leaves/weeping_willow": "@foliage",
+  "afc:wood/fallen_leaves/rainbow_eucalyptus": "@foliage",
+  "afc:wood/fallen_leaves/mountain_ash": "@foliage",
+  "afc:wood/fallen_leaves/rubber_fig": "@foliage",
+  "afc:wood/fallen_leaves/redcedar": "@foliage",
+  "afc:wood/fallen_leaves/weeping_cypress": "@foliage",
+  "afc:wood/fallen_leaves/bald_cypress": "@foliage",
+  "afc:wood/fallen_leaves/sapele_mahogany": "@foliage",
+  "afc:wood/fallen_leaves/small_leaf_mahogany": "@foliage",
+  "afc:wood/fallen_leaves/iroko_teak": "@foliage",
+  "afc:wood/fallen_leaves/flame_of_the_forest": "@foliage",
+  "afc:wood/fallen_leaves/lebombo_ironwood": "@foliage",
+  "afc:wood/fallen_leaves/horsetail_ironwood": "@foliage",
+}

config/bluemap/packs/TFG_fix/assets/tfc/blockColors.json

@@ -0,0 +1,245 @@
+{
+//TFC plants
+  "tfc:peat_grass": "@grass",
+  "tfc:kaolin_clay_grass": "@grass",
+  "tfc:grass/silt": "@grass",
+  "tfc:clay_grass/silt": "@grass",
+  "tfc:grass/loam": "@grass",
+  "tfc:clay_grass/loam": "@grass",
+  "tfc:grass/sandy": "@grass",
+  "tfc:clay_grass/sandy": "@grass",
+  "tfc:grass/silty_loam": "@grass",
+  "tfc:clay_grass/silty_loam": "@grass",
+  "tfc:grass/sandy_loam": "@grass",
+  "tfc:clay_grass/sandy_loam": "@grass",
+  "tfc:plant/sagebrush": "@foliage",
+  "tfc:plant/cordgrass": "@foliage",
+  "tfc:plant/guzmania": "@foliage",
+  "tfc:plant/pine_krummholz": "@foliage",
+  "tfc:plant/king_fern": "@foliage",
+  "tfc:plant/perovskia": "@foliage",
+  "tfc:plant/gooseberry_bush": "@foliage",
+  "tfc:plant/saguaro_fruit": "@foliage",
+  "tfc:plant/olive_growing_branch": "@foliage",
+  "tfc:plant/manatee_grass": "@foliage",
+  "tfc:plant/spanish_moss": "@foliage",
+  "tfc:plant/hanging_vines_plant": "@foliage",
+  "tfc:plant/philodendron": "@foliage",
+  "tfc:plant/maiden_pink": "@foliage",
+  "tfc:plant/switchgrass": "@foliage",
+  "tfc:plant/red_apple_branch": "@foliage",
+  "tfc:plant/lily_of_the_valley": "@foliage",
+  "tfc:plant/licorice_fern": "@foliage",
+  "tfc:plant/cloudberry_bush": "@foliage",
+  "tfc:plant/ivy": "@foliage",
+  "tfc:plant/peach_branch": "@foliage",
+  "tfc:plant/plum_leaves": "@foliage",
+  "tfc:plant/cattail": "@foliage",
+  "tfc:plant/butterfly_milkweed": "@foliage",
+  "tfc:plant/saguaro": "@foliage",
+  "tfc:plant/laminaria": "@foliage",
+  "tfc:plant/poppy": "@foliage",
+  "tfc:plant/snapdragon_yellow": "@foliage",
+  "tfc:plant/plum_sapling": "@foliage",
+  "tfc:plant/olive_sapling": "@foliage",
+  "tfc:plant/tulip_pink": "@foliage",
+  "tfc:plant/dead_bush": "@foliage",
+  "tfc:plant/peach_leaves": "@foliage",
+  "tfc:plant/canna": "@foliage",
+  "tfc:plant/green_apple_sapling": "@foliage",
+  "tfc:plant/orange_sapling": "@foliage",
+  "tfc:plant/strawberry_bush": "@foliage",
+  "tfc:plant/raddia_grass": "@foliage",
+  "tfc:plant/bromegrass": "@foliage",
+  "tfc:plant/kangaroo_paw": "@foliage",
+  "tfc:plant/green_apple_growing_branch": "@foliage",
+  "tfc:plant/gutweed": "@foliage",
+  "tfc:plant/phragmite": "@foliage",
+  "tfc:plant/tulip_red": "@foliage",
+  "tfc:plant/banana_sapling": "@foliage",
+  "tfc:plant/sword_fern": "@foliage",
+  "tfc:plant/lemon_growing_branch": "@foliage",
+  "tfc:plant/elderberry_bush_cane": "@foliage",
+  "tfc:plant/red_apple_growing_branch": "@foliage",
+  "tfc:plant/anthurium": "@foliage",
+  "tfc:plant/goldenrod": "@foliage",
+  "tfc:plant/peach_growing_branch": "@foliage",
+  "tfc:plant/elderberry_bush": "@foliage",
+  "tfc:plant/duckweed": "@foliage",
+  "tfc:plant/cranberry_bush": "@foliage",
+  "tfc:plant/field_horsetail": "@foliage",
+  "tfc:plant/olive_branch": "@foliage",
+  "tfc:plant/giant_kelp_plant": "@foliage",
+  "tfc:plant/blood_lily": "@foliage",
+  "tfc:plant/raspberry_bush": "@foliage",
+  "tfc:plant/leafy_kelp_plant": "@foliage",
+  "tfc:plant/orange_branch": "@foliage",
+  "tfc:plant/allium": "@foliage",
+  "tfc:plant/lotus": "@foliage",
+  "tfc:plant/strelitzia": "@foliage",
+  "tfc:plant/peach_sapling": "@foliage",
+  "tfc:plant/red_algae": "@foliage",
+  "tfc:plant/dead_berry_bush": "@foliage",
+  "tfc:plant/bur_reed": "@foliage",
+  "tfc:plant/cherry_growing_branch": "@foliage",
+  "tfc:plant/pulsatilla": "@foliage",
+  "tfc:plant/orange_leaves": "@foliage",
+  "tfc:plant/sea_palm": "@foliage",
+  "tfc:plant/silver_spurflower": "@foliage",
+  "tfc:plant/coontail": "@foliage",
+  "tfc:plant/sapphire_tower": "@foliage",
+  "tfc:plant/scutch_grass": "@foliage",
+  "tfc:plant/sago": "@foliage",
+  "tfc:plant/winged_kelp_plant": "@foliage",
+  "tfc:plant/aspen_krummholz": "@foliage",
+  "tfc:plant/raspberry_bush_cane": "@foliage",
+  "tfc:plant/timothy_grass": "@foliage",
+  "tfc:plant/cobblestone_lichen": "@foliage",
+  "tfc:plant/snapdragon_pink": "@foliage",
+  "tfc:plant/red_apple_leaves": "@foliage",
+  "tfc:plant/winged_kelp": "@foliage",
+  "tfc:plant/saguaro_plant": "@foliage",
+  "tfc:plant/sargassum": "@foliage",
+  "tfc:plant/artists_conk": "@foliage",
+  "tfc:plant/black_orchid": "@foliage",
+  "tfc:plant/dry_phragmite_plant": "@foliage",
+  "tfc:plant/tree_fern_plant": "@foliage",
+  "tfc:plant/oxeye_daisy": "@foliage",
+  "tfc:plant/vriesea": "@foliage",
+  "tfc:plant/toquilla_palm": "@foliage",
+  "tfc:plant/badderlocks": "@foliage",
+  "tfc:plant/grape_hyacinth": "@foliage",
+  "tfc:plant/red_sealing_wax_palm": "@foliage",
+  "tfc:plant/lemon_sapling": "@foliage",
+  "tfc:plant/spanish_moss_plant": "@foliage",
+  "tfc:plant/blueberry_bush_cane": "@foliage",
+  "tfc:plant/bluegrass": "@foliage",
+  "tfc:plant/spruce_krummholz": "@foliage",
+  "tfc:plant/heliconia": "@foliage",
+  "tfc:plant/water_taro": "@foliage",
+  "tfc:plant/green_apple_branch": "@foliage",
+  "tfc:plant/dry_phragmite": "@foliage",
+  "tfc:plant/barrel_cactus": "@foliage",
+  "tfc:plant/rose": "@foliage",
+  "tfc:plant/houstonia": "@foliage",
+  "tfc:plant/labrador_tea": "@foliage",
+  "tfc:plant/nasturtium": "@foliage",
+  "tfc:plant/leafy_kelp": "@foliage",
+  "tfc:plant/moss": "@foliage",
+  "tfc:plant/yucca": "@foliage",
+  "tfc:plant/lemon_leaves": "@foliage",
+  "tfc:plant/snowberry_bush": "@foliage",
+  "tfc:plant/orchard_grass": "@foliage",
+  "tfc:plant/morning_glory": "@foliage",
+  "tfc:plant/hanging_vines": "@foliage",
+  "tfc:plant/water_lily": "@foliage",
+  "tfc:plant/blueberry_bush": "@foliage",
+  "tfc:plant/blue_orchid": "@foliage",
+  "tfc:plant/banana_plant": "@foliage",
+  "tfc:plant/blackberry_bush_cane": "@foliage",
+  "tfc:plant/reindeer_lichen": "@foliage",
+  "tfc:plant/athyrium_fern": "@foliage",
+  "tfc:plant/trillium": "@foliage",
+  "tfc:plant/white_cedar_krummholz": "@foliage",
+  "tfc:plant/turtle_grass": "@foliage",
+  "tfc:plant/arrowhead": "@foliage",
+  "tfc:plant/blackberry_bush": "@foliage",
+  "tfc:plant/tall_fescue_grass": "@foliage",
+  "tfc:plant/blue_ginger": "@foliage",
+  "tfc:plant/arundo": "@foliage",
+  "tfc:plant/sacred_datura": "@foliage",
+  "tfc:plant/tree_fern": "@foliage",
+  "tfc:plant/heather": "@foliage",
+  "tfc:plant/foxglove": "@foliage",
+  "tfc:plant/liana": "@foliage",
+  "tfc:plant/douglas_fir_krummholz": "@foliage",
+  "tfc:plant/lemon_branch": "@foliage",
+  "tfc:plant/giant_kelp_flower": "@foliage",
+  "tfc:plant/meads_milkweed": "@foliage",
+  "tfc:plant/tulip_orange": "@foliage",
+  "tfc:plant/arundo_plant": "@foliage",
+  "tfc:plant/olive_leaves": "@foliage",
+  "tfc:plant/pistia": "@foliage",
+  "tfc:plant/snapdragon_red": "@foliage",
+  "tfc:plant/water_canna": "@foliage",
+  "tfc:plant/ryegrass": "@foliage",
+  "tfc:plant/fountain_grass": "@foliage",
+  "tfc:plant/bunchberry_bush": "@foliage",
+  "tfc:plant/lady_fern": "@foliage",
+  "tfc:plant/dandelion": "@foliage",
+  "tfc:plant/tulip_white": "@foliage",
+  "tfc:plant/cherry_leaves": "@foliage",
+  "tfc:plant/cherry_sapling": "@foliage",
+  "tfc:plant/orange_growing_branch": "@foliage",
+  "tfc:plant/dead_banana_plant": "@foliage",
+  "tfc:plant/star_grass": "@foliage",
+  "tfc:plant/desert_flame": "@foliage",
+  "tfc:plant/eel_grass": "@foliage",
+  "tfc:plant/wintergreen_berry_bush": "@foliage",
+  "tfc:plant/beachgrass": "@foliage",
+  "tfc:plant/milfoil": "@foliage",
+  "tfc:plant/pickerelweed": "@foliage",
+  "tfc:plant/primrose": "@foliage",
+  "tfc:plant/sea_lavender": "@foliage",
+  "tfc:plant/marigold": "@foliage",
+  "tfc:plant/tropical_milkweed": "@foliage",
+  "tfc:plant/pampas_grass": "@foliage",
+  "tfc:plant/ostrich_fern": "@foliage",
+  "tfc:plant/green_algae": "@foliage",
+  "tfc:plant/liana_plant": "@foliage",
+  "tfc:plant/hibiscus": "@foliage",
+  "tfc:plant/green_apple_leaves": "@foliage",
+  "tfc:plant/jungle_vines": "@foliage",
+  "tfc:plant/dead_cane": "@foliage",
+  "tfc:plant/red_apple_sapling": "@foliage",
+  "tfc:plant/calendula": "@foliage",
+  "tfc:plant/plum_growing_branch": "@foliage",
+  "tfc:plant/snapdragon_white": "@foliage",
+  "tfc:plant/cherry_branch": "@foliage",
+  "tfc:plant/plum_branch": "@foliage",
+  "tfc:plant/lilac": "@foliage",
+
+//TFC leaves
+  "tfc:wood/leaves/willow": "@foliage",
+  "tfc:wood/leaves/acacia": "@foliage",
+  "tfc:wood/leaves/maple": "@foliage",
+  "tfc:wood/leaves/douglas_fir": "@foliage",
+  "tfc:wood/leaves/chestnut": "@foliage",
+  "tfc:wood/leaves/kapok": "@foliage",
+  "tfc:wood/leaves/blackwood": "@foliage",
+  "tfc:wood/leaves/oak": "@foliage",
+  "tfc:wood/leaves/sequoia": "@foliage",
+  "tfc:wood/leaves/mangrove": "@foliage",
+  "tfc:wood/leaves/white_cedar": "@foliage",
+  "tfc:wood/leaves/ash": "@foliage",
+  "tfc:wood/leaves/hickory": "@foliage",
+  "tfc:wood/leaves/birch": "@foliage",
+  "tfc:wood/leaves/rosewood": "@foliage",
+  "tfc:wood/leaves/spruce": "@foliage",
+  "tfc:wood/leaves/palm": "@foliage",
+  "tfc:wood/leaves/aspen": "@foliage",
+  "tfc:wood/leaves/pine": "@foliage",
+  "tfc:wood/leaves/sycamore": "@foliage",
+
+//TFC fallen leaves
+  "tfc:wood/fallen_leaves/willow": "@foliage",
+  "tfc:wood/fallen_leaves/acacia": "@foliage",
+  "tfc:wood/fallen_leaves/maple": "@foliage",
+  "tfc:wood/fallen_leaves/douglas_fir": "@foliage",
+  "tfc:wood/fallen_leaves/chestnut": "@foliage",
+  "tfc:wood/fallen_leaves/kapok": "@foliage",
+  "tfc:wood/fallen_leaves/blackwood": "@foliage",
+  "tfc:wood/fallen_leaves/oak": "@foliage",
+  "tfc:wood/fallen_leaves/sequoia": "@foliage",
+  "tfc:wood/fallen_leaves/mangrove": "@foliage",
+  "tfc:wood/fallen_leaves/white_cedar": "@foliage",
+  "tfc:wood/fallen_leaves/ash": "@foliage",
+  "tfc:wood/fallen_leaves/hickory": "@foliage",
+  "tfc:wood/fallen_leaves/birch": "@foliage",
+  "tfc:wood/fallen_leaves/rosewood": "@foliage",
+  "tfc:wood/fallen_leaves/spruce": "@foliage",
+  "tfc:wood/fallen_leaves/palm": "@foliage",
+  "tfc:wood/fallen_leaves/aspen": "@foliage",
+  "tfc:wood/fallen_leaves/pine": "@foliage",
+  "tfc:wood/fallen_leaves/sycamore": "@foliage"
+}

config/bluemap/packs/TFG_fix/assets/tfc/models/block/fluid/river_water.json

@@ -0,0 +1 @@
+{}

config/bluemap/packs/TFG_fix/assets/tfc/models/block/fluid/salt_water.json

@@ -0,0 +1 @@
+{}

config/bluemap/packs/TFG_fix/assets/tfc/models/block/fluid/spring_water.json

@@ -0,0 +1 @@
+{}

config/bluemap/packs/TFG_fix/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+    "pack": {
+        "pack_format": 8,
+        "description": "TFC Water and Grass Fix for BlueMap by dhs92 + AFC tree and leaves fix by WoopSmile"
+    }
+}

config/carryon-common.toml

@@ -57,7 +57,7 @@
 [whitelist]
 	#Whitelist. Read about the format here: https://github.com/Tschipp/CarryOn/wiki/Black---and-Whitelist-Config
 	#Entities that CAN be picked up (useWhitelistEntities must be true)
-	allowedEntities = ["minecraft:axolotl", "tfc:turkey", "tfc:isopod", "tfc:lobster", "tfc:frog", "tfc:penguin", "tfc:turtle", "tfc:horseshoe_crab", "tfc:crayfish", "tfc:grouse", "tfc:pheasant", "tfc:peafowl", "tfc:rat", "tfc:chicken", "tfc:duck", "tfc:quail", "tfc:rabbit", "tfc:sheep", "tfc:wolf", "tfc:dog", "tfc:pig", "tfc:goat", "tfc:alpaca", "tfg:wraptor", "tfg:surfer", "tfg:moon_rabbit", "species:limpet", "species:birt", "species:stackatick", "species:springling", "tfg:glacian_ram", "wan_ancient_beasts:crusher", "wan_ancient_beasts:glider", "wan_ancient_beasts:soarer", "wan_ancient_beasts:surfer", "primitive_creatures:viloger_10"]
+	allowedEntities = ["minecraft:axolotl", "tfc:turkey", "tfc:isopod", "tfc:lobster", "tfc:frog", "tfc:penguin", "tfc:turtle", "tfc:horseshoe_crab", "tfc:crayfish", "tfc:grouse", "tfc:pheasant", "tfc:peafowl", "tfc:rat", "tfc:chicken", "tfc:duck", "tfc:quail", "tfc:rabbit", "tfc:sheep", "tfc:wolf", "tfc:dog", "tfc:pig", "tfc:goat", "tfc:alpaca", "tfc:fox", "tfc:boar", "tfg:wraptor", "tfg:surfer", "tfg:moon_rabbit", "species:limpet", "species:birt", "species:stackatick", "species:springling", "tfg:glacian_ram", "wan_ancient_beasts:crusher", "wan_ancient_beasts:glider", "wan_ancient_beasts:soarer", "wan_ancient_beasts:surfer", "wan_ancient_beasts:snatcher", "primitive_creatures:viloger_10"]
 	#Blocks that CAN be picked up (useWhitelistBlocks must be true)
 	allowedBlocks = ["framedblocks:framed_chest", "tfc:wood/chest/*", "tfc:wood/trapped_chest/*", "afc:wood/chest/*", "afc:wood/trapped_chest/*", "#forge:chests/wooden"]
 	#Entities that CAN have other entities stacked on top of them (useWhitelistStacking must be true)

config/crash_assistant/modlist.json

@@ -123,19 +123,19 @@
     "curseForgeHash": 409215932,
     "modrinthHash": "f0b711df59cd589b088e536ca4134c5e6e73fd58"
   },
-  "AmbientSounds_FORGE_v6.3.1_mc1.20.1.jar": {
-    "jarName": "AmbientSounds_FORGE_v6.3.1_mc1.20.1.jar",
+  "AmbientSounds_FORGE_v6.3.4_mc1.20.1.jar": {
+    "jarName": "AmbientSounds_FORGE_v6.3.4_mc1.20.1.jar",
     "modId": "ambientsounds",
-    "version": "6.3.1",
-    "curseForgeHash": 1168047345,
-    "modrinthHash": "b6c676fbe4e586de6c266190943c069a0a49104d"
+    "version": "6.3.4",
+    "curseForgeHash": 2803957593,
+    "modrinthHash": "e84e7053c4c3a73c7f608c9da516bb5d393aab60"
   },
-  "applied_ammo_box-1.0.0.jar": {
-    "jarName": "applied_ammo_box-1.0.0.jar",
+  "applied_ammo_box-1.0.2.jar": {
+    "jarName": "applied_ammo_box-1.0.2.jar",
     "modId": "applied_ammo_box",
-    "version": "1.0.0",
-    "curseForgeHash": 719209453,
-    "modrinthHash": "3fc67723dc70b544b57ab0d0a34e2be991d285f9"
+    "version": "1.0.2",
+    "curseForgeHash": 2900950740,
+    "modrinthHash": "ab97dbd5bef9a488be8dea88672028963d3c0104"
   },
   "architectury-9.2.14-forge.jar": {
     "jarName": "architectury-9.2.14-forge.jar",
@@ -144,6 +144,13 @@
     "curseForgeHash": 98480002,
     "modrinthHash": "a52918a500ff421180a1cbd1a0cabee712134ec4"
   },
+  "arthropocolypse-1.0.6.jar": {
+    "jarName": "arthropocolypse-1.0.6.jar",
+    "modId": "arthropocolypse",
+    "version": "1.0.6",
+    "curseForgeHash": 2478485800,
+    "modrinthHash": "c43b2c1e8a9fa11d139a202e37054a01db8fd677"
+  },
   "astikorcarts-1.20.1-1.1.8.jar": {
     "jarName": "astikorcarts-1.20.1-1.1.8.jar",
     "modId": "astikorcarts",
@@ -158,19 +165,19 @@
     "curseForgeHash": 381211649,
     "modrinthHash": "6eb69343eb21d38f95d1b1d00e6bc777bdb336fa"
   },
-  "baguettelib-1.20.1-Forge-1.1.5.jar": {
-    "jarName": "baguettelib-1.20.1-Forge-1.1.5.jar",
+  "baguettelib-1.20.1-Forge-1.1.6.jar": {
+    "jarName": "baguettelib-1.20.1-Forge-1.1.6.jar",
     "modId": "baguettelib",
-    "version": "1.1.5",
-    "curseForgeHash": 734602455,
-    "modrinthHash": "7aaab6216e7fc72e1606b1e35f1f56a18f01153f"
+    "version": "1.1.6",
+    "curseForgeHash": 2947245849,
+    "modrinthHash": "8d3c9551bbed4c2f2e8cb2b9a10d31bad4edb52d"
   },
-  "balm-forge-1.20.1-7.3.37-all.jar": {
-    "jarName": "balm-forge-1.20.1-7.3.37-all.jar",
+  "balm-forge-1.20.1-7.3.38-all.jar": {
+    "jarName": "balm-forge-1.20.1-7.3.38-all.jar",
     "modId": "balm",
-    "version": "7.3.37",
-    "curseForgeHash": 3384992026,
-    "modrinthHash": "bb7af11fd4bc2e76fce98f90c752279ae381b934"
+    "version": "7.3.38",
+    "curseForgeHash": 29168845,
+    "modrinthHash": "c689f4cbe1a5250177aced15b66ca251d9476d35"
   },
   "barrels_2012-2.1.jar": {
     "jarName": "barrels_2012-2.1.jar",
@@ -207,13 +214,6 @@
     "curseForgeHash": 1808343910,
     "modrinthHash": "71fc6fe4b99dc495528edbb0be12b126eab64b6f"
   },
-  "blur-forge-3.1.1.jar": {
-    "jarName": "blur-forge-3.1.1.jar",
-    "modId": "blur",
-    "version": "3.1.1",
-    "curseForgeHash": 1712179068,
-    "modrinthHash": "562f34155f3849463449aeb1ab54cc7064e4bc86"
-  },
   "Bookshelf-Forge-1.20.1-20.2.13.jar": {
     "jarName": "Bookshelf-Forge-1.20.1-20.2.13.jar",
     "modId": "bookshelf",
@@ -263,12 +263,12 @@
     "curseForgeHash": 2339474770,
     "modrinthHash": "42f34947910ca428497fac0bf2566a45959a51a5"
   },
-  "chat_heads-0.14.2-forge-1.20.jar": {
-    "jarName": "chat_heads-0.14.2-forge-1.20.jar",
+  "chat_heads-0.15.0-forge-1.20.jar": {
+    "jarName": "chat_heads-0.15.0-forge-1.20.jar",
     "modId": "chat_heads",
-    "version": "0.14.2",
-    "curseForgeHash": 1586719138,
-    "modrinthHash": "0410ab9636c69324e3671012af64c7743f6d6079"
+    "version": "0.15.0",
+    "curseForgeHash": 562582520,
+    "modrinthHash": "52a21207af65259adfa840e26042c28058f6513f"
   },
   "cherishedworlds-forge-6.1.7+1.20.1.jar": {
     "jarName": "cherishedworlds-forge-6.1.7+1.20.1.jar",
@@ -305,12 +305,12 @@
     "curseForgeHash": 635589968,
     "modrinthHash": "c65d07748acc57ceb45d53b3964368b84f34d54f"
   },
-  "colorwheel-forge-1.1.2+mc1.20.1.jar": {
-    "jarName": "colorwheel-forge-1.1.2+mc1.20.1.jar",
+  "colorwheel-forge-1.2.1+mc1.20.1.jar": {
+    "jarName": "colorwheel-forge-1.2.1+mc1.20.1.jar",
     "modId": "colorwheel",
-    "version": "1.1.2+mc1.20.1",
-    "curseForgeHash": 4284935425,
-    "modrinthHash": "08089e16b24756e0ef1e50967dcf2286b20f5923"
+    "version": "1.2.1+mc1.20.1",
+    "curseForgeHash": 4138397164,
+    "modrinthHash": "791578afecd261f0d03669db993b35d14badc1a9"
   },
   "colorwheel_patcher-forge-1.0.4+mc1.20.1.jar": {
     "jarName": "colorwheel_patcher-forge-1.0.4+mc1.20.1.jar",
@@ -361,12 +361,12 @@
     "curseForgeHash": 3614955629,
     "modrinthHash": "afd9fa3fe95e8c086e8d439df403ed1e5ea5cbea"
   },
-  "craftingtweaks-forge-1.20.1-18.2.6.jar": {
-    "jarName": "craftingtweaks-forge-1.20.1-18.2.6.jar",
+  "craftingtweaks-forge-1.20.1-18.2.8.jar": {
+    "jarName": "craftingtweaks-forge-1.20.1-18.2.8.jar",
     "modId": "craftingtweaks",
-    "version": "18.2.6",
-    "curseForgeHash": 791328458,
-    "modrinthHash": "f2091c7b171f1104bb22434d5b4a01ad678cdaf9"
+    "version": "18.2.8",
+    "curseForgeHash": 1007694343,
+    "modrinthHash": "1c93d31216aa53e53e97f4e24adb899673accb52"
   },
   "CraftPresence-2.7.0+1.20.1-forge.jar": {
     "jarName": "CraftPresence-2.7.0+1.20.1-forge.jar",
@@ -396,12 +396,12 @@
     "curseForgeHash": 2156032012,
     "modrinthHash": "b13d912b9247a38d66d11598c121442585a1c1e9"
   },
-  "create_connected-1.1.10-mc1.20.1-all.jar": {
-    "jarName": "create_connected-1.1.10-mc1.20.1-all.jar",
+  "create_connected-1.1.13-mc1.20.1-all.jar": {
+    "jarName": "create_connected-1.1.13-mc1.20.1-all.jar",
     "modId": "create_connected",
-    "version": "1.1.10-mc1.20.1",
-    "curseForgeHash": 198954090,
-    "modrinthHash": "eea1d04aee638689a99acf66457327b13a4b3f96"
+    "version": "1.1.13-mc1.20.1",
+    "curseForgeHash": 3555789816,
+    "modrinthHash": "0e1ffa4e6d3f7b379c7d30e8e59d424fd527acb4"
   },
   "create_factory_logistics-1.20.1-1.4.7.jar": {
     "jarName": "create_factory_logistics-1.20.1-1.4.7.jar",
@@ -410,12 +410,12 @@
     "curseForgeHash": 561746208,
     "modrinthHash": "bf67707d1645197f27cd9a4abea13159fa0fef1e"
   },
-  "create_hypertube-0.3.0-FORGE.jar": {
-    "jarName": "create_hypertube-0.3.0-FORGE.jar",
+  "create_hypertube-0.4.0-FORGE.jar": {
+    "jarName": "create_hypertube-0.4.0-FORGE.jar",
     "modId": "create_hypertube",
-    "version": "0.3.0",
-    "curseForgeHash": 302353697,
-    "modrinthHash": "476ae93802024b766badb15e538e0cf65a2e3fbd"
+    "version": "0.4.0",
+    "curseForgeHash": 694433954,
+    "modrinthHash": "49712554e365e4412fa6362f0394e919fe7eb261"
   },
   "createaddition-1.20.1-1.3.3.jar": {
     "jarName": "createaddition-1.20.1-1.3.3.jar",
@@ -445,12 +445,12 @@
     "curseForgeHash": 1069225375,
     "modrinthHash": "d216cf52735f8e4d3594943139599f6b0b20b8cf"
   },
-  "createpickywheels-forge-1.20.1-6.0.6-2.jar": {
-    "jarName": "createpickywheels-forge-1.20.1-6.0.6-2.jar",
+  "createpickywheels-forge-1.20.1-6.0.8-4.jar": {
+    "jarName": "createpickywheels-forge-1.20.1-6.0.8-4.jar",
     "modId": "createpickywheels",
-    "version": "1.20.1-6.0.6-2",
-    "curseForgeHash": 2218118416,
-    "modrinthHash": "698050b3f98b8fd9390b810741cf0eb08fee25ed"
+    "version": "1.20.1-6.0.8-4",
+    "curseForgeHash": 3915242941,
+    "modrinthHash": "338704cdf6623ad96983e72e81e8a9d97e8b28d8"
   },
   "CreativeCore_FORGE_v2.12.32_mc1.20.1.jar": {
     "jarName": "CreativeCore_FORGE_v2.12.32_mc1.20.1.jar",
@@ -508,12 +508,12 @@
     "curseForgeHash": 4053708632,
     "modrinthHash": "08b58bfbdf20660bdc5a0c4a0b088f7d89f40a38"
   },
-  "domum_ornamentum-1.20.1-1.0.292-snapshot-universal.jar": {
-    "jarName": "domum_ornamentum-1.20.1-1.0.292-snapshot-universal.jar",
+  "domum_ornamentum-1.20.1-1.0.296-universal.jar": {
+    "jarName": "domum_ornamentum-1.20.1-1.0.296-universal.jar",
     "modId": "domum_ornamentum",
-    "version": "1.20.1-1.0.292-snapshot",
-    "curseForgeHash": 2581620858,
-    "modrinthHash": "1b3b96dda8dd4541afba652c7a975ba439fc1026"
+    "version": "1.20.1-1.0.296",
+    "curseForgeHash": 12848397,
+    "modrinthHash": "f0052adb170e5f73f0f5b625c411bc5b99183c00"
   },
   "drippyloadingscreen_forge_3.1.0_MC_1.20.1.jar": {
     "jarName": "drippyloadingscreen_forge_3.1.0_MC_1.20.1.jar",
@@ -571,33 +571,33 @@
     "curseForgeHash": 1564210994,
     "modrinthHash": "4f440ac41309993a46e0ffcb2dd6106d7b92b3e2"
   },
-  "everycomp-1.20-2.9.13-forge.jar": {
-    "jarName": "everycomp-1.20-2.9.13-forge.jar",
+  "everycomp-1.20-2.9.17-forge.jar": {
+    "jarName": "everycomp-1.20-2.9.17-forge.jar",
     "modId": "everycomp",
-    "version": "1.20-2.9.13",
-    "curseForgeHash": 473863607,
-    "modrinthHash": "2c78942c7396b1fab9e53e4ee8172f7ce0ba4482"
+    "version": "1.20-2.9.17",
+    "curseForgeHash": 90477853,
+    "modrinthHash": "f916b0f9871722d56adea057111b70e4c0529866"
   },
-  "exposure-1.20.1-1.7.16-forge.jar": {
-    "jarName": "exposure-1.20.1-1.7.16-forge.jar",
+  "exposure-forge-1.20.1-1.9.13.jar": {
+    "jarName": "exposure-forge-1.20.1-1.9.13.jar",
     "modId": "exposure",
-    "version": "1.7.16",
-    "curseForgeHash": 652681066,
-    "modrinthHash": "b1ec92eeafdc97e88e0baacd5d89f4c1f89a4bbc"
+    "version": "1.9.13",
+    "curseForgeHash": 2516577834,
+    "modrinthHash": "2c1b71dffa45e8ef2008a4341a00fae55c331c20"
   },
-  "ExtendedAE-1.20-1.4.9-forge.jar": {
-    "jarName": "ExtendedAE-1.20-1.4.9-forge.jar",
+  "ExtendedAE-1.20-1.4.11-forge.jar": {
+    "jarName": "ExtendedAE-1.20-1.4.11-forge.jar",
     "modId": "expatternprovider",
-    "version": "1.20-1.4.9-forge",
-    "curseForgeHash": 2620237685,
-    "modrinthHash": "55a8c773659036176142242ded460a4b88ee6fb0"
+    "version": "1.20-1.4.11-forge",
+    "curseForgeHash": 4165358956,
+    "modrinthHash": "d37b8af49def8516123e0b03206a2a23ae0fdb0e"
   },
-  "ExtremeSoundMuffler-3.49.2-forge-1.20.1.jar": {
-    "jarName": "ExtremeSoundMuffler-3.49.2-forge-1.20.1.jar",
+  "ExtremeSoundMuffler-3.51-forge-1.20.1.jar": {
+    "jarName": "ExtremeSoundMuffler-3.51-forge-1.20.1.jar",
     "modId": "extremesoundmuffler",
-    "version": "3.48",
-    "curseForgeHash": 382750826,
-    "modrinthHash": "3b73ae534ff7e4f9c65e78c1f868655a23ab90c7"
+    "version": "3.51",
+    "curseForgeHash": 2384074866,
+    "modrinthHash": "025499c74e1e9305fa931b44c3832f43b1925ec7"
   },
   "fallingtrees-forge-0.12.7-1.20.jar": {
     "jarName": "fallingtrees-forge-0.12.7-1.20.jar",
@@ -620,12 +620,12 @@
     "curseForgeHash": 3575355395,
     "modrinthHash": "ceeeae222c51ae100e5126c4a5a7a05f4f3f4712"
   },
-  "FastSuite-1.20.1-5.1.0.jar": {
-    "jarName": "FastSuite-1.20.1-5.1.0.jar",
+  "FastSuite-1.20.1-5.1.2.jar": {
+    "jarName": "FastSuite-1.20.1-5.1.2.jar",
     "modId": "fastsuite",
-    "version": "5.1.0",
-    "curseForgeHash": 2667792324,
-    "modrinthHash": "3a759dce0ddc91e299027faa800c0ee40ab90de8"
+    "version": "5.1.2",
+    "curseForgeHash": 2881858684,
+    "modrinthHash": "32ea4495b0e646f8f060e4e97d17044dd9fdefbd"
   },
   "FastWorkbench-1.20.1-8.0.4.jar": {
     "jarName": "FastWorkbench-1.20.1-8.0.4.jar",
@@ -725,12 +725,12 @@
     "curseForgeHash": 1064675696,
     "modrinthHash": "1ef101b4c5991cc239d9b56a95500e3b404228f7"
   },
-  "ftb-teams-forge-2001.3.1.jar": {
-    "jarName": "ftb-teams-forge-2001.3.1.jar",
+  "ftb-teams-forge-2001.3.2.jar": {
+    "jarName": "ftb-teams-forge-2001.3.2.jar",
     "modId": "ftbteams",
-    "version": "2001.3.1",
-    "curseForgeHash": 1240744296,
-    "modrinthHash": "c2af94e0b86631cb75daa8de2377ff72527651ca"
+    "version": "2001.3.2",
+    "curseForgeHash": 816412664,
+    "modrinthHash": "c49023f5d471aa1ba7fc624d2565fe9e82b7117e"
   },
   "ftb-xmod-compat-forge-2.1.3.jar": {
     "jarName": "ftb-xmod-compat-forge-2.1.3.jar",
@@ -760,19 +760,19 @@
     "curseForgeHash": 3895274001,
     "modrinthHash": "6f1e3a25c4a0258c2592fefb837f95a24eb3bfa0"
   },
-  "fzzy_config-0.7.4+1.20.1+forge.jar": {
-    "jarName": "fzzy_config-0.7.4+1.20.1+forge.jar",
+  "fzzy_config-0.7.6+1.20.1+forge.jar": {
+    "jarName": "fzzy_config-0.7.6+1.20.1+forge.jar",
     "modId": "fzzy_config",
-    "version": "0.7.4+1.20.1+forge",
-    "curseForgeHash": 4069840182,
-    "modrinthHash": "b0213984f7591c3d1ec4ab5eebd87c605728d451"
+    "version": "0.7.6+1.20.1+forge",
+    "curseForgeHash": 3620637257,
+    "modrinthHash": "2e9ca1c5f028c251e1bc18b9ebaa06d401c8e624"
   },
-  "geckolib-forge-1.20.1-4.8.2.jar": {
-    "jarName": "geckolib-forge-1.20.1-4.8.2.jar",
+  "geckolib-forge-1.20.1-4.8.3.jar": {
+    "jarName": "geckolib-forge-1.20.1-4.8.3.jar",
     "modId": "geckolib",
-    "version": "4.8.2",
-    "curseForgeHash": 1555934041,
-    "modrinthHash": "395a9f21a36dc8466d67c2af67a904e7013460d1"
+    "version": "4.8.3",
+    "curseForgeHash": 4092514766,
+    "modrinthHash": "5428765c6c2e2135da6ee01f2f0478fa0db6aee7"
   },
   "Glodium-1.20-1.5-forge.jar": {
     "jarName": "Glodium-1.20-1.5-forge.jar",
@@ -795,26 +795,33 @@
     "curseForgeHash": 3324262533,
     "modrinthHash": "aa53625ab5e145c6aa196645335b062b37ae82da"
   },
-  "greate-0.0.60.jar": {
-    "jarName": "greate-0.0.60.jar",
+  "greate-0.0.66.jar": {
+    "jarName": "greate-0.0.66.jar",
     "modId": "greate",
-    "version": "0.0.60",
-    "curseForgeHash": 1014860832,
-    "modrinthHash": "3fc325df338f275847344f553ad81c3e9be0bc80"
+    "version": "0.0.66",
+    "curseForgeHash": 1988745374,
+    "modrinthHash": "34cc291020c237e39e0f04939cc78ccf2a9ab862"
   },
-  "gtceu-1.20.1-7.4.0.jar": {
-    "jarName": "gtceu-1.20.1-7.4.0.jar",
+  "gtceu-1.20.1-7.4.1.jar": {
+    "jarName": "gtceu-1.20.1-7.4.1.jar",
     "modId": "gtceu",
-    "version": "7.4.0",
-    "curseForgeHash": 3505279105,
-    "modrinthHash": "19c638cb4913b0581da1e518771f41965f96932f"
+    "version": "7.4.1",
+    "curseForgeHash": 2174922911,
+    "modrinthHash": "50ae5df1cc5213aa429a976b6393e0bd4e22238e"
   },
-  "gtmoldraw-2.0.3.jar": {
-    "jarName": "gtmoldraw-2.0.3.jar",
+  "gtceuterminal-2.4.6.jar": {
+    "jarName": "gtceuterminal-2.4.6.jar",
+    "modId": "gtceuterminal",
+    "version": "2.4.6",
+    "curseForgeHash": 3171573363,
+    "modrinthHash": "b7284297c33359569cff22208e938012c26a06ec"
+  },
+  "gtmoldraw-3.0.1.jar": {
+    "jarName": "gtmoldraw-3.0.1.jar",
     "modId": "moldraw",
-    "version": "2.0.3",
-    "curseForgeHash": 432163685,
-    "modrinthHash": "24e461ca4eac2877458e125dc4c9eb678ad3c270"
+    "version": "3.0.1",
+    "curseForgeHash": 3258582267,
+    "modrinthHash": "caaf28b88afe1b01ec4180a4458c2795184255bc"
   },
   "guideme-20.1.14.jar": {
     "jarName": "guideme-20.1.14.jar",
@@ -844,12 +851,12 @@
     "curseForgeHash": 726705548,
     "modrinthHash": "bc2d8febd3ddb7f5a0da5c840544ad49eb6e8625"
   },
-  "ImmediatelyFast-Forge-1.5.3+1.20.4.jar": {
-    "jarName": "ImmediatelyFast-Forge-1.5.3+1.20.4.jar",
+  "ImmediatelyFast-Forge-1.5.4+1.20.4.jar": {
+    "jarName": "ImmediatelyFast-Forge-1.5.4+1.20.4.jar",
     "modId": "immediatelyfast",
-    "version": "1.5.3+1.20.4",
-    "curseForgeHash": 2056126318,
-    "modrinthHash": "d4695d013e9da7089e2906db3f56bc5398e478e2"
+    "version": "1.5.4+1.20.4",
+    "curseForgeHash": 4234781540,
+    "modrinthHash": "e2e60485a0c3efa72f1948c952b095150e3ba4fc"
   },
   "immersive_aircraft-1.4.0+1.20.1-forge.jar": {
     "jarName": "immersive_aircraft-1.4.0+1.20.1-forge.jar",
@@ -912,12 +919,12 @@
     "curseForgeHash": 2392977662,
     "modrinthHash": "962fdb760409d6d71cbf079235f1ca94e3863a22"
   },
-  "KryptonReforged-0.2.3.jar": {
-    "jarName": "KryptonReforged-0.2.3.jar",
-    "modId": "krypton",
-    "version": "0.2.3",
-    "curseForgeHash": 2538339304,
-    "modrinthHash": "92690482dad46a8c9cf28e4b6b26e49f4dc67095"
+  "Krypton FNP-forge-1.20.1-0.2.28.2-1.20.1.jar": {
+    "jarName": "Krypton FNP-forge-1.20.1-0.2.28.2-1.20.1.jar",
+    "modId": "krypton_fnp",
+    "version": "0.2.28.2-1.20.1",
+    "curseForgeHash": 326889372,
+    "modrinthHash": "84f719905f9c01943b7e67ba61b0624ae6b073a3"
   },
   "kubejs-create-forge-2001.3.0-build.8.jar": {
     "jarName": "kubejs-create-forge-2001.3.0-build.8.jar",
@@ -968,12 +975,12 @@
     "curseForgeHash": 2035895651,
     "modrinthHash": "e6346060ae70cbf103b231d8a1536bcd044c84a8"
   },
-  "lootjs-forge-1.20.1-2.13.0.jar": {
-    "jarName": "lootjs-forge-1.20.1-2.13.0.jar",
+  "lootjs-forge-1.20.1-2.13.1.jar": {
+    "jarName": "lootjs-forge-1.20.1-2.13.1.jar",
     "modId": "lootjs",
-    "version": "1.20.1-2.13.0",
-    "curseForgeHash": 4083554858,
-    "modrinthHash": "fdf90acf177c19bcbfaa08527f6568bd3e6e622e"
+    "version": "1.20.1-2.13.1",
+    "curseForgeHash": 1389353380,
+    "modrinthHash": "804deb0bd34d69cad873170642b9d7e47fa0d6ad"
   },
   "lootr-forge-1.20-0.7.35.94.jar": {
     "jarName": "lootr-forge-1.20-0.7.35.94.jar",
@@ -1024,19 +1031,19 @@
     "curseForgeHash": 544928077,
     "modrinthHash": "24e6611df470afd957eafd16c43890b7214e3da9"
   },
-  "modernfix-forge-5.25.2+mc1.20.1.jar": {
-    "jarName": "modernfix-forge-5.25.2+mc1.20.1.jar",
+  "modernfix-forge-5.26.2+mc1.20.1.jar": {
+    "jarName": "modernfix-forge-5.26.2+mc1.20.1.jar",
     "modId": "modernfix",
-    "version": "5.25.2+mc1.20.1",
-    "curseForgeHash": 3074548209,
-    "modrinthHash": "4069534174e618393f0c14d9dc61ac27a04bb992"
+    "version": "5.26.2+mc1.20.1",
+    "curseForgeHash": 2785638273,
+    "modrinthHash": "0adfc122e9f632d8847688c4c3ed20a1af182afa"
   },
-  "moonlight-1.20-2.16.19-forge.jar": {
-    "jarName": "moonlight-1.20-2.16.19-forge.jar",
+  "moonlight-1.20-2.16.27-forge.jar": {
+    "jarName": "moonlight-1.20-2.16.27-forge.jar",
     "modId": "moonlight",
-    "version": "1.20-2.16.19",
-    "curseForgeHash": 2861614006,
-    "modrinthHash": "de55e348bdf3a3ac7520fde157654d615967f9b1"
+    "version": "1.20-2.16.27",
+    "curseForgeHash": 827170608,
+    "modrinthHash": "0a1b384ec20d63e94c56123b53e264dc2afe5b17"
   },
   "morered-1.20.1-4.0.0.4.jar": {
     "jarName": "morered-1.20.1-4.0.0.4.jar",
@@ -1087,12 +1094,12 @@
     "curseForgeHash": 1367373369,
     "modrinthHash": "c0806369f4257149664904db44efc60bd1785c17"
   },
-  "notenoughanimations-forge-1.11.1-mc1.20.1.jar": {
-    "jarName": "notenoughanimations-forge-1.11.1-mc1.20.1.jar",
+  "notenoughanimations-forge-1.11.2-mc1.20.1.jar": {
+    "jarName": "notenoughanimations-forge-1.11.2-mc1.20.1.jar",
     "modId": "notenoughanimations",
-    "version": "1.11.1",
-    "curseForgeHash": 1394524316,
-    "modrinthHash": "9aa8917d7c0a5311dc495da3c720434de49e0e24"
+    "version": "1.11.2",
+    "curseForgeHash": 978006094,
+    "modrinthHash": "fe7898d27c15b76552a69b972abec0728be9ea8a"
   },
   "OctoLib-FORGE-0.5.0.1+1.20.1.jar": {
     "jarName": "OctoLib-FORGE-0.5.0.1+1.20.1.jar",
@@ -1122,12 +1129,12 @@
     "curseForgeHash": 3233971835,
     "modrinthHash": "cc0332d3bbf7824b673abc59e231f1f5aafc6420"
   },
-  "particle_core-0.2.6+1.20.1+forge.jar": {
-    "jarName": "particle_core-0.2.6+1.20.1+forge.jar",
+  "particle_core-0.3.3+1.20.1+forge.jar": {
+    "jarName": "particle_core-0.3.3+1.20.1+forge.jar",
     "modId": "particle_core",
-    "version": "0.2.6+1.20.1+forge",
-    "curseForgeHash": 4189650687,
-    "modrinthHash": "91f302ab9b85016aeb3a9a0e85b80650a1d2e984"
+    "version": "0.3.3+1.20.1+forge",
+    "curseForgeHash": 1956610132,
+    "modrinthHash": "1da5744853d17979033d5ee3cd4251b8340ea7be"
   },
   "particular-1.20.1-Forge-1.2.7.jar": {
     "jarName": "particular-1.20.1-Forge-1.2.7.jar",
@@ -1157,6 +1164,13 @@
     "curseForgeHash": 3174429337,
     "modrinthHash": "e85f53de2e582a79ce25ff1df1e7b5b5fc08440f"
   },
+  "playerrevive_compat-1.0.2-12c699b.jar": {
+    "jarName": "playerrevive_compat-1.0.2-12c699b.jar",
+    "modId": "playerrevive_compat",
+    "version": "1.0.2",
+    "curseForgeHash": 2120677158,
+    "modrinthHash": "a0f05d85155560b743d6ffab61741e3da3803611"
+  },
   "PlayerRevive_FORGE_v2.0.31_mc1.20.1.jar": {
     "jarName": "PlayerRevive_FORGE_v2.0.31_mc1.20.1.jar",
     "modId": "playerrevive",
@@ -1199,6 +1213,13 @@
     "curseForgeHash": 1441086174,
     "modrinthHash": "f5f5f792473bb7b85ec221f75c5afb3740afb13a"
   },
+  "Reblured-1.20.1-1.3.0.jar": {
+    "jarName": "Reblured-1.20.1-1.3.0.jar",
+    "modId": "reblured",
+    "version": "1.20.1-1.3.0",
+    "curseForgeHash": 1448441159,
+    "modrinthHash": "9acd6f7702418fc77280bcc3c82b8589032d9f34"
+  },
   "resourcefulconfig-forge-1.20.1-2.1.3.jar": {
     "jarName": "resourcefulconfig-forge-1.20.1-2.1.3.jar",
     "modId": "resourcefulconfig",
@@ -1255,12 +1276,12 @@
     "curseForgeHash": 3171281796,
     "modrinthHash": "ed5a23ec30c90fd06b3f1d8140614028e1fafaee"
   },
-  "ShoulderSurfing-Forge-1.20.1-4.18.1.jar": {
-    "jarName": "ShoulderSurfing-Forge-1.20.1-4.18.1.jar",
+  "ShoulderSurfing-Forge-1.20.1-4.18.2.jar": {
+    "jarName": "ShoulderSurfing-Forge-1.20.1-4.18.2.jar",
     "modId": "shouldersurfing",
-    "version": "1.20.1-4.18.1",
-    "curseForgeHash": 1413955737,
-    "modrinthHash": "77b9cd4384a622f709ae69decb3ad4e6e44afe38"
+    "version": "1.20.1-4.18.2",
+    "curseForgeHash": 197734397,
+    "modrinthHash": "2385592f8a4101edd6627ce2a75811368e5d6abd"
   },
   "showcaseitem-1.20.1-1.2.jar": {
     "jarName": "showcaseitem-1.20.1-1.2.jar",
@@ -1311,19 +1332,19 @@
     "curseForgeHash": 2197810606,
     "modrinthHash": "7529fbf938787ed13a251cbf40936f8c29ec4b6c"
   },
-  "sophisticatedbackpacks-1.20.1-3.24.12.1411.jar": {
-    "jarName": "sophisticatedbackpacks-1.20.1-3.24.12.1411.jar",
+  "sophisticatedbackpacks-1.20.1-3.24.21.1515.jar": {
+    "jarName": "sophisticatedbackpacks-1.20.1-3.24.21.1515.jar",
     "modId": "sophisticatedbackpacks",
-    "version": "3.24.12.1411",
-    "curseForgeHash": 2442024860,
-    "modrinthHash": "c6624f4719cfa8c15ef87860570a2748afd715da"
+    "version": "3.24.21.1515",
+    "curseForgeHash": 2050984609,
+    "modrinthHash": "d3977c8262cf2eff9eed7852e3b3a73f7bcdbe9a"
   },
-  "sophisticatedcore-1.20.1-1.2.107.1240.jar": {
-    "jarName": "sophisticatedcore-1.20.1-1.2.107.1240.jar",
+  "sophisticatedcore-1.20.1-1.3.2.1468.jar": {
+    "jarName": "sophisticatedcore-1.20.1-1.3.2.1468.jar",
     "modId": "sophisticatedcore",
-    "version": "1.2.107.1240",
-    "curseForgeHash": 3130924746,
-    "modrinthHash": "a0a8e69b482e18bc82404c57f868db06d827ffca"
+    "version": "1.3.2.1468",
+    "curseForgeHash": 2053827009,
+    "modrinthHash": "da6fed216fee206c71e8b517197347868774e478"
   },
   "SoulBinding1.20.1(Forge)vs1.0.2.jar": {
     "jarName": "SoulBinding1.20.1(Forge)vs1.0.2.jar",
@@ -1346,12 +1367,12 @@
     "curseForgeHash": 4174736090,
     "modrinthHash": "b4d924f4faf6eb201db04205b61fa1524a8b0178"
   },
-  "Steam_Rails-1.6.14-beta+forge-mc1.20.1.jar": {
-    "jarName": "Steam_Rails-1.6.14-beta+forge-mc1.20.1.jar",
+  "Steam_Rails-1.6.15-beta+forge-mc1.20.1.jar": {
+    "jarName": "Steam_Rails-1.6.15-beta+forge-mc1.20.1.jar",
     "modId": "railways",
-    "version": "1.6.14-beta+forge-mc1.20.1",
-    "curseForgeHash": 2914385349,
-    "modrinthHash": "90ea1d917bc20a5e4cc50abaa512d2084149dc64"
+    "version": "1.6.15-beta+forge-mc1.20.1",
+    "curseForgeHash": 1571373559,
+    "modrinthHash": "924c3efb2187138b85a0d5285dbb65b371c4f7e9"
   },
   "supermartijn642configlib-1.1.8-forge-mc1.20.jar": {
     "jarName": "supermartijn642configlib-1.1.8-forge-mc1.20.jar",
@@ -1360,26 +1381,19 @@
     "curseForgeHash": 3016368264,
     "modrinthHash": "f80f9eed728966adcfbcc848633e789645057281"
   },
-  "supermartijn642corelib-1.1.18-forge-mc1.20.1.jar": {
-    "jarName": "supermartijn642corelib-1.1.18-forge-mc1.20.1.jar",
-    "modId": "supermartijn642corelib",
-    "version": "1.1.18",
-    "curseForgeHash": 4078642907,
-    "modrinthHash": "d37e1148b512c67cee704635b4f07d1f9ea8c31c"
-  },
-  "tacz-1.20.1-1.1.7-release.jar": {
-    "jarName": "tacz-1.20.1-1.1.7-release.jar",
+  "tacz-1.20.1-1.1.7-hotfix.jar": {
+    "jarName": "tacz-1.20.1-1.1.7-hotfix.jar",
     "modId": "tacz",
-    "version": "1.1.7",
-    "curseForgeHash": 1186606411,
-    "modrinthHash": "869decffc818e6ccd7d6d0d734aecfaa265e908b"
+    "version": "1.1.7-hotfix",
+    "curseForgeHash": 218830698,
+    "modrinthHash": "7d4f578a42c9b880744ea6058a495847aac9e4c3"
   },
-  "tacz-tweaks-2.11.2-all.jar": {
-    "jarName": "tacz-tweaks-2.11.2-all.jar",
+  "tacz-tweaks-2.13.0-all.jar": {
+    "jarName": "tacz-tweaks-2.13.0-all.jar",
     "modId": "tacztweaks",
-    "version": "2.11.2",
-    "curseForgeHash": 2376197194,
-    "modrinthHash": "889c0885b6388fc7966b956a5df4efbb1c758965"
+    "version": "2.13.0",
+    "curseForgeHash": 3917857281,
+    "modrinthHash": "1b2d7873fd3e2150f339d0d36e588196a50061d1"
   },
   "taczammoquery-1.20.1-1.0.0.jar": {
     "jarName": "taczammoquery-1.20.1-1.0.0.jar",
@@ -1388,33 +1402,33 @@
     "curseForgeHash": 1292892332,
     "modrinthHash": "e3d20ecf37d57b2ce0541cd0b082355853566296"
   },
-  "taczjs-forge-1.3.7-mc1.20.1.jar": {
-    "jarName": "taczjs-forge-1.3.7-mc1.20.1.jar",
+  "taczjs-forge-1.4.0+mc1.20.1.jar": {
+    "jarName": "taczjs-forge-1.4.0+mc1.20.1.jar",
     "modId": "taczjs",
-    "version": "1.3.7-mc1.20.1",
-    "curseForgeHash": 1742901301,
-    "modrinthHash": "8a97de20e31f7e863a968f82fd90e196f4b3a3b3"
+    "version": "1.4.0+mc1.20.1",
+    "curseForgeHash": 189217583,
+    "modrinthHash": "b44f0a0352d1e2eaa523744be6bc0742274dcc1a"
   },
-  "TerraFirmaCraft-Forge-1.20.1-3.2.19.jar": {
-    "jarName": "TerraFirmaCraft-Forge-1.20.1-3.2.19.jar",
+  "TerraFirmaCraft-Forge-1.20.1-3.2.20.jar": {
+    "jarName": "TerraFirmaCraft-Forge-1.20.1-3.2.20.jar",
     "modId": "tfc",
-    "version": "3.2.19",
-    "curseForgeHash": 837967200,
-    "modrinthHash": "107d4aec4694c509ea7ea8f3963478ae8002f46e"
+    "version": "3.2.20",
+    "curseForgeHash": 2679626739,
+    "modrinthHash": "ea725f5bed9662aa22d4ec089a009bd52fb82275"
   },
-  "TerraFirmaGreg-Core-Modern-0.8.13.jar": {
-    "jarName": "TerraFirmaGreg-Core-Modern-0.8.13.jar",
+  "TerraFirmaGreg-Core-Modern-0.8.21.jar": {
+    "jarName": "TerraFirmaGreg-Core-Modern-0.8.21.jar",
     "modId": "tfg",
-    "version": "0.8.13",
-    "curseForgeHash": 1252674808,
-    "modrinthHash": "557984bbe48f571e60426b370d6fa52baa4a1cef"
+    "version": "0.8.21",
+    "curseForgeHash": 3989792002,
+    "modrinthHash": "aa5ce192eee7a877264b036c5ffd2da71bce2807"
   },
-  "tfc_gurman-1.2.0.jar": {
-    "jarName": "tfc_gurman-1.2.0.jar",
-    "modId": "tfc_gurman",
-    "version": "1.1.0",
-    "curseForgeHash": 3362991748,
-    "modrinthHash": "4e219504c5ca011c2ea7036d6002d30ce14085c0"
+  "tfc_gourmet-1.4.3.jar": {
+    "jarName": "tfc_gourmet-1.4.3.jar",
+    "modId": "tfc_gourmet",
+    "version": "1.4.3",
+    "curseForgeHash": 415442845,
+    "modrinthHash": "103326499c4a574c87474a5af52f97d7a730071f"
   },
   "TFC_punishment_for_death-1.20.1-1.0.0.15.jar": {
     "jarName": "TFC_punishment_for_death-1.20.1-1.0.0.15.jar",
@@ -1430,12 +1444,12 @@
     "curseForgeHash": 301500460,
     "modrinthHash": "a3759bcb6545195e680121c145608eeefc70a18a"
   },
-  "tfc_support_indicator-1.0.3+mc1.20.1.jar": {
-    "jarName": "tfc_support_indicator-1.0.3+mc1.20.1.jar",
+  "tfc_support_indicator-1.0.6+mc1.20.1.jar": {
+    "jarName": "tfc_support_indicator-1.0.6+mc1.20.1.jar",
     "modId": "tfc_support_indicator",
-    "version": "1.0.3+mc1.20.1",
-    "curseForgeHash": 852302900,
-    "modrinthHash": "2cc053dc89943471f171d3473af9a0ee50c7a16b"
+    "version": "1.0.6+mc1.20.1",
+    "curseForgeHash": 3676229392,
+    "modrinthHash": "b1b4be876060fec0660842abe99279d0c93d5ebc"
   },
   "tfc_textile-1.0.5.jar": {
     "jarName": "tfc_textile-1.0.5.jar",
@@ -1514,12 +1528,12 @@
     "curseForgeHash": 2411075624,
     "modrinthHash": "021052fcfdd3b51ec5c0b3e46974ecdfd641a0c8"
   },
-  "tfclunchbox-1.20.1-1.0.0.26.jar": {
-    "jarName": "tfclunchbox-1.20.1-1.0.0.26.jar",
+  "tfclunchbox-1.20.1-1.0.0.28.jar": {
+    "jarName": "tfclunchbox-1.20.1-1.0.0.28.jar",
     "modId": "tfclunchbox",
-    "version": "1.0.0.26",
-    "curseForgeHash": 3150756370,
-    "modrinthHash": "e9ddf2c2ea8a3458c06ef31712543d201a1cb499"
+    "version": "1.0.0.28",
+    "curseForgeHash": 350342431,
+    "modrinthHash": "7894fbb87bc561b7c186ec9f3997118b953659d0"
   },
   "tfcscraping-1.0.2.jar": {
     "jarName": "tfcscraping-1.0.2.jar",
@@ -1577,12 +1591,12 @@
     "curseForgeHash": 3460520715,
     "modrinthHash": "3e4e2d2e3ee9486de4c6b64bcf8f25d87d55fc92"
   },
-  "toomanyrecipeviewers-0.7.0+mc.20.1.jar": {
-    "jarName": "toomanyrecipeviewers-0.7.0+mc.20.1.jar",
+  "toomanyrecipeviewers-0.7.1+mc.20.1.jar": {
+    "jarName": "toomanyrecipeviewers-0.7.1+mc.20.1.jar",
     "modId": "toomanyrecipeviewers",
-    "version": "0.7.0+mc.20.1",
-    "curseForgeHash": 831210803,
-    "modrinthHash": "24973cc8530188fef712d34767a27d2f001c50e6"
+    "version": "0.7.1+mc.20.1",
+    "curseForgeHash": 3793441057,
+    "modrinthHash": "29bec57f882d3a4bab4a2dc4c46e19cadcd32c67"
   },
   "tp_shooting-1.20.1-5.1.1+tacz1.1.6-all.jar": {
     "jarName": "tp_shooting-1.20.1-5.1.1+tacz1.1.6-all.jar",
@@ -1619,19 +1633,26 @@
     "curseForgeHash": 2388627373,
     "modrinthHash": "ca49a4163794cc0f94a31a17f6956be11979db53"
   },
-  "vintageimprovements-1.20.1-0.3.6.0.jar": {
-    "jarName": "vintageimprovements-1.20.1-0.3.6.0.jar",
+  "vintageimprovements-1.20.1-0.3.7.0.jar": {
+    "jarName": "vintageimprovements-1.20.1-0.3.7.0.jar",
     "modId": "vintageimprovements",
-    "version": "1.20.1-0.3.6.0",
-    "curseForgeHash": 1485580658,
-    "modrinthHash": "a893480c03a2803b130f79b2124d27345779f531"
+    "version": "1.20.1-0.3.7.0",
+    "curseForgeHash": 1687292018,
+    "modrinthHash": "d1416bd683464538a7615d1649eecc7027b227e2"
   },
-  "wab-1.20.1-1.3.2.jar": {
-    "jarName": "wab-1.20.1-1.3.2.jar",
+  "wab-1.20.1-1.4.1.jar": {
+    "jarName": "wab-1.20.1-1.4.1.jar",
     "modId": "wan_ancient_beasts",
-    "version": "1.3.2",
-    "curseForgeHash": 2333549546,
-    "modrinthHash": "7298a59e383d2327e2acc49d8f1b132cedb8860b"
+    "version": "1.4.1",
+    "curseForgeHash": 194648790,
+    "modrinthHash": "6a9465b15671d7f1ea2f7b3ed44c881065b945f6"
+  },
+  "wakes-1.20.1-Forge-1.0.9.jar": {
+    "jarName": "wakes-1.20.1-Forge-1.0.9.jar",
+    "modId": "wakes",
+    "version": "1.0.9",
+    "curseForgeHash": 650217522,
+    "modrinthHash": "4e2f19e3c2d36968630f66b370ad0ab984aa5b25"
   },
   "waterflasks-3.0.10.jar": {
     "jarName": "waterflasks-3.0.10.jar",

config/createpickywheels-common.toml

@@ -1,22 +1,50 @@
 
-##Waterwheel requirements
+#Waterwheel requirements
 [waterwheels]
 	#Enable waterwheels modifications?
 	waterwheelsEnabled = true
 	#Only enable pickyness onPlacement, if the water wheel was instead generated during worldgen, it works as default.
 	waterwheelsPickyOnPlacement = true
-	#Boost for Waterwheels placed on boosted biomes.
-	#Range: 0.0 ~ 1.7976931348623157E308
-	waterwheelBaseBoost = 1.0
-	#Penalty for Waterwheels placed on whitelisted but not on preferential biomes [waterwheel_boosted biome tag].
-	#Range: 0.0 ~ 1.7976931348623157E308
-	waterwheelPenalty = 0.25
-	#The minimum amount of fluid blocks the waterwheel needs to find before rotation begins.
-	#Range: > 1
-	waterwheelThreshold = 1
-	#The maximum distance a waterwheel can consider fluid blocks from.
-	#Range: > 1
-	waterwheelRange = 2
+
+	#Biome impact on waterwheel
+	[waterwheels."biome efficiency"]
+		#RPM Boost for Waterwheels placed on boosted biomes tag.
+		#Range: 0.0 ~ 1.7976931348623157E308
+		waterwheelBiomeRPMBoost = 1.0
+		#RPM Penalty for Waterwheels placed on whitelisted but not on preferential biomes [waterwheel_boosted biome tag].
+		#Range: 0.0 ~ 1.7976931348623157E308
+		waterwheelBiomeRPMPenalty = 0.25
+		#STRESS Boost for Waterwheels placed on boosted Biomes.
+		#Range: 0.0 ~ 1.7976931348623157E308
+		waterwheelBiomeSTRESSBoost = 1.0
+		#STRESS Penalty for Waterwheels placed on whitelisted but not on preferential biomes [waterwheel_boosted biome tag].
+		#Range: 0.0 ~ 1.7976931348623157E308
+		waterwheelBiomeSTRESSPenalty = 1.0
+
+	#Body of water requirement impact (similar to infinite fluid extraction from pulley)
+	[waterwheels."power source condition"]
+		#When enabled waterwheels also work when under create's default conditions but at a penalty
+		waterwheelsPorqueNoLosDos = true
+		#Boost for Waterwheels placed on optimal conditions.
+		#Range: 0.0 ~ 1.7976931348623157E308
+		waterwheelSourceRPMBoost = 1.0
+		#Penalty for Waterwheels placed under create's default conditions.
+		#Range: 0.0 ~ 1.7976931348623157E308
+		waterwheelSourceRPMPenalty = 1.0
+		#Boost for Waterwheels placed on optimal conditions.
+		#Range: 0.0 ~ 1.7976931348623157E308
+		waterwheelSourceSTRESSBoost = 1.0
+		#Penalty for Waterwheels placed under create's default conditions.
+		#Range: 0.0 ~ 1.7976931348623157E308
+		waterwheelSourceSTRESSPenalty = 1.0
+		#The minimum amount of fluid blocks the waterwheel needs to find before rotation begins.
+		#Range: > 1
+		waterwheelSourceThreshold = 1
+		#The maximum distance a waterwheel can consider fluid blocks from.
+		#Range: > 1
+		waterwheelSourceRange = 3
+		#When enabled boosted waterwheels require correct flow (like in TerraFirmaCraft's water river)
+		waterwheelsSourceRequiresFlow = true
 
 ##Windmill requirements
 [windmills]
@@ -37,7 +65,7 @@
 	#The minimum amount of points that must hit windmillRequiredRange.
 	#Range: > 1
 	windmillRequiredRangePoints = 1
-	#The maximum distance a waterwheel can consider air blocks from.
+	#The maximum distance a windmill can consider air blocks from.
 	#Range: > 1
 	windmillMaxRange = 32
 	#The percentage of Generated Speed only given if windmills are raised enough.

config/defaultoptions/keybindings.txt

@@ -78,7 +78,7 @@ key_key.astikorcarts.desc:key.keyboard.r:NONE
 key_key.curios.open.desc:key.keyboard.unknown:NONE
 key_create.keyinfo.toolmenu:key.keyboard.left.alt:NONE
 key_create.keyinfo.toolbelt:key.keyboard.left.alt:NONE
-key_key.toolbelt.open:key.keyboard.unknown:NONE
+key_key.toolbelt.open:key.keyboard.x:NONE
 key_key.toolbelt.slot:key.keyboard.unknown:NONE
 key_gui.xaero_switch_waypoint_set:key.keyboard.unknown:NONE
 key_gui.xaero_instant_waypoint:key.keyboard.unknown:NONE
@@ -120,4 +120,9 @@ key_gtceu.key.armor_mode_switch:key.keyboard.o
 key_key.ftbchunks.map:key.keyboard.unknown:NONE
 key_key.ftbchunks.claim_manager:key.keyboard.unknown:NONE
 key_key.ad_astra.toggle_suit_flight:key.keyboard.h:NONE
-key_key.ad_astra.open_radio:key.keyboard.r:NONE
+key_key.ad_astra.open_radio:key.keyboard.r:NONE
+key_key.wan_ancient_beasts.special_ability:key.keyboard.c:NONE
+key_key.saveToolbarActivator:key.keyboard.unknown:NONE
+key_key.loadToolbarActivator:key.keyboard.unknown:NONE
+key_key.tacz.crawl.desc:key.keyboard.c:NONE
+key_key.prone:key.keyboard.c:NONE

config/defaultoptions/options.txt

@@ -3,7 +3,7 @@ resourcePacks:["vanilla","mod_resources","gtceu:dynamic_assets","Moonlight Mods
 incompatibleResourcePacks:["firmalife_data","file/Perfected Anvil Helper.zip"]
 narrator:0
 soundCategory_master:1.0
-soundCategory_music:0.3
+soundCategory_music:0.4
 soundCategory_record:1.0
 soundCategory_weather:1.0
 soundCategory_block:1.0

config/fallingtrees_common.json

@@ -50,7 +50,11 @@
           "beneath:wood/leaves/crimson",
           "beneath:wood/leaves/warped",
           "ad_astra:aeronos_cap",
-          "ad_astra:strophar_cap"
+          "ad_astra:strophar_cap",
+          "tfg:crimson_wart_block",
+          "tfg:warped_wart_block",
+          "tfg:aeronos_cap",
+          "tfg:strophar_cap"
         ],
         "blacklist": []
       },

config/fancymenu/customization/gui_main_menu.txt

@@ -286,7 +286,7 @@ element {
 
 element {
   button_element_executable_block_identifier = dbfd850d-f49c-44f9-975c-52b0b07335f1-1710837053353
-  [executable_action_instance:dc0290c6-6dcd-41ab-b222-a76c27eaec6e-1710837053356][action_type:joinserver] = modern.terrafirmagreg.su
+  [executable_action_instance:dc0290c6-6dcd-41ab-b222-a76c27eaec6e-1710837053356][action_type:joinserver] = modern.terrafirmagreg.team
   [executable_block:dbfd850d-f49c-44f9-975c-52b0b07335f1-1710837053353][type:generic] = [executables:dc0290c6-6dcd-41ab-b222-a76c27eaec6e-1710837053356;]
   backgroundnormal = [source:local]kubejs/assets/tfg/textures/gui/button_98x20.png
   backgroundhovered = [source:location]tfg:textures/gui/button_hover_98x20.gif

config/ftbbackups2.json

@@ -27,13 +27,15 @@
 	   More info here
 	   (http://www.cronmaker.com)
 	*/
-	"backup_cron": "0 15 10 * * ? *",
+	"backup_cron": "0 0 0/1 1/1 * ? *",
 	// Time between manual backups using the command
 	"manual_backups_time": 0,
 	// Only run a backup if a player has been online since the last backup
 	"only_if_players_been_online": true,
 	// Additional directories to include in backup
-	"additional_directories": [],
+	"additional_directories": [
+		"xaero/minimap/"
+	],
 	/* Additional files and directories to include in backup.
 	   Can specify a file name, path relative to server directory or wildcard file path
 	   Examples:                       (All file paths are relative to server root)
@@ -44,7 +46,11 @@
 	   *path/ends/with.txt             Any files who's path ends with
 	   *path/contains*                 Any files who's path contains
 	*/
-	"additional_files": [],
+	"additional_files": [
+		"/cherishedworlds-favorites.dat",
+		"/emi.json",
+		"/options.txt"
+	],
 	// Display file size in backup message
 	"display_file_size": false,
 	// backup location
@@ -52,9 +58,9 @@
 	// Specify the backup format. Valid options are ZIP and DIRECTORY
 	"backup_format": "ZIP",
 	// Minimum free disk space in MB. If a backup's creation would leave less than this amount of disk space remaining, the backup will be aborted.
-	"minimum_free_space": 51200,
+	"minimum_free_space": 0,
 	// If the previous backup failed due to lack of space, the oldest backup will be deleted to free space.
-	"free_space_if_needed": true,
+	"free_space_if_needed": false,
 	/* Specify files or folders to be excluded.
 	   Can specify a file name, path relative to server directory or wildcard file path
 	   Examples:                       (All file paths are relative to server root)

config/ftbquests/quests/chapters/applied_energistics_2.snbt

@@ -72,8 +72,8 @@
 	quest_links: [{
 		id: "6845144F7EA1081D"
 		linked_quest: "24158DEE63DAEB41"
-		x: 5.0d
-		y: -4.5d
+		x: 6.0d
+		y: -3.5d
 	}]
 	quests: [
 		{
@@ -141,15 +141,22 @@
 					type: "item"
 				}
 				{
-					id: "31CD18493D0D65BC"
-					item: "gtceu:hv_sifter"
+					id: "52F9B7116D01F7F8"
+					item: "gtceu:hv_autoclave"
 					optional_task: true
 					type: "item"
 				}
 				{
-					id: "52F9B7116D01F7F8"
-					item: "gtceu:hv_autoclave"
+					id: "394F7CEA050D785B"
+					item: {
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item(vintageimprovements:vibrating_table)item(gtceu:lv_sifter)item(gtceu:mv_sifter)item(gtceu:hv_sifter)item(gtceu:ev_sifter)item(gtceu:iv_sifter)item(gtceu:luv_sifter)item(gtceu:zpm_sifter)item(gtceu:uv_sifter))"
+						}
+					}
 					optional_task: true
+					title: "{quests.ore_proc.sifter.task}"
 					type: "item"
 				}
 			]
@@ -224,10 +231,9 @@
 			y: -0.5d
 		}
 		{
-			can_repeat: true
 			dependencies: ["0C0B09D66D0CFFBA"]
 			description: ["{quests.ae2.ae_guide.desc}"]
-			icon: "ae2:guide"
+			icon: "ae2:singularity"
 			id: "6CF08AFB924905F0"
 			rewards: [{
 				id: "34825A998EA88DB4"
@@ -362,6 +368,7 @@
 					type: "item"
 				}
 			]
+			title: "{quests.ae2.cables.title}"
 			x: 0.5d
 			y: -6.0d
 		}
@@ -400,7 +407,7 @@
 				item: "ae2:crafting_unit"
 				type: "item"
 			}]
-			x: -1.0d
+			x: -2.0d
 			y: -6.0d
 		}
 		{
@@ -412,7 +419,7 @@
 				item: "ae2:crafting_accelerator"
 				type: "item"
 			}]
-			x: -2.5d
+			x: -3.5d
 			y: -6.5d
 		}
 		{
@@ -431,7 +438,8 @@
 				title: "{quests.ae2.crafting_storage.task}"
 				type: "item"
 			}]
-			x: -2.5d
+			title: "{quests.ae2.crafting_storage.title}"
+			x: -3.5d
 			y: -5.5d
 		}
 		{
@@ -452,6 +460,7 @@
 				title: "{quests.ae2.pattern_provider.task}"
 				type: "item"
 			}]
+			title: "{quests.ae2.pattern_provider.title}"
 			x: 0.5d
 			y: -9.0d
 		}
@@ -507,7 +516,7 @@
 				item: "ae2:interface"
 				type: "item"
 			}]
-			x: 2.0d
+			x: 3.0d
 			y: -6.0d
 		}
 		{
@@ -526,7 +535,8 @@
 				title: "{quests.ae2.export_bus.task}"
 				type: "item"
 			}]
-			x: 3.5d
+			title: "{quests.ae2.export_bus.title}"
+			x: 5.0d
 			y: -7.0d
 		}
 		{
@@ -537,8 +547,16 @@
 			id: "0F1104DEEB22EF86"
 			size: 1.0d
 			tasks: [{
-				id: "6D9B9EAFE680B768"
-				type: "checkmark"
+				id: "6CBA077E634222BC"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(gtceu:circuits/iv)"
+					}
+				}
+				title: "Any #gtceu:circuits/iv"
+				type: "item"
 			}]
 			title: "{quests.ae2.iv.title}"
 			x: 3.0d
@@ -637,8 +655,16 @@
 			id: "1F3621FABA32DC6B"
 			size: 1.0d
 			tasks: [{
-				id: "4CE3EF0D1FAC1B6C"
-				type: "checkmark"
+				id: "7D229D57EB72CF9E"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(gtceu:circuits/luv)"
+					}
+				}
+				title: "Any #gtceu:circuits/luv"
+				type: "item"
 			}]
 			title: "{quests.ae2.luv.title}"
 			x: 0.5d
@@ -653,7 +679,7 @@
 				item: "ae2:import_bus"
 				type: "item"
 			}]
-			x: 3.5d
+			x: 5.0d
 			y: -5.0d
 		}
 		{
@@ -680,7 +706,7 @@
 					type: "item"
 				}
 			]
-			x: 3.5d
+			x: 5.0d
 			y: -6.0d
 		}
 		{
@@ -693,20 +719,17 @@
 				type: "checkmark"
 			}]
 			title: "{quests.ae2.interface_automation.title}"
-			x: 5.0d
+			x: 6.5d
 			y: -6.0d
 		}
 		{
 			dependencies: ["6CF08AFB924905F0"]
 			description: ["{quests.ae2.hv.desc}"]
+			disable_toast: true
 			icon: "tfg:hv_universal_circuit"
 			icon_scale: 2.0d
 			id: "3C3C21482E31267B"
 			size: 1.0d
-			tasks: [{
-				id: "1D4A01B75676146B"
-				type: "checkmark"
-			}]
 			title: "{quests.ae2.hv.title}"
 			x: 0.5d
 			y: -2.5d
@@ -1094,6 +1117,7 @@
 				{
 					id: "270F842BF5012A13"
 					item: "ae2:io_port"
+					optional_task: true
 					type: "item"
 				}
 				{
@@ -1283,6 +1307,27 @@
 			x: -2.0d
 			y: -9.0d
 		}
+		{
+			can_repeat: true
+			dependencies: ["6CF08AFB924905F0"]
+			description: ["{quests.ae2.books_again.desc}"]
+			icon: "ae2:guide"
+			id: "21ED71AAA4EE4890"
+			optional: true
+			rewards: [{
+				id: "0507786BBEF1A6C9"
+				item: "ae2:guide"
+				type: "item"
+			}]
+			shape: "none"
+			tasks: [{
+				id: "26C00F0A52235B5D"
+				type: "checkmark"
+			}]
+			title: "{quests.ae2.books_again.title}"
+			x: -0.5d
+			y: -1.0d
+		}
 	]
 	subtitle: ["{quests.ae2.subtitle}"]
 	title: "{quests.ae2}"

config/ftbquests/quests/chapters/create_logistics.snbt

@@ -131,6 +131,8 @@
 			dependencies: [
 				"572A8983FA12152A"
 				"3AF956758FA289A8"
+				"07E7678095258EDB"
+				"383A14A5C65B3ADF"
 			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.create_logistics.rose_quartz_lens.desc}"]
@@ -209,8 +211,9 @@
 		{
 			dependencies: [
 				"7C4807A247AF36A1"
-				"648BCF486E16CCB2"
+				"713C8D6A20BF3A0E"
 			]
+			dependency_requirement: "one_completed"
 			description: ["{quests.create_logistics.stock_link.desc}"]
 			id: "76490E046A44BCC3"
 			size: 2.0d
@@ -225,7 +228,11 @@
 			y: -1.0d
 		}
 		{
-			dependencies: ["76490E046A44BCC3"]
+			dependencies: [
+				"76490E046A44BCC3"
+				"50FE830DA6F403B2"
+			]
+			dependency_requirement: "one_completed"
 			description: [
 				"{quests.create_logistics.stock_ticker.desc.1}"
 				"{@pagebreak}"
@@ -245,7 +252,11 @@
 			y: -2.5d
 		}
 		{
-			dependencies: ["76490E046A44BCC3"]
+			dependencies: [
+				"76490E046A44BCC3"
+				"50FE830DA6F403B2"
+			]
+			dependency_requirement: "one_completed"
 			description: ["{quests.create_logistics.redstone_requester.desc}"]
 			id: "3F44CFF8A6018F3E"
 			subtitle: "{quests.create_logistics.redstone_requester.subtitle}"

config/ftbquests/quests/chapters/gregtech_energy.snbt

@@ -118,10 +118,7 @@
 			y: -7.0d
 		}
 		{
-			dependencies: [
-				"06B2E38F7DCF2678"
-				"22510C5F2386B453"
-			]
+			dependencies: ["06B2E38F7DCF2678"]
 			dependency_requirement: "one_completed"
 			description: ["{quests.gregtech_energy.produce_energy.desc}"]
 			icon: "gtceu:lv_field_generator"
@@ -235,7 +232,7 @@
 			dependencies: [
 				"60FF9249376DF9BD"
 				"05E2F203DA46A5E8"
-				"3EC8D58DB73CEFE5"
+				"2BE373381980C85F"
 			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.gregtech_energy.transformer.desc}"]
@@ -801,7 +798,7 @@
 			y: -5.0d
 		}
 		{
-			dependencies: ["4D0ADC66D2CF09B1"]
+			dependencies: ["0AF286AA540A82E6"]
 			description: ["{quests.gregtech_energy.solar_panel.desc}"]
 			id: "109C57B63EE95E35"
 			subtitle: "{quests.gregtech_energy.solar_panel.subtitle}"
@@ -812,12 +809,14 @@
 				type: "item"
 			}]
 			x: -6.0d
-			y: -3.0d
+			y: -5.0d
 		}
 		{
 			dependencies: [
 				"109C57B63EE95E35"
 				"5826EC76931359B8"
+				"00A2566109144D7F"
+				"4D0ADC66D2CF09B1"
 			]
 			dependency_requirement: "one_completed"
 			description: [
@@ -835,7 +834,7 @@
 				type: "item"
 			}]
 			x: -6.0d
-			y: -2.0d
+			y: -3.0d
 		}
 		{
 			dependencies: ["4D0ADC66D2CF09B1"]
@@ -1019,8 +1018,8 @@
 		}
 		{
 			dependencies: [
-				"0AF286AA540A82E6"
 				"0C718329245D9619"
+				"4C620105AAC49381"
 			]
 			description: [
 				"{quests.medium_voltage.mv_diesel.desc.1}"
@@ -1037,8 +1036,8 @@
 				type: "item"
 			}]
 			title: "{quests.medium_voltage.mv_diesel.title}"
-			x: -9.0d
-			y: -5.0d
+			x: -8.5d
+			y: -7.0d
 		}
 		{
 			dependencies: ["7AF726555D721DFC"]
@@ -1083,13 +1082,16 @@
 				"4C620105AAC49381"
 				"0C718329245D9619"
 			]
+			description: ["{quests.low_voltage.lv_biodiesel.desc}"]
 			id: "139C7DF629329753"
+			subtitle: "{quests.low_voltage.lv_biodiesel.subtitle}"
 			tasks: [{
 				id: "7BA9FDD1F45B53F6"
 				item: "gtceu:bio_diesel_bucket"
 				type: "item"
 			}]
-			x: -9.0d
+			title: "{quests.low_voltage.lv_biodiesel.title}"
+			x: -9.5d
 			y: -7.0d
 		}
 		{
@@ -1147,14 +1149,17 @@
 		{
 			dependencies: [
 				"0585527D1854628B"
-				"05E2F203DA46A5E8"
+				"7AF726555D721DFC"
+				"5FA09DA68D309548"
 			]
+			dependency_requirement: "one_completed"
 			description: [
 				"{quests.gregtech_energy.large_solar_t2.desc.1}"
 				"{@pagebreak}"
 				"{quests.gregtech_energy.large_solar_t2.desc.2}"
 			]
 			id: "3AEAB1930F4CC034"
+			optional: true
 			subtitle: "{quests.gregtech_energy.large_solar_t2.subtitle}"
 			tasks: [{
 				id: "149BF93064D121D3"
@@ -1162,15 +1167,16 @@
 				type: "item"
 			}]
 			x: -6.0d
-			y: 1.0d
+			y: -1.0d
 		}
 		{
 			dependencies: [
 				"3AEAB1930F4CC034"
-				"1DB543EFEEB67238"
+				"05E2F203DA46A5E8"
 			]
 			description: ["{quests.gregtech_energy.large_solar_t3.desc}"]
 			id: "7CA3A5EFE3D5B688"
+			optional: true
 			subtitle: "{quests.gregtech_energy.large_solar_t3.subtitle}"
 			tasks: [{
 				id: "612817A7FA759E03"
@@ -1178,7 +1184,7 @@
 				type: "item"
 			}]
 			x: -6.0d
-			y: 3.0d
+			y: 1.0d
 		}
 		{
 			dependencies: [
@@ -1236,16 +1242,65 @@
 				"05E2F203DA46A5E8"
 				"0ABD326DC2551CBD"
 			]
-			description: ["{quests.gregtech_energy.smr.desc.1}"]
+			description: [
+				"{quests.gregtech_energy.smr.desc.1}"
+				"{@pagebreak}"
+				"{quests.gregtech_energy.smr.desc.2}"
+				"{@pagebreak}"
+				"{quests.gregtech_energy.smr.desc.3}"
+			]
+			icon: "tfg:smr_generator"
 			id: "4659447C85CDC058"
 			subtitle: "{quests.gregtech_energy.smr.subtitle}"
-			tasks: [{
-				id: "1D02468DD9869C72"
-				item: "deafission:fission_reactor_smr1"
-				type: "item"
-			}]
+			tasks: [
+				{
+					id: "1D02468DD9869C72"
+					item: "deafission:fission_reactor_smr1"
+					type: "item"
+				}
+				{
+					id: "4DA2451D673DABE3"
+					item: "tfg:smr_generator"
+					type: "item"
+				}
+				{
+					id: "7647ABCBC805E3B3"
+					item: "tfg:uv_smr_fluid_import_hatch"
+					type: "item"
+				}
+				{
+					id: "4BDA2F8B0D5B310D"
+					item: "gtceu:lubricant_bucket"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "5C5003050BCE8601"
+					item: "tfg:polyalkylene_lubricant_bucket"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "79126D47F1236F45"
+					item: "tfg:ozone_bucket"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "5075B6C62A7AB675"
+					item: "tfg:cyclohex_diperoxide_bucket"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "28AAB372882C8996"
+					item: "tfg:ticl4_doped_supercritical_co2_bucket"
+					optional_task: true
+					type: "item"
+				}
+			]
 			title: "{quests.gregtech_energy.smr.title}"
-			x: -7.5d
+			x: -7.0d
 			y: 1.0d
 		}
 		{
@@ -1266,21 +1321,65 @@
 			y: -7.0d
 		}
 		{
-			dependencies: ["4512E5DE7A84F809"]
-			description: ["{quests.gregtech_energy.fission_rod.desc.1}"]
+			dependencies: [
+				"4512E5DE7A84F809"
+				"4C29DDE89AE8D6EE"
+				"3E0ABDFCC0FC6928"
+			]
+			dependency_requirement: "one_completed"
+			description: [
+				"{quests.gregtech_energy.fission_rod.desc.1}"
+				"{@pagebreak}"
+				"{quests.gregtech_energy.fission_rod.desc.2}"
+				"{@pagebreak}"
+				"{quests.gregtech_energy.fission_rod.desc.3}"
+			]
+			icon: {
+				Count: 1
+				id: "tfg:tbu_232_rod"
+				tag: {
+					Damage: 0
+				}
+			}
 			id: "0ABD326DC2551CBD"
 			subtitle: "{quests.gregtech_energy.fission_rod.subtitle}"
-			tasks: [{
-				id: "68E3EE04F4931EFE"
-				item: {
-					Count: 1
-					id: "tfg:tbu_232_rod"
-					tag: {
-						Damage: 0
+			tasks: [
+				{
+					id: "68E3EE04F4931EFE"
+					item: {
+						Count: 1
+						id: "tfg:tbu_232_rod"
+						tag: {
+							Damage: 0
+						}
 					}
+					type: "item"
 				}
-				type: "item"
-			}]
+				{
+					id: "21383A5C0CF976DD"
+					item: {
+						Count: 1
+						id: "tfg:americium_241_rod"
+						tag: {
+							Damage: 0
+						}
+					}
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "5B22DEC6694CDCCB"
+					item: {
+						Count: 1
+						id: "tfg:neptunium_237_rod"
+						tag: {
+							Damage: 0
+						}
+					}
+					optional_task: true
+					type: "item"
+				}
+			]
 			title: "{quests.gregtech_energy.fission_rod.title}"
 			x: -7.5d
 			y: 0.0d
@@ -1320,6 +1419,41 @@
 			x: -9.0d
 			y: -1.0d
 		}
+		{
+			dependencies: [
+				"05E2F203DA46A5E8"
+				"0ABD326DC2551CBD"
+			]
+			description: [
+				"{quests.gregtech_energy.cooling_tower.desc.1}"
+				"{@pagebreak}"
+				"{quests.gregtech_energy.cooling_tower.desc.2}"
+			]
+			icon: "tfg:cooling_tower"
+			id: "7F2F435C727C7AB3"
+			subtitle: "{quests.gregtech_energy.cooling_tower.subtitle}"
+			tasks: [
+				{
+					id: "0347D107FEC9761B"
+					item: "tfg:cooling_tower"
+					type: "item"
+				}
+				{
+					id: "7CD0D40C08CC42D2"
+					item: "tfg:boron_enriched_coolant_bucket"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "23C1F8FEFBD23A5C"
+					item: "tfg:warm_water_bucket"
+					optional_task: true
+					type: "item"
+				}
+			]
+			x: -8.0d
+			y: 1.0d
+		}
 	]
 	subtitle: ["{quests.gregtech_energy.subtitle}"]
 	title: "{quests.gregtech_energy}"

config/ftbquests/quests/chapters/hv__high_voltage.snbt

@@ -11,13 +11,13 @@
 			id: "2583D0B64E51FAC8"
 			linked_quest: "5063FDFFBE3E4855"
 			x: 2.5d
-			y: -7.5d
+			y: -8.5d
 		}
 		{
 			id: "308E11BE764398A1"
 			linked_quest: "7C1FD81C5DCFB74E"
 			x: -8.0d
-			y: -7.5d
+			y: -8.5d
 		}
 		{
 			id: "33D3C2A9337335D2"
@@ -42,14 +42,22 @@
 		{
 			id: "513464FBE4A87CB7"
 			linked_quest: "3A2E442E4D84C891"
-			x: 2.5d
-			y: -10.0d
+			shape: "octagon"
+			size: 2.0d
+			x: 0.0d
+			y: -11.0d
 		}
 		{
 			id: "1B29194F9C306CFE"
 			linked_quest: "36B9B5024356C53C"
-			x: 3.5d
-			y: -10.0d
+			x: 0.0d
+			y: -13.0d
+		}
+		{
+			id: "3274381865E7D011"
+			linked_quest: "0585527D1854628B"
+			x: 14.0d
+			y: 1.5d
 		}
 	]
 	quests: [
@@ -353,7 +361,7 @@
 			}]
 			title: "{quests.high_voltage.superconductors.title}"
 			x: -8.0d
-			y: -10.0d
+			y: -11.0d
 		}
 		{
 			dependencies: ["7E755297E9685374"]
@@ -374,7 +382,7 @@
 			}]
 			title: "{quests.high_voltage.nichrome_coils.title}"
 			x: -6.5d
-			y: -10.0d
+			y: -11.0d
 		}
 		{
 			dependencies: [
@@ -410,7 +418,7 @@
 			}]
 			title: "{quests.high_voltage.vacuum_freezer.title}"
 			x: -5.0d
-			y: -7.5d
+			y: -8.5d
 		}
 		{
 			dependencies: ["124B32A0583A636A"]
@@ -475,7 +483,7 @@
 			icon: "gtceu:cleanroom"
 			id: "3568BC9742092FC5"
 			shape: "octagon"
-			size: 2.0d
+			size: 1.5d
 			subtitle: "{quests.high_voltage.cleanroom.subtitle}"
 			tasks: [
 				{
@@ -559,7 +567,7 @@
 			]
 			title: "{quests.high_voltage.fluorine.title}"
 			x: 1.5d
-			y: 4.5d
+			y: 4.0d
 		}
 		{
 			dependencies: [
@@ -592,7 +600,7 @@
 			]
 			title: "{quests.high_voltage.ptfe.title}"
 			x: 0.0d
-			y: 4.5d
+			y: 5.0d
 		}
 		{
 			dependencies: ["5BACED5AE350EAB1"]
@@ -617,8 +625,8 @@
 				}
 			]
 			title: "{quests.high_voltage.nitrobenzene.title}"
-			x: -3.0d
-			y: 5.0d
+			x: -3.5d
+			y: 6.0d
 		}
 		{
 			dependencies: ["7CC79617A4965F25"]
@@ -653,7 +661,7 @@
 			]
 			title: "{quests.high_voltage.lcr.title}"
 			x: 0.0d
-			y: 6.0d
+			y: 7.0d
 		}
 		{
 			description: [
@@ -777,8 +785,8 @@
 				}
 			]
 			title: "{quests.high_voltage.nitric_acid.title}"
-			x: -1.5d
-			y: 6.0d
+			x: -2.0d
+			y: 7.0d
 		}
 		{
 			dependencies: ["5BACED5AE350EAB1"]
@@ -803,8 +811,8 @@
 				}
 			]
 			title: "{quests.high_voltage.cetane_diesel.title}"
-			x: -3.0d
-			y: 7.0d
+			x: -3.5d
+			y: 8.0d
 		}
 		{
 			dependencies: ["16B735F9C391D260"]
@@ -902,14 +910,13 @@
 				}
 			]
 			title: "{quests.high_voltage.ammonia.title}"
-			x: -1.5d
+			x: -2.0d
 			y: 4.5d
 		}
 		{
 			dependencies: ["52AD30F04DD5A812"]
 			dependency_requirement: "all_started"
 			description: ["{quests.high_voltage.hv_mixer.desc}"]
-			icon: "gtceu:hv_mixer"
 			id: "05ABC370D7153350"
 			subtitle: "{quests.high_voltage.hv_mixer.subtitle}"
 			tasks: [{
@@ -921,6 +928,7 @@
 						"ftbfiltersystem:filter": "or(item(gtceu:hv_mixer)item(greate:stainless_steel_mechanical_mixer))"
 					}
 				}
+				title: "{quests.tasktype.item.any}"
 				type: "item"
 			}]
 			title: "{quests.high_voltage.hv_mixer.title}"
@@ -940,8 +948,8 @@
 				type: "item"
 			}]
 			title: "{quests.high_voltage.blue_alloy.title}"
-			x: 0.0d
-			y: -9.0d
+			x: 1.0d
+			y: -7.5d
 		}
 		{
 			dependencies: [
@@ -952,8 +960,8 @@
 			description: ["{quests.high_voltage.ev_circuits.desc}"]
 			icon: "gtceu:micro_processor_computer"
 			id: "6A451F43F3D7A671"
-			shape: "square"
-			size: 1.0d
+			shape: "octagon"
+			size: 1.5d
 			subtitle: "{quests.high_voltage.ev_circuits.subtitle}"
 			tasks: [{
 				id: "01FE6BC2780D623B"
@@ -962,7 +970,7 @@
 			}]
 			title: "{quests.high_voltage.ev_circuits.title}"
 			x: 0.0d
-			y: -7.5d
+			y: -8.5d
 		}
 		{
 			description: [
@@ -997,7 +1005,7 @@
 			}]
 			title: "{quests.high_voltage.nichrome.title}"
 			x: -5.0d
-			y: -10.0d
+			y: -11.0d
 		}
 		{
 			dependencies: [
@@ -1006,19 +1014,28 @@
 				"4AD686D18247315E"
 				"72BD27FEEB34C7B0"
 			]
+			dependency_requirement: "one_completed"
 			description: ["{quests.high_voltage.rocket_t1.desc}"]
+			icon: {
+				Count: 1
+				id: "ad_astra:tier_1_rocket"
+				tag: { }
+			}
 			icon_scale: 2.0d
 			id: "3FBDC8552F7D8008"
 			shape: "none"
 			size: 2.0d
 			subtitle: "{quests.high_voltage.rocket_t1.subtitle}"
 			tasks: [{
-				id: "76D1CE96C52F9963"
+				id: "6F40128FAA409B16"
 				item: {
 					Count: 1
-					id: "ad_astra:tier_1_rocket"
-					tag: { }
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "or(item(ad_astra:tier_1_rocket)item(tfg:tier_1_double_rocket))"
+					}
 				}
+				title: "{quests.high_voltage.rocket_t1.task}"
 				type: "item"
 			}]
 			title: "{quests.high_voltage.rocket_t1.title}"
@@ -1265,8 +1282,8 @@
 				type: "checkmark"
 			}]
 			title: "{quests.high_voltage.linked_quest_energy.title}"
-			x: -4.5d
-			y: 6.0d
+			x: -5.0d
+			y: 7.0d
 		}
 		{
 			description: ["{quests.high_voltage.kaolinite_powder.desc}"]
@@ -1373,7 +1390,7 @@
 				type: "checkmark"
 			}]
 			title: "{quests.high_voltage.space_survival.title}"
-			x: 13.0d
+			x: 12.0d
 			y: 1.5d
 		}
 		{
@@ -1668,8 +1685,47 @@
 				type: "item"
 			}]
 			title: "{quests.gregtech_energy.reformate_gas.title}"
+			x: -1.5d
+			y: -13.0d
+		}
+		{
+			dependencies: ["6A451F43F3D7A671"]
+			description: [
+				"{quests.high_voltage.pisciculture.desc.1}"
+				""
+				"{image:tfg:textures/quests/pisciculture_fishery.png width:100 height:100 align:center}"
+				"{@pagebreak}"
+				"{quests.high_voltage.pisciculture.desc.2}"
+			]
+			icon: "tfc:bucket/tropical_fish"
+			id: "04ADA3B900F182A0"
+			optional: true
+			shape: "heart"
+			size: 1.5d
+			subtitle: "{quests.high_voltage.pisciculture.subtitle}"
+			tasks: [{
+				id: "63DC421339C9BB42"
+				item: "tfg:pisciculture_fishery"
+				type: "item"
+			}]
+			title: "{quests.high_voltage.pisciculture.title}"
+			x: -2.25d
+			y: -11.0d
+		}
+		{
+			dependencies: ["41D32C5178760F47"]
+			description: ["{quests.high_voltage.multi_structure_terminal.desc}"]
+			id: "3FC6D346B3EE4A92"
+			optional: true
+			shape: "heart"
+			subtitle: "{quests.high_voltage.multi_structure_terminal.subtitle}"
+			tasks: [{
+				id: "32C53F040A2F0AD8"
+				item: "gtceuterminal:multi_structure_manager"
+				type: "item"
+			}]
 			x: 5.0d
-			y: -10.0d
+			y: 1.0d
 		}
 	]
 	subtitle: ["{quests.high_voltage.subtitle}"]

config/ftbquests/quests/chapters/mars.snbt

@@ -153,7 +153,7 @@
 				type: "item"
 			}]
 			title: "{quests.space_survival.heavy_ammoniacal_water.title}"
-			x: 15.0d
+			x: 15.5d
 			y: -4.0d
 		}
 		{
@@ -174,7 +174,7 @@
 		{
 			dependencies: ["5AC5AAB9B3758E30"]
 			description: ["{quests.space_survival.soarer.desc}"]
-			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 20"
+			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 21"
 			icon: "wan_ancient_beasts:soarer_egg"
 			id: "2F711C064635EF2D"
 			optional: true
@@ -289,7 +289,7 @@
 			}]
 			title: "{quests.space_survival.mars_crops.title}"
 			x: 13.5d
-			y: -1.5d
+			y: -2.0d
 		}
 		{
 			dependencies: ["0967CE7F5DFF5CF6"]
@@ -460,7 +460,7 @@
 			]
 			title: "{quests.space_survival.bulbkin_pie.title}"
 			x: 13.5d
-			y: 0.0d
+			y: -0.5d
 		}
 		{
 			dependencies: ["155F421FC2F39C3C"]
@@ -479,7 +479,7 @@
 		{
 			dependencies: ["5AC5AAB9B3758E30"]
 			description: ["{quests.space_survival.surfer.desc}"]
-			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 17"
+			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 20"
 			id: "43EBECA48E341C47"
 			optional: true
 			shape: "heart"
@@ -578,6 +578,65 @@
 			x: 12.0d
 			y: -6.5d
 		}
+		{
+			dependencies: ["5AC5AAB9B3758E30"]
+			description: ["{quests.space_survival.charger.desc}"]
+			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 19"
+			icon: "wan_ancient_beasts:charger_egg"
+			id: "148C2DA8FB1D6DB1"
+			optional: true
+			shape: "heart"
+			subtitle: "{quests.space_survival.charger.subtitle}"
+			tasks: [
+				{
+					icon: "wan_ancient_beasts:charger_egg"
+					id: "78EBECCA1C40A3BD"
+					observe_type: 5
+					timer: 0L
+					title: "{quests.space_survival.charger.task}"
+					to_observe: "wan_ancient_beasts:charger"
+					type: "observation"
+				}
+				{
+					id: "33ADD26F6AA89CA7"
+					item: {
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(wan_ancient_beasts:charger_armors)"
+						}
+					}
+					optional_task: true
+					title: "Any #wan_ancient_beasts:charger_armors"
+					type: "item"
+				}
+			]
+			title: "{quests.space_survival.charger.title}"
+			x: 9.0d
+			y: -4.0d
+		}
+		{
+			dependencies: ["5AC5AAB9B3758E30"]
+			description: ["{quests.space_survival.snatcher.desc}"]
+			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 17"
+			icon: "wan_ancient_beasts:snatcher_egg"
+			id: "02A7FD58F462320F"
+			optional: true
+			shape: "heart"
+			subtitle: "{quests.space_survival.snatcher.subtitle}"
+			tasks: [{
+				icon: "wan_ancient_beasts:snatcher_egg"
+				id: "4AC531B94CBA93CE"
+				observe_type: 5
+				timer: 0L
+				title: "{quests.space_survival.snatchertask}"
+				to_observe: "wan_ancient_beasts:snatcher"
+				type: "observation"
+			}]
+			title: "{quests.space_survival.snatcher.title}"
+			x: 9.0d
+			y: -3.0d
+		}
 	]
 	subtitle: ["{quests.mars.subtitle}"]
 	title: "{quests.mars}"

config/ftbquests/quests/chapters/moon.snbt

@@ -326,29 +326,14 @@
 			subtitle: "{quests.space_survival.stone_dust_centrifuging.subtitle}"
 			tasks: [
 				{
-					id: "72B3F8FE3EA395BE"
-					item: {
-						Count: 1
-						id: "ftbfiltersystem:smart_filter"
-						tag: {
-							"ftbfiltersystem:filter": "or(item(tfg:moon_stone_dust)item(tfg:glacio_stone_dust)item(tfg:moon_deepslate_dust))"
-						}
-					}
-					title: "{quests.space_survival.stone_dust_centrifuging.task}"
+					id: "63474F1F74F04C68"
+					item: "gtceu:helium_3_bucket"
+					optional_task: true
 					type: "item"
 				}
 				{
-					disable_toast: true
-					id: "3B3532D745548B3D"
-					item: {
-						Count: 1
-						id: "ftbfiltersystem:smart_filter"
-						tag: {
-							"ftbfiltersystem:filter": "or(item(gtceu:lv_centrifuge)item(gtceu:mv_centrifuge)item(gtceu:hv_centrifuge)item(gtceu:ev_centrifuge)item(gtceu:iv_centrifuge)item(gtceu:luv_centrifuge)item(gtceu:zpm_centrifuge)item(gtceu:uv_centrifuge))"
-						}
-					}
-					title: "{quests.ore_proc.centrifuge_sifter.task}"
-					type: "item"
+					id: "4905C812B8FB0185"
+					type: "checkmark"
 				}
 			]
 			title: "{quests.space_survival.stone_dust_centrifuging.title}"
@@ -377,6 +362,8 @@
 			dependencies: ["493D733A5438DD7E"]
 			description: ["{quests.space_survival.zip_gun.desc}"]
 			id: "3F68A259FA38D342"
+			optional: true
+			shape: "heart"
 			subtitle: "{quests.space_survival.zip_gun.subtitle}"
 			tasks: [{
 				id: "56DD17ED9D60A1BD"
@@ -493,14 +480,15 @@
 				"33374462FF07BC75"
 			]
 			dependency_requirement: "one_completed"
-			description: ["&6For each travel you will need Rocket Fuel&r, it seems complicated and it is quite a long process but you can make Rocket Fuel from &bChlorine&r, &bMethane&r, &bNitrogen&r, &bOxygen&r and &bWater&r. Nothing too bad, also if you already have your &5Large Chemical Reactor&r you could unlock some bypass.\\n\\n&7We advise you to use EMI Recipe Tree to have an easier time understanding each step. Simply click on the small icon with 4 squares on the right of the crafting recipe.&r"]
+			description: ["{quests.high_voltage.rocket_fuel.desc}"]
 			id: "0B80972F50E08B8D"
-			subtitle: "Easier than you think"
+			subtitle: "{quests.high_voltage.rocket_fuel.subtitle}"
 			tasks: [{
 				id: "5FBF567FFC837BFA"
 				item: "gtceu:rocket_fuel_bucket"
 				type: "item"
 			}]
+			title: "{quests.high_voltage.rocket_fuel.title}"
 			x: -7.0d
 			y: -5.5d
 		}
@@ -617,6 +605,7 @@
 			description: ["{quests.space_survival.redstone_railgun.desc}"]
 			icon: "minecraft:redstone_torch"
 			id: "0538DCD4D4811574"
+			shape: "circle"
 			subtitle: "{quests.space_survival.redstone_railgun.subtitle}"
 			tasks: [{
 				id: "63FFA0CBDDD635B9"
@@ -632,6 +621,7 @@
 			description: ["{quests.space_survival.robot_arm_railgun.desc}"]
 			icon: "gtceu:hv_robot_arm"
 			id: "7118634C06AE1141"
+			shape: "circle"
 			subtitle: "{quests.space_survival.robot_arm_railgun.subtitle}"
 			tasks: [{
 				id: "6C995E2B46963E1E"
@@ -677,6 +667,7 @@
 			description: ["{quests.space_survival.delay_railgun.desc}"]
 			icon: "create:cuckoo_clock"
 			id: "183AC1085D558086"
+			shape: "circle"
 			subtitle: "{quests.space_survival.delay_railgun.subtitle}"
 			tasks: [{
 				id: "119FD14202435E03"

config/ftbquests/quests/chapters/mv__medium_voltage.snbt

@@ -1283,28 +1283,6 @@
 			x: 6.0d
 			y: 8.0d
 		}
-		{
-			dependencies: ["45769156F4253C86"]
-			dependency_requirement: "one_completed"
-			description: ["{quests.medium_voltage.mv_jetpack.desc}"]
-			id: "6FA956DAA72D6139"
-			optional: true
-			shape: "heart"
-			size: 1.0d
-			subtitle: "{quests.medium_voltage.mv_jetpack.subtitle}"
-			tasks: [{
-				id: "022324F9630960C6"
-				item: {
-					Count: 1
-					id: "gtceu:liquid_fuel_jetpack"
-					tag: { }
-				}
-				type: "item"
-			}]
-			title: "{quests.medium_voltage.mv_jetpack.title}"
-			x: -5.0d
-			y: 5.0d
-		}
 		{
 			dependencies: ["75F38905DEA60F15"]
 			dependency_requirement: "one_completed"
@@ -1325,7 +1303,7 @@
 			}]
 			title: "{quests.medium_voltage.mv_jetpack_2.title}"
 			x: 1.5d
-			y: 5.0d
+			y: 4.5d
 		}
 		{
 			dependencies: [
@@ -1700,6 +1678,21 @@
 			x: -5.0d
 			y: 4.0d
 		}
+		{
+			dependencies: ["75F38905DEA60F15"]
+			description: ["{quests.medium_voltage.terminal_dismantler.desc}"]
+			id: "0053E98892F910BF"
+			shape: "heart"
+			subtitle: "{quests.medium_voltage.terminal_dismantler.subtitle}"
+			tasks: [{
+				id: "6AE4D07F675A23D0"
+				item: "gtceuterminal:dismantler"
+				type: "item"
+			}]
+			title: "{quests.medium_voltage.terminal_dismantler.title}"
+			x: 1.5d
+			y: 5.5d
+		}
 	]
 	subtitle: ["{quests.medium_voltage.subtitle}"]
 	title: "{quests.medium_voltage}"

config/ftbquests/quests/chapters/ore_processing.snbt

@@ -175,12 +175,6 @@
 			x: -5.5d
 			y: -13.0d
 		}
-		{
-			id: "138C7D4A61E2A77D"
-			linked_quest: "6B10099F3F0931B9"
-			x: 9.0d
-			y: -15.0d
-		}
 		{
 			id: "21670DA706D747EC"
 			linked_quest: "378F0AFCF95354B2"
@@ -1336,12 +1330,12 @@
 			id: "12C0BC3514FCEF96"
 			subtitle: "{quests.ore_proc.gem_slurry.subtitle}"
 			tasks: [{
-				id: "57587D74BD9DA754"
+				id: "730EA57B64DE54C0"
 				item: {
 					Count: 1
 					id: "ftbfiltersystem:smart_filter"
 					tag: {
-						"ftbfiltersystem:filter": "or(item(gtceu:crushed_ruby_ore)item(gtceu:crushed_sapphire_ore)item(gtceu:crushed_green_sapphire_ore))"
+						"ftbfiltersystem:filter": "or(item(gtceu:crushed_ruby_ore)item(gtceu:crushed_sapphire_ore)item(gtceu:crushed_green_sapphire_ore)item(gtceu:purified_ruby_ore)item(gtceu:purified_sapphire_ore)item(gtceu:purified_green_sapphire_ore))"
 					}
 				}
 				title: "{quests.ore_proc.gem_slurry.task}"

config/ftbquests/quests/chapters/questsmetallurgy.snbt

@@ -51,7 +51,7 @@
 			id: "19CF6D922179DFF9"
 			linked_quest: "11C45DBB20ED7647"
 			shape: "heart"
-			x: 9.0d
+			x: 8.5d
 			y: -34.0d
 		}
 		{
@@ -60,6 +60,12 @@
 			x: 18.5d
 			y: -28.0d
 		}
+		{
+			id: "5B4E347985A66970"
+			linked_quest: "21C58B2541BFA2EE"
+			x: -1.5d
+			y: -32.0d
+		}
 	]
 	quests: [
 		{
@@ -415,6 +421,7 @@
 			description: ["{quests.metal_age.anvil_recycling.desc}"]
 			icon: "tfc:firepit"
 			id: "3B2550394C94CEC9"
+			shape: "circle"
 			size: 1.0d
 			subtitle: "{quests.metal_age.anvil_recycling.subtitle}"
 			tasks: [{
@@ -646,6 +653,7 @@
 				}
 			}
 			id: "5792DDAA82895E67"
+			shape: "circle"
 			subtitle: "{quests.metal_age.red_blu.subtitle}"
 			tasks: [{
 				id: "63890641DCD6659F"
@@ -719,6 +727,7 @@
 			description: ["{quests.metal_age.wrought_iron_goodies.desc}"]
 			icon: "create:chute"
 			id: "20C2CE92459BE14A"
+			shape: "circle"
 			subtitle: "{quests.metal_age.wrought_iron_goodies.subtitle}"
 			tasks: [{
 				id: "60605AA92B6947D8"
@@ -734,6 +743,7 @@
 			description: ["{quests.metal_age.fire_clay_ingredients.desc}"]
 			icon: "minecraft:cartography_table"
 			id: "5A936E9BCF30AA3D"
+			shape: "circle"
 			subtitle: "{quests.metal_age.fire_clay_ingredients.subtitle}"
 			tasks: [{
 				id: "39CA01175999A291"
@@ -816,6 +826,7 @@
 			description: ["{quests.metal_age.steel_goodies.desc}"]
 			icon: "greate:steel_mechanical_pump"
 			id: "0C9B7745D812555A"
+			shape: "circle"
 			subtitle: "{quests.metal_age.steel_goodies.subtitle}"
 			tasks: [{
 				id: "3EB7C3AE88950E4B"
@@ -1297,6 +1308,31 @@
 			x: 18.5d
 			y: -24.0d
 		}
+		{
+			dependencies: ["174DA15847665CF8"]
+			description: ["{quests.metal_age.toolbelt.desc}"]
+			icon: "toolbelt:belt"
+			id: "1DEC710C3570D5D0"
+			optional: true
+			shape: "heart"
+			subtitle: "{quests.metal_age.toolbelt.subtitle}"
+			tasks: [
+				{
+					id: "0233F2A323C9FF6F"
+					item: "toolbelt:belt"
+					type: "item"
+				}
+				{
+					id: "09A674FE4BA67280"
+					item: "toolbelt:pouch"
+					optional_task: true
+					type: "item"
+				}
+			]
+			title: "{quests.metal_age.toolbelt.title}"
+			x: 9.5d
+			y: -34.0d
+		}
 	]
 	subtitle: ["{quests.metal_age.subtitle}"]
 	title: "{quests.metal_age}"

config/ftbquests/quests/chapters/questssteam_age.snbt

@@ -19,20 +19,22 @@
 		{
 			id: "39027CF4DC307D33"
 			linked_quest: "5E186CD5E83BFDF0"
-			x: -28.5d
+			x: -27.0d
 			y: 2.0d
 		}
 		{
 			id: "0CE64B9914191C56"
 			linked_quest: "6FFD4990FF07078A"
 			shape: "diamond"
-			x: -9.5d
+			x: -9.0d
 			y: 11.5d
 		}
 		{
 			id: "23A27702FF816291"
 			linked_quest: "6903C72A254A7B08"
-			x: -12.5d
+			shape: "octagon"
+			size: 2.0d
+			x: -11.5d
 			y: 8.0d
 		}
 		{
@@ -40,27 +42,27 @@
 			linked_quest: "48A8E3210B2BAE1C"
 			shape: "octagon"
 			size: 2.0d
-			x: -28.5d
+			x: -27.0d
 			y: 0.0d
 		}
 		{
 			id: "7C03FE015586C652"
 			linked_quest: "55213ACBF5F5D398"
 			shape: "heart"
-			x: -12.0d
+			x: -10.5d
 			y: 16.0d
 		}
 		{
 			id: "65E0B13E245D2E5F"
 			linked_quest: "379F434116632A89"
-			x: -26.0d
+			x: -24.5d
 			y: 1.0d
 		}
 		{
 			id: "68F5E521F2DB0A86"
 			linked_quest: "0404FBCC34011053"
 			shape: "heart"
-			x: -13.0d
+			x: -11.5d
 			y: 16.0d
 		}
 		{
@@ -77,6 +79,14 @@
 			x: -22.5d
 			y: 4.0d
 		}
+		{
+			id: "6C8C3BBD2BA9853B"
+			linked_quest: "56CA2EB7812529C5"
+			shape: "gear"
+			size: 1.5d
+			x: -13.0d
+			y: 13.5d
+		}
 	]
 	quests: [
 		{
@@ -84,7 +94,11 @@
 				"7B045998769930F0"
 				"55FDF06AC0C01D0B"
 			]
-			description: ["{quests.steam_age.basic_millstone.desc}"]
+			description: [
+				"{quests.steam_age.basic_millstone.desc.1}"
+				"{@pagebreak}"
+				"{quests.steam_age.basic_millstone.desc.2}"
+			]
 			id: "48C1E980F7D64317"
 			size: 1.0d
 			subtitle: "{quests.steam_age.basic_millstone.subtitle}"
@@ -94,7 +108,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.basic_millstone.title}"
-			x: -20.5d
+			x: -19.0d
 			y: 0.0d
 		}
 		{
@@ -112,7 +126,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.horse_crank.title}"
-			x: -24.5d
+			x: -23.0d
 			y: -2.0d
 		}
 		{
@@ -131,7 +145,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.helve_hammer.title}"
-			x: -20.5d
+			x: -19.0d
 			y: -4.0d
 		}
 		{
@@ -159,7 +173,7 @@
 				}
 			]
 			title: "{quests.steam_age.basic_greate.title}"
-			x: -20.5d
+			x: -19.0d
 			y: -2.0d
 		}
 		{
@@ -173,7 +187,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.water_wheel.title}"
-			x: -14.5d
+			x: -13.0d
 			y: 0.0d
 		}
 		{
@@ -195,7 +209,7 @@
 				}
 			]
 			title: "{quests.steam_age.windmill.title}"
-			x: -14.5d
+			x: -13.0d
 			y: -4.0d
 		}
 		{
@@ -210,7 +224,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.metal_casing.title}"
-			x: -9.5d
+			x: -8.0d
 			y: -2.0d
 		}
 		{
@@ -227,7 +241,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.steel_encased_fan.title}"
-			x: -5.5d
+			x: -4.0d
 			y: 4.0d
 		}
 		{
@@ -247,7 +261,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.steel_pump.title}"
-			x: -3.5d
+			x: -2.0d
 			y: 2.0d
 		}
 		{
@@ -297,7 +311,7 @@
 				}
 			]
 			title: "{quests.steam_age.steam_engine.title}"
-			x: -5.5d
+			x: -4.0d
 			y: -2.0d
 		}
 		{
@@ -316,7 +330,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.mechanical_saw.title}"
-			x: -9.5d
+			x: -8.0d
 			y: 0.0d
 		}
 		{
@@ -330,7 +344,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.mechanical_harvester.title}"
-			x: -9.5d
+			x: -8.0d
 			y: -4.0d
 		}
 		{
@@ -358,7 +372,7 @@
 				}
 			]
 			title: "{quests.steam_age.chute.title}"
-			x: -12.0d
+			x: -10.5d
 			y: 0.0d
 		}
 		{
@@ -376,7 +390,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.mold_table.title}"
-			x: -3.5d
+			x: -2.0d
 			y: 4.0d
 		}
 		{
@@ -406,7 +420,7 @@
 				}
 			]
 			title: "{quests.steam_age.steel_greate.title}"
-			x: -5.5d
+			x: -4.0d
 			y: 2.0d
 		}
 		{
@@ -424,7 +438,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.steel_millstone.title}"
-			x: -7.5d
+			x: -6.0d
 			y: 2.0d
 		}
 		{
@@ -461,11 +475,13 @@
 				{
 					id: "72112F5EC062766C"
 					item: "gtceu:treated_wood_dust"
+					optional_task: true
 					type: "item"
 				}
 				{
 					id: "0D95727196D033B5"
 					item: "gtceu:treated_wood_plate"
+					optional_task: true
 					type: "item"
 				}
 				{
@@ -523,8 +539,8 @@
 				}
 			]
 			title: "{quests.steam_age.miner.title}"
-			x: -10.0d
-			y: 17.0d
+			x: -9.0d
+			y: 18.0d
 		}
 		{
 			dependencies: [
@@ -622,21 +638,25 @@
 				}
 				{
 					count: 3L
+					disable_toast: true
 					id: "019C4D427A06DF0E"
-					item: { Count: 3, id: "gtceu:bronze_firebox_casing" }
+					item: "gtceu:bronze_firebox_casing"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "402700D6CCD2BEF1"
 					item: "gtceu:steam_input_hatch"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "7B99996072C53AD9"
 					item: "gtceu:steam_input_bus"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "6E4B41FDD286E184"
 					item: "gtceu:steam_output_bus"
 					type: "item"
@@ -677,7 +697,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.item_pipes.title}"
-			x: -12.0d
+			x: -10.5d
 			y: 2.0d
 		}
 		{
@@ -691,14 +711,21 @@
 			shape: "square"
 			size: 1.0d
 			subtitle: "{quests.steam_age.circuit_boards.subtitle}"
-			tasks: [{
-				id: "2B8B038789480789"
-				item: "gtceu:resin_printed_circuit_board"
-				type: "item"
-			}]
+			tasks: [
+				{
+					id: "2B8B038789480789"
+					item: "gtceu:resin_printed_circuit_board"
+					type: "item"
+				}
+				{
+					id: "171A20DD9F208437"
+					item: "tfg:artisan_table"
+					type: "item"
+				}
+			]
 			title: "{quests.steam_age.circuit_boards.title}"
-			x: -9.5d
-			y: 10.5d
+			x: -9.0d
+			y: 10.0d
 		}
 		{
 			dependencies: ["46FA9DD4755A5548"]
@@ -766,8 +793,8 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.vacuum_tubes.title}"
-			x: -8.0d
-			y: 14.0d
+			x: -7.0d
+			y: 15.0d
 		}
 		{
 			dependencies: ["7DB7AB5349218605"]
@@ -817,7 +844,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.resistors.title}"
-			x: -5.0d
+			x: -4.0d
 			y: 11.5d
 		}
 		{
@@ -833,8 +860,8 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.coiling_machine.title}"
-			x: -5.0d
-			y: 16.0d
+			x: -4.0d
+			y: 17.0d
 		}
 		{
 			dependencies: ["2C35D4E01AEC02AA"]
@@ -849,8 +876,8 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.steel_mixer.title}"
-			x: -5.0d
-			y: 14.5d
+			x: -4.0d
+			y: 15.5d
 		}
 		{
 			dependencies: ["2C35D4E01AEC02AA"]
@@ -864,8 +891,8 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.lathe.title}"
-			x: -6.0d
-			y: 17.0d
+			x: -5.0d
+			y: 18.0d
 		}
 		{
 			dependencies: [
@@ -902,8 +929,8 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.vibrating_table.title}"
-			x: -8.0d
-			y: 17.0d
+			x: -7.0d
+			y: 18.0d
 		}
 		{
 			dependencies: ["2C35D4E01AEC02AA"]
@@ -922,8 +949,8 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.rolling_mill.title}"
-			x: -5.0d
-			y: 13.0d
+			x: -4.0d
+			y: 14.0d
 		}
 		{
 			dependencies: ["2C35D4E01AEC02AA"]
@@ -937,8 +964,8 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.steel_saw.title}"
-			x: -7.0d
-			y: 17.0d
+			x: -6.0d
+			y: 18.0d
 		}
 		{
 			dependencies: ["2C35D4E01AEC02AA"]
@@ -952,8 +979,8 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.curving_press.title}"
-			x: -9.0d
-			y: 17.0d
+			x: -8.0d
+			y: 18.0d
 		}
 		{
 			dependencies: [
@@ -992,28 +1019,33 @@
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "4EE63FDD07EC0467"
 					item: "gtceu:steam_input_hatch"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "0C9D5C87DEC212D2"
 					item: "gtceu:steam_input_bus"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "60828361A38F4E1E"
 					item: "gtceu:steam_output_bus"
 					type: "item"
 				}
 				{
 					count: 8L
+					disable_toast: true
 					id: "10EC49FF899232F6"
 					item: "gtceu:steam_machine_casing"
 					type: "item"
 				}
 				{
 					count: 8L
+					disable_toast: true
 					id: "27DDD13BE482E8A3"
 					item: "gtceu:bronze_firebox_casing"
 					type: "item"
@@ -1108,7 +1140,7 @@
 				}
 			]
 			title: "{quests.steam_age.fluid_pipes.title}"
-			x: -3.5d
+			x: -2.0d
 			y: 0.0d
 		}
 		{
@@ -1134,7 +1166,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.fluid_drums.title}"
-			x: -1.5d
+			x: 0.0d
 			y: 2.0d
 		}
 		{
@@ -1163,8 +1195,8 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.potin.title}"
-			x: -3.5d
-			y: 14.5d
+			x: -2.5d
+			y: 15.5d
 		}
 		{
 			dependencies: ["6F1BC99BE641B671"]
@@ -1191,7 +1223,7 @@
 				}
 			]
 			title: "{quests.steam_age.create_tools.title}"
-			x: -22.5d
+			x: -21.0d
 			y: -4.0d
 		}
 		{
@@ -1224,7 +1256,10 @@
 			y: 16.0d
 		}
 		{
-			dependencies: ["6AA07588374B59AB"]
+			dependencies: [
+				"6AA07588374B59AB"
+				"56CA2EB7812529C5"
+			]
 			description: ["{quests.steam_age.vacuum_chamber.desc}"]
 			id: "5F3063C539C9CBBF"
 			subtitle: "{quests.steam_age.vacuum_chamber.subtitle}"
@@ -1234,7 +1269,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.vacuum_chamber.title}"
-			x: -12.5d
+			x: -11.5d
 			y: 15.0d
 		}
 		{
@@ -1305,7 +1340,7 @@
 				}
 			]
 			title: "{quests.steam_age.poor_paths.title}"
-			x: -26.0d
+			x: -24.5d
 			y: -3.5d
 		}
 		{
@@ -1357,7 +1392,7 @@
 				}
 			]
 			title: "{quests.steam_age.normal_paths.title}"
-			x: -26.5d
+			x: -25.0d
 			y: -2.0d
 		}
 		{
@@ -1415,7 +1450,7 @@
 				}
 			]
 			title: "{quests.steam_age.good_paths.title}"
-			x: -26.0d
+			x: -24.5d
 			y: -0.5d
 		}
 		{
@@ -1437,7 +1472,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.lv_circuit.title}"
-			x: -8.0d
+			x: -7.0d
 			y: 8.0d
 		}
 		{
@@ -1452,7 +1487,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.paper.title}"
-			x: -3.5d
+			x: -2.5d
 			y: 11.5d
 		}
 		{
@@ -1475,7 +1510,7 @@
 				type: "item"
 			}]
 			title: "{quests.metal_age.bronze_goodies.title}"
-			x: -22.5d
+			x: -21.0d
 			y: -2.0d
 		}
 		{
@@ -1499,7 +1534,7 @@
 				type: "item"
 			}]
 			title: "{quests.metal_age.wrought_iron_goodies.title}"
-			x: -12.0d
+			x: -10.5d
 			y: -2.0d
 		}
 		{
@@ -1523,7 +1558,7 @@
 				type: "item"
 			}]
 			title: "{quests.metal_age.steel_goodies.title}"
-			x: -5.5d
+			x: -4.0d
 			y: 0.0d
 		}
 		{
@@ -1565,21 +1600,25 @@
 				}
 				{
 					count: 22L
+					disable_toast: true
 					id: "71D6716A2B985592"
-					item: { Count: 22, id: "gtceu:steam_machine_casing" }
+					item: "gtceu:steam_machine_casing"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "26D9013B4161E463"
 					item: "gtceu:steam_input_hatch"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "7D354B529103D126"
 					item: "gtceu:steam_input_bus"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "63B935735E346133"
 					item: "gtceu:steam_output_bus"
 					type: "item"
@@ -1601,7 +1640,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.rotation_speed_controller.title}"
-			x: -7.5d
+			x: -6.0d
 			y: 0.0d
 		}
 		{
@@ -1618,7 +1657,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.resin_boards.title}"
-			x: -11.5d
+			x: -10.5d
 			y: 11.5d
 		}
 		{
@@ -1652,7 +1691,7 @@
 				}
 			]
 			title: "{quests.metal_age.coke_oven.title}"
-			x: -14.5d
+			x: -13.0d
 			y: -2.0d
 		}
 		{
@@ -1687,7 +1726,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.basic_mech_press.title}"
-			x: -18.5d
+			x: -17.0d
 			y: -2.0d
 		}
 		{
@@ -1710,7 +1749,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.steel_mech_press.title}"
-			x: -7.5d
+			x: -6.0d
 			y: 4.0d
 		}
 		{
@@ -1725,7 +1764,7 @@
 				type: "checkmark"
 			}]
 			title: "{quests.steam_age.fuel_sources.title}"
-			x: -7.5d
+			x: -6.0d
 			y: -2.0d
 		}
 		{
@@ -1739,7 +1778,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.large_water_wheel.title}"
-			x: -3.5d
+			x: -2.0d
 			y: -2.0d
 		}
 		{
@@ -1761,8 +1800,8 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.supers.title}"
-			x: -10.5d
-			y: 13.5d
+			x: -6.0d
+			y: 13.0d
 		}
 		{
 			dependencies: ["0D0D461AE3A3F7BF"]
@@ -1791,7 +1830,7 @@
 				}
 			]
 			title: "{quests.steam_age.multiblock_tank.title}"
-			x: -16.5d
+			x: -15.0d
 			y: -2.0d
 		}
 		{
@@ -1809,36 +1848,42 @@
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "5CC7BDBF599B405A"
 					item: "gtceu:steam_input_hatch"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "4998CA4B8DDF6E02"
 					item: "gtceu:steam_input_bus"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "31A69C679FC6F99A"
 					item: "gtceu:steam_output_bus"
 					type: "item"
 				}
 				{
 					count: 12L
+					disable_toast: true
 					id: "709D4C32D2F43ABD"
 					item: "gtceu:steam_machine_casing"
 					type: "item"
 				}
 				{
 					count: 4L
+					disable_toast: true
 					id: "559F1DA9AF2EC5C3"
-					item: { Count: 4, id: "gtceu:steel_machine_casing" }
+					item: "gtceu:steel_machine_casing"
 					type: "item"
 				}
 				{
 					count: 8L
+					disable_toast: true
 					id: "769C82179FD4F75B"
-					item: { Count: 8, id: "create:metal_girder" }
+					item: "create:metal_girder"
 					type: "item"
 				}
 			]
@@ -1861,30 +1906,35 @@
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "5496E814C911D5C1"
 					item: "gtceu:steam_input_hatch"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "40181C28B6560C94"
 					item: "gtceu:steam_output_bus"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "249376D261C69933"
 					item: "gtceu:steam_input_bus"
 					type: "item"
 				}
 				{
 					count: 8L
+					disable_toast: true
 					id: "790DDB716EAE9769"
-					item: { Count: 8, id: "gtceu:steam_machine_casing" }
+					item: "gtceu:steam_machine_casing"
 					type: "item"
 				}
 				{
 					count: 8L
+					disable_toast: true
 					id: "266BA05C0A212C6C"
-					item: { Count: 8, id: "gtceu:bronze_firebox_casing" }
+					item: "gtceu:bronze_firebox_casing"
 					type: "item"
 				}
 			]
@@ -1907,36 +1957,42 @@
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "3BBEAD3334C1E3D0"
 					item: "gtceu:steam_input_hatch"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "6D8C5AA895D6DC15"
 					item: "gtceu:steam_output_bus"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "0D2DC79ED3C74B1F"
 					item: "gtceu:steam_input_bus"
 					type: "item"
 				}
 				{
 					count: 7L
+					disable_toast: true
 					id: "4BDAA78AC3C92713"
 					item: "gtceu:steam_machine_casing"
 					type: "item"
 				}
 				{
 					count: 3L
+					disable_toast: true
 					id: "4DFE7CD587BFFAB9"
-					item: { Count: 3, id: "gtceu:bronze_machine_casing" }
+					item: "gtceu:bronze_machine_casing"
 					type: "item"
 				}
 				{
 					count: 6L
+					disable_toast: true
 					id: "7C5983298F614109"
-					item: { Count: 6, id: "gtceu:steel_frame" }
+					item: "gtceu:steel_frame"
 					type: "item"
 				}
 			]

config/ftbquests/quests/chapters/questsstoneage.snbt

@@ -32,14 +32,36 @@
 		}
 	]
 	order_index: 0
-	quest_links: [{
-		id: "409385C6F6640BEA"
-		linked_quest: "427814F6E9386772"
-		shape: "gear"
-		size: 4.0d
-		x: 4.0d
-		y: 0.0d
-	}]
+	quest_links: [
+		{
+			id: "409385C6F6640BEA"
+			linked_quest: "427814F6E9386772"
+			shape: "gear"
+			size: 4.0d
+			x: 4.0d
+			y: 0.0d
+		}
+		{
+			id: "66FB69B8381F5A01"
+			linked_quest: "67F40A90844EC0FC"
+			x: 8.0d
+			y: 2.0d
+		}
+		{
+			id: "78C8274E7CA78B12"
+			linked_quest: "509C064AA92FD78F"
+			shape: "heart"
+			x: 1.0d
+			y: 16.0d
+		}
+		{
+			id: "5E38676D9AD5336C"
+			linked_quest: "21C58B2541BFA2EE"
+			shape: "heart"
+			x: -1.5d
+			y: 16.0d
+		}
+	]
 	quests: [
 		{
 			dependencies: ["427814F6E9386772"]
@@ -1507,32 +1529,6 @@
 			shape: "heart"
 			subtitle: "{quests.stone_age.meals.subtitle}"
 			tasks: [
-				{
-					id: "7D77C6BFE159FDC9"
-					item: {
-						Count: 1
-						ForgeCaps: {
-							"tfc:food": {
-								creationDate: -2L
-								foodData: {
-									dairy: 0.0f
-									decay: 0.0f
-									food: 0
-									fruit: 0.0f
-									grain: 0.0f
-									meat: 0.0f
-									sat: 0.0f
-									veg: 0.0f
-									water: 0.0f
-								}
-								ingredients: [ ]
-								traits: [ ]
-							}
-						}
-						id: "firmalife:food/cooked_pizza"
-					}
-					type: "item"
-				}
 				{
 					id: "597808680916715E"
 					item: {
@@ -1674,6 +1670,7 @@
 				}
 			}
 			id: "1562419608EB333D"
+			shape: "circle"
 			size: 1.5d
 			subtitle: "{quests.stone_age.hydration.subtitle}"
 			tasks: [{
@@ -1847,6 +1844,7 @@
 			description: ["{quests.stone_age.water_bucket.desc}"]
 			icon: "minecraft:water_bucket"
 			id: "1F9321F1743A0B79"
+			shape: "circle"
 			subtitle: "{quests.stone_age.water_bucket.subtitle}"
 			tasks: [{
 				id: "64BE95016DF461FD"
@@ -2295,6 +2293,8 @@
 				"{quests.stone_age.medical_conditions.desc.1}"
 				"{@pagebreak}"
 				"{quests.stone_age.medical_conditions.desc.2}"
+				"{@pagebreak}"
+				"{quests.stone_age.medical_conditions.desc.3}"
 			]
 			icon: "createdeco:decal_skull"
 			id: "00117AD40FACB89D"

config/ftbquests/quests/chapters/queststfc_tips.snbt

@@ -262,6 +262,7 @@
 			guide_page: "tfc:field_guide tfc:firmalife/beekeeping"
 			icon: "firmalife:beeswax"
 			id: "1071B804483BB882"
+			shape: "circle"
 			subtitle: "{quests.tfg_tips.beekeeping.subtitle}"
 			tasks: [{
 				id: "07A6195AEE51DAB7"
@@ -627,6 +628,7 @@
 			guide_page: "tfc:field_guide tfc:mechanics/decay"
 			icon: "minecraft:clock"
 			id: "4047EE998BC4CD03"
+			shape: "circle"
 			subtitle: "{quests.tfg_tips.preservation.subtitle}"
 			tasks: [{
 				id: "29CDDE027CC8B84A"
@@ -675,6 +677,7 @@
 		{
 			dependencies: ["4047EE998BC4CD03"]
 			description: ["{quests.tfg_tips.get_milk.desc}"]
+			icon: "minecraft:milk_bucket"
 			id: "3C7F170E065B60E1"
 			subtitle: "{quests.tfg_tips.get_milk.subtitle}"
 			tasks: [
@@ -684,7 +687,7 @@
 						Count: 1
 						id: "ftbfiltersystem:smart_filter"
 						tag: {
-							"ftbfiltersystem:filter": "or(only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"minecraft:milk\"}})item(minecraft:milk_bucket))only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"firmalife:yak_milk\"}})item(firmalife:bucket/yak_milk))only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"firmalife:goat_milk\"}})item(firmalife:bucket/goat_milk)))"
+							"ftbfiltersystem:filter": "or(item(minecraft:milk_bucket)item(firmalife:bucket/yak_milk)item(firmalife:bucket/goat_milk)item(tfc_gourmet:ox_milk_bucket)item(tfc_gourmet:sheep_milk_bucket)item(tfc_gourmet:alpaca_milk_bucket))"
 						}
 					}
 					optional_task: true
@@ -827,6 +830,7 @@
 			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.tfg_tips.brine_something.desc}"]
+			icon: "tfc:bucket/brine"
 			id: "71393B553550EA42"
 			subtitle: "{quests.tfg_tips.brine_something.subtitle}"
 			tasks: [
@@ -890,6 +894,7 @@
 			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.tfg_tips.pickle_something.desc}"]
+			icon: "tfc:bucket/vinegar"
 			id: "060C84862C9BB9CE"
 			subtitle: "{quests.tfg_tips.pickle_something.subtitle}"
 			tasks: [
@@ -950,6 +955,7 @@
 			dependencies: ["52D944ADA884EFEF"]
 			description: ["{quests.tfg_tips.dry_fruit.desc}"]
 			guide_page: "tfc:field_guide tfc:firmalife/drying"
+			icon: "firmalife:drying_mat"
 			id: "4417A395801DC4E5"
 			subtitle: "{quests.tfg_tips.dry_fruit.subtitle}"
 			tasks: [
@@ -995,6 +1001,7 @@
 		{
 			dependencies: ["52290DFBF39F0D07"]
 			description: ["{quests.tfg_tips.salt_meat.desc}"]
+			icon: "tfc:powder/salt"
 			id: "01CB939598271EC4"
 			subtitle: "{quests.tfg_tips.salt_meat.subtitle}"
 			tasks: [
@@ -1042,6 +1049,7 @@
 			dependency_requirement: "one_completed"
 			description: ["{quests.tfg_tips.smoke_meat.desc}"]
 			guide_page: "tfc:field_guide tfc:firmalife/smoking"
+			icon: "tfc:wool_yarn"
 			id: "1FC019B45383695E"
 			subtitle: "{quests.tfg_tips.smoke_meat.subtitle}"
 			tasks: [
@@ -1091,6 +1099,7 @@
 			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.tfg_tips.cook_meat.desc}"]
+			icon: "firmalife:cured_oven_top"
 			id: "5335969963D0A6CC"
 			subtitle: "{quests.tfg_tips.cook_meat.subtitle}"
 			tasks: [
@@ -1174,6 +1183,16 @@
 		{
 			dependencies: ["0FCB88A64D3FBF0F"]
 			description: ["{quests.tfg_tips.smoke_cheese.desc}"]
+			icon: {
+				Count: 1
+				ForgeCaps: {
+					"tfc:food": {
+						creationDate: -9223372036854775808L
+						traits: [ ]
+					}
+				}
+				id: "ad_astra:cheese"
+			}
 			id: "6FF80B0E333D2F14"
 			subtitle: "{quests.tfg_tips.smoke_cheese.subtitle}"
 			tasks: [
@@ -1214,10 +1233,15 @@
 		}
 		{
 			dependencies: ["2EFB241490502DB3"]
-			description: ["{quests.tfg_tips.greenhouse.desc}"]
+			description: [
+				"{quests.tfg_tips.greenhouse.desc}"
+				"\\n"
+				"{image:tfg:textures/quests/firmalife_greenhouse.png width:250 height:150 align:center}"
+			]
 			guide_page: "tfc:field_guide tfc:firmalife/greenhouse"
 			icon: "firmalife:large_planter"
 			id: "07FBA022050DA24A"
+			shape: "circle"
 			subtitle: "{quests.tfg_tips.greenhouse.subtitle}"
 			tasks: [{
 				id: "63D7E5FDBE2B66D5"
@@ -1567,6 +1591,7 @@
 				}
 			}
 			id: "28333A7852497C4D"
+			shape: "circle"
 			subtitle: "{quests.tfg_tips.status_effects.subtitle}"
 			tasks: [{
 				id: "1F96808948B568A2"
@@ -1736,7 +1761,9 @@
 		{
 			dependencies: ["4AA0EBFBA5D8788C"]
 			description: ["{quests.tfg_tips.beneath_prep.desc}"]
+			icon: "create:clipboard"
 			id: "4A8910950F638BB5"
+			shape: "circle"
 			subtitle: "{quests.tfg_tips.beneath_prep.subtitle}"
 			tasks: [{
 				id: "2E029DE0398319F2"
@@ -1838,6 +1865,7 @@
 				}
 			}
 			id: "098739E441CF565D"
+			shape: "circle"
 			subtitle: "{quests.tfg_tips.beneath_clothes.subtitle}"
 			tasks: [{
 				id: "70EF47E8FD504806"
@@ -1851,7 +1879,7 @@
 		{
 			dependencies: ["4A8910950F638BB5"]
 			description: ["{quests.tfg_tips.juicer.desc}"]
-			guide_page: "tfc:field_guide tfc:beneath:water"
+			guide_page: "tfc:field_guide tfc:beneath/water"
 			id: "3D845616A2F7083F"
 			subtitle: "{quests.tfg_tips.juicer.subtitle}"
 			tasks: [{
@@ -1866,7 +1894,9 @@
 		{
 			dependencies: ["70DA01DFDAE54224"]
 			description: ["{quests.tfg_tips.fuck_go_back.desc}"]
+			icon: "minecraft:ladder"
 			id: "4FD6D93811DADCE4"
+			shape: "circle"
 			subtitle: "{quests.tfg_tips.fuck_go_back.subtitle}"
 			tasks: [{
 				id: "6D482B9189A97E0F"
@@ -2137,6 +2167,96 @@
 			x: 0.0d
 			y: -10.5d
 		}
+		{
+			dependencies: [
+				"30DD0DDF86C96926"
+				"1F41C35890E2C44F"
+			]
+			dependency_requirement: "one_completed"
+			description: ["{quests.tfg_tips.food_automation.desc}"]
+			icon: "tfg:lv_food_oven"
+			id: "46111F4D970EE3C5"
+			optional: true
+			subtitle: "{quests.tfg_tips.food_automation.subtitle}"
+			tasks: [
+				{
+					id: "770BC20A8062A6BD"
+					item: "tfg:lv_food_processor"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "3EB084CA435F8C19"
+					item: "tfg:lv_food_oven"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "150B81D83DFFB9A1"
+					item: "gtceu:lv_robot_arm"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "2332EB45D64DB9FB"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.tfg_tips.food_automation.title}"
+			x: 0.0d
+			y: -12.0d
+		}
+		{
+			dependencies: ["2EFB241490502DB3"]
+			description: ["{quests.tfg_tips.composter.desc}"]
+			guide_page: "tfc:field_guide tfc:mechanics/composter"
+			id: "264D138DFFE13BD0"
+			subtitle: "{quests.tfg_tips.composter.subtitle}"
+			tasks: [{
+				id: "2EE61FD71FE330D3"
+				item: "tfc:composter"
+				type: "item"
+			}]
+			title: "{quests.tfg_tips.composter.title}"
+			x: 2.0d
+			y: -4.0d
+		}
+		{
+			dependencies: ["264D138DFFE13BD0"]
+			description: ["{quests.tfg_tips.universal_compost.desc}"]
+			id: "13E4AE4F46A1A1A0"
+			subtitle: "{quests.tfg_tips.universal_compost.subtitle}"
+			tasks: [
+				{
+					id: "6F3BD81EAD7CC109"
+					item: {
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item(tfg:universal_compost_browns)item(tfg:universal_compost_greens))"
+						}
+					}
+					title: "{quests.tfg_tips.universal_compost.task.1}"
+					type: "item"
+				}
+				{
+					id: "787E7A402B3162B5"
+					item: {
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item(tfg:universal_compost_browns_bag)item(tfg:universal_compost_greens_bag))"
+						}
+					}
+					optional_task: true
+					title: "{quests.tfg_tips.universal_compost.task.2}"
+					type: "item"
+				}
+			]
+			title: "{quests.tfg_tips.universal_compost.title}"
+			x: 4.0d
+			y: -4.0d
+		}
 	]
 	subtitle: ["{quests.tfg_tips.subtitle}"]
 	title: "{quests.tfg_tips}"

config/ftbquests/quests/chapters/tips__tools.snbt

@@ -790,7 +790,10 @@
 			y: 15.0d
 		}
 		{
-			dependencies: ["02FDECC931B5E8EF"]
+			dependencies: [
+				"02FDECC931B5E8EF"
+				"3E6DC423FE4A99F7"
+			]
 			description: [
 				"{quests.tfg_tips.gt_power_tools.desc.1}"
 				"{@pagebreak}"
@@ -823,20 +826,13 @@
 				}
 			}
 			id: "2D2CB8104E40E808"
+			optional: true
 			subtitle: "{quests.tfg_tips.gt_power_tools.subtitle}"
-			tasks: [
-				{
-					id: "5DA224C235E227E3"
-					title: "GT Tool"
-					type: "checkmark"
-				}
-				{
-					id: "5B0BF3A94CA0D8A9"
-					item: "gtceu:lv_charger_4x"
-					optional_task: true
-					type: "item"
-				}
-			]
+			tasks: [{
+				id: "5DA224C235E227E3"
+				title: "GT Tool"
+				type: "checkmark"
+			}]
 			title: "{quests.tfg_tips.gt_power_tools.title}"
 			x: 10.5d
 			y: 11.5d
@@ -2506,10 +2502,14 @@
 			y: 1.0d
 		}
 		{
-			dependencies: ["7FA5B6354A49C396"]
+			dependencies: [
+				"7FA5B6354A49C396"
+				"560B17BFBE8D477D"
+			]
 			description: ["{quests.tfg_tips.first_sacks.desc}"]
 			guide_page: "tfc:field_guide tfc:sns/leather_sack"
 			id: "509C064AA92FD78F"
+			optional: true
 			subtitle: "{quests.tfg_tips.first_sacks.subtitle}"
 			tasks: [
 				{
@@ -2577,10 +2577,15 @@
 			y: -0.5d
 		}
 		{
-			dependencies: ["509C064AA92FD78F"]
+			dependencies: [
+				"509C064AA92FD78F"
+				"234B68E86F72C29E"
+			]
+			dependency_requirement: "one_completed"
 			description: ["{quests.tfg_tips.special_sacks.desc}"]
 			guide_page: "tfc:field_guide tfc:sns/ore_sack"
 			id: "21C58B2541BFA2EE"
+			optional: true
 			shape: "heart"
 			subtitle: "{quests.tfg_tips.special_sacks.subtitle}"
 			tasks: [
@@ -2613,7 +2618,6 @@
 						}
 						id: "sns:ore_sack"
 					}
-					optional_task: true
 					type: "item"
 				}
 			]
@@ -2644,10 +2648,14 @@
 			y: 5.0d
 		}
 		{
-			dependencies: ["7FA5B6354A49C396"]
+			dependencies: [
+				"7FA5B6354A49C396"
+				"015E7A116CCD3191"
+			]
 			description: ["{quests.tfg_tips.straw_basket.desc}"]
 			guide_page: "tfc:field_guide tfc:sns/straw_basket"
 			id: "67F40A90844EC0FC"
+			optional: true
 			subtitle: "{quests.tfg_tips.straw_basket.subtitle}"
 			tasks: [{
 				id: "542549225517097C"

config/greate-recipes.yaml

@@ -9,6 +9,19 @@ enableHardCreateRecipes: false
 # If false, GTCEu items will be used instead.
 useCreateItemsInRecipes: false
 
+# Should recipes from create that conflict with GTCEu recipes be enabled?
+# [WARNING]: This will not cover every single recipe conflict, only common conflicts (like components (plates/sheets)), or ore processing conflicts.
+disableConflictingRecipes: true
+
+# Should tiered encased fans process item entities?
+processItemEntitiesWithFan: false
+
+# Should recipes that cannot be removed be logged?
+logUnremovableRecipes: true
+
+# "Multiplier used for calculating how many ticks should initially be removed in fan processing recipes, based on how fast the fan is spinning."
+fanSpeedMultiplier: 0.5
+
 # Recipe types that should not be copied to Greate machines. Ex. 'gtceu:macerator' for macerator recipes
 ignoredRecipeTypes:
   - gtceu:ore_washer

config/immediatelyfast.json

@@ -1,9 +1,9 @@
 {
   "REGULAR_INFO": "----- Regular config values below -----",
-  "font_atlas_resizing": true,
+  "font_atlas_resizing": false,
   "map_atlas_generation": true,
   "hud_batching": false,
-  "fast_text_lookup": true,
+  "fast_text_lookup": false,
   "fast_buffer_upload": true,
   "COSMETIC_INFO": "----- Cosmetic only config values below (Does not optimize anything) -----",
   "dont_add_info_into_debug_hud": false,
@@ -18,4 +18,4 @@
   "debug_only_and_not_recommended_disable_hardware_conflict_handling": false,
   "debug_only_print_additional_error_information": false,
   "debug_only_use_last_usage_for_batch_ordering": false
-}
+}

config/sound_physics_remastered/occlusion.properties

@@ -216,4 +216,4 @@ minecraft\:jukebox=0.0
 # Lava (Block)
 minecraft\:lava=0.75
 # Water (Block)
-minecraft\:water=0.25
+\#minecraft\:water=0.25

config/via_romana.json

@@ -0,0 +1,62 @@
+{
+  "infrastructure_check_radius": 1,
+  "path_quality_threshold": 0.6,
+  "node_distance_minimum": 10,
+  "node_distance_maximum": 20,
+  "path_block_ids": [
+  ],
+  "path_block_tags": [
+    "tfc:paths",
+    "forge:gravel",
+    "rnr:gravel_road_blocks",
+    "rnr:gravel_road_slabs",
+    "rnr:gravel_road_stairs",
+    "forge:cobblestone",
+    "minecraft:stairs",
+    "minecraft:slabs",
+    "rnr:cobbled_road_blocks",
+    "rnr:cobbled_road_stairs",
+    "rnr:cobbled_road_slabs",
+    "minecraft:mineable/pickaxe",
+    "minecraft:mineable/axe"
+  ],
+  "path_block_strings": [
+  ],
+  "block_string_blacklist": [
+  ],
+  "invalid_dimensions": [],
+  "no_gui_charting": false,
+  "invalid_entities": [],
+  "warp_block_ids": [
+    "via_romana:warp_block"
+  ],
+  "warp_block_tags": [
+    "minecraft:all_signs"
+  ],
+  "travel_fatigue_cooldown": 6,
+  "fast_movement_speed": 0.0,
+  "direct_warp": false,
+  "fog_of_war_distance": 10,
+  "spline_animation_time": 2.0,
+  "maximum_map_dimension": 512,
+  "map_refresh_interval": 10,
+  "map_refresh_threshold": 10,
+  "map_save_interval": 5,
+  "biome_color_pairs": [],
+  "use_biome_fallback_for_lowres": false,
+  "enable_remote_map_access": true,
+  "enable_surveyor_landmark": false,
+  "enable_surveyor_landmark_coloring": false,
+  "invalid_block_overlay_opacity": 0.4,
+  "biome_map_opacity": 0.3,
+  "node_vignette_opacity": 1.0,
+  "line_colors": [
+    "#ffffff",
+    "#cccccc"
+  ],
+  "line_opacity": 1.0,
+  "enable_teleport_particles": true,
+  "enable_sign_particles": true,
+  "enable_custom_cursor": true,
+  "logging_enum": "NONE"
+}

config/waves-common.toml

@@ -10,10 +10,10 @@ waveSearchDistance = 14
 waveSpawnDistance = 0.0
 #Additional amount of waves to spawn.
 #Range: 0.0 ~ 1.7976931348623157E308
-waveSpawnAmount = 0.8
+waveSpawnAmount = 0.5
 #Time in ticks between each spawn sequence of waves. Set to 0 to disable waves.
 #Range: > 0
-waveSpawnFrequency = 30
+waveSpawnFrequency = 40
 #Maximum spawn distance from shore.
 #Range: 0.0 ~ 1.7976931348623157E308
 waveSpawnDistanceFromShoreMax = 48.0
@@ -25,10 +25,10 @@ waveSpawnDistanceFromShoreMin = 4.0
 waveSpriteCount = 5
 #How great should the chance for waves to deposit blocks be? Lower value = higher chance.
 #Range: > 1
-waveBlockDepositChance = 100
+waveBlockDepositChance = 1000
 #How often the waves should make a sound. Higher value = rarer.
 #Range: > 0
-waveBreakingSoundChance = 40
+waveBreakingSoundChance = 50
 #How fast the bioluminescence should change (octaves).
 #Range: > 1
 waveBioluminescenceChange = 16
@@ -43,10 +43,10 @@ waveSpawningFOVLimit = 140.0
 waveFindNearestShoreIterations = 3
 #Volume modifier for the waves. 1.0 = 100% volume.
 #Range: 0.0 ~ 10.0
-waveVolume = 1.0
+waveVolume = 0.8
 #The multiplier value for how strong the interaction force of the waves are. Higher value = stronger force.
 #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
-waveInteractionForceFactor = 1.0
+waveInteractionForceFactor = 2.0
 #How often the wave interaction should refresh/update. Higher values can yield better TPS at the cost of decreased interaction precision. Higher value => longer intervals between updates.
 #Range: > 1
 waveInteractionUpdateFrequency = 4