Merge branch 'dev' into bugfix/primitive-creatures-huntmaster

.github/workflows/build.yml

@@ -34,7 +34,7 @@ jobs:
     
     steps:
       - name: 📦 Checkout
-        uses: actions/checkout@v5.0.0
+        uses: actions/checkout@v6.0.0
         with:
           fetch-depth: 0
         
@@ -194,7 +194,7 @@ jobs:
       - name: 📄 Format diff
         id: format_diff
         if: ${{ steps.read_diff.outputs.diff != '' }}
-        uses: roamingowl/template-output-with-eta@v2.1.0
+        uses: roamingowl/template-output-with-eta@v2.2.0
         with:
           template: |
             ```markdown
@@ -229,7 +229,7 @@ jobs:
     steps:
 
       - name: Checkout
-        uses: actions/checkout@v5.0.0
+        uses: actions/checkout@v6.0.0
         with:
           fetch-depth: 0
 
@@ -313,7 +313,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5.0.0
+        uses: actions/checkout@v6.0.0
 
       - name: 🔄 Replace strings
         shell: bash
@@ -424,7 +424,7 @@ jobs:
 
     steps:
       - name: 📦 Checkout
-        uses: actions/checkout@v5.0.0
+        uses: actions/checkout@v6.0.0
 
       - name: 📦 Download artifact
         uses: actions/download-artifact@v6.0.0
@@ -452,7 +452,7 @@ jobs:
       - name: 📄 Format diff
         id: format_diff
         if: ${{ needs.info.outputs.diff != '' }}
-        uses: roamingowl/template-output-with-eta@v2.1.0
+        uses: roamingowl/template-output-with-eta@v2.2.0
         with:
           template: |
             ```markdown
@@ -461,7 +461,7 @@ jobs:
 
       - name: 🚀 Create release
         id: release
-        uses: softprops/action-gh-release@v2.4.2
+        uses: softprops/action-gh-release@v2.5.0
         with:
           name: ${{ needs.info.outputs.project_version }}
           tag_name: ${{ needs.info.outputs.project_version }}

CHANGELOG.md

@@ -28,6 +28,7 @@
 - Added fluid/item capacity tooltips to many fluid/item containers @Pyritie
 - Spring water is now drinkable (it also heats you up a little) @Pyritie
 ### Bug fixes
+- Fixed the horse crank not working at all @Pyritie
 - Fixed brown gravy recipe @Redeix
 - Fixed instant mac recipe requiring less cardboard than it gives back @Redeix
 - Fixed Ad Astra moon cheese nutrition values being inconsistent @Redeix
@@ -45,6 +46,7 @@
 - Hopefully fixed rockets without a pilot getting stuck and not exploding? (#2137) @Pyritie
 - Fixed some missing blocks from the GT facade whitelist (#2299) @MoltonMontro
 - Changed the texture of the ME Stocking Input Bus + Hatch to match the hull used to craft them @Pyritie
+- Fixed warped/crimson trees only growing on mars mycelium and not mars dirt @Pyritie
 ### Translation updates
 - Chinese (simplified) @jmecn
 - Japanese @sakura-gondra

config/DistantHorizons.toml

@@ -0,0 +1,818 @@
+_version = 3
+
+[client]
+	#
+	# Should Distant Horizon's config button appear in Minecraft's options screen next to the fov slider?
+	showDhOptionsButtonInMinecraftUi = true
+
+	[client.advanced]
+
+		[client.advanced.graphics]
+
+			[client.advanced.graphics.quality]
+				#
+				# The radius of the mod's render distance. (measured in chunks)
+				lodChunkRenderDistanceRadius = 256
+				#
+				# This indicates how quickly LODs decrease in quality the further away they are. 
+				# Higher settings will render higher quality fake chunks farther away, 
+				# but will increase memory and GPU usage.
+				horizontalQuality = "MEDIUM"
+				#
+				# What is the maximum detail LODs should be drawn at? 
+				# Higher settings will increase memory and GPU usage. 
+				# 
+				# CHUNK: render 1 LOD for each Chunk. 
+				# HALF_CHUNK: render 4 LODs for each Chunk. 
+				# FOUR_BLOCKS: render 16 LODs for each Chunk. 
+				# TWO_BLOCKS: render 64 LODs for each Chunk. 
+				# BLOCK: render 256 LODs for each Chunk (width of one block). 
+				# 
+				# Lowest Quality: CHUNK
+				# Highest Quality: BLOCK
+				maxHorizontalResolution = "BLOCK"
+				#
+				# This indicates how well LODs will represent 
+				# overhangs, caves, floating islands, etc. 
+				# Higher options will make the world more accurate, butwill increase memory and GPU usage. 
+				# 
+				# Lowest Quality: HEIGHT_MAP
+				# Highest Quality: EXTREME
+				verticalQuality = "MEDIUM"
+				#
+				# How should LOD transparency be handled. 
+				# 
+				# COMPLETE: LODs will render transparent. 
+				# FAKE: LODs will be opaque, but shaded to match the blocks underneath. 
+				# DISABLED: LODs will be opaque.
+				transparency = "COMPLETE"
+				#
+				# What blocks shouldn't be rendered as LODs? 
+				# 
+				# NONE: Represent all blocks in the LODs 
+				# NON_COLLIDING: Only represent solid blocks in the LODs (tall grass, torches, etc. won't count for a LOD's height)
+				blocksToIgnore = "NON_COLLIDING"
+				#
+				# Should the blocks underneath avoided blocks gain the color of the avoided block? 
+				# 
+				# True: a red flower will tint the grass below it red. 
+				# False: skipped blocks will not change color of surface below them.
+				tintWithAvoidedBlocks = true
+				#
+				# What the value should vanilla Minecraft's texture LodBias be? 
+				# If set to 0 the mod wont overwrite vanilla's default (which so happens to also be 0)
+				lodBias = "0.0"
+				#
+				# How should LODs be shaded? 
+				# 
+				# AUTO: Uses the same side shading as vanilla Minecraft blocks. 
+				# ENABLED: Simulates Minecraft's block shading for LODs. 
+				#               Can be used to force LOD shading when using some shaders. 
+				# DISABLED: All LOD sides will be rendered with the same brightness.
+				lodShading = "AUTO"
+				#
+				# How should the sides and bottom of grass block LODs render? 
+				# 
+				# AS_GRASS: all sides of dirt LOD's render using the top (green) color. 
+				# FADE_TO_DIRT: sides fade from grass to dirt. 
+				# AS_DIRT: sides render entirely as dirt.
+				grassSideRendering = "FADE_TO_DIRT"
+				#
+				# If true LODs will fade away as you get closer to them. 
+				# If false LODs will cut off abruptly at a set distance from the camera. 
+				# This setting is affected by the vanilla overdraw prevention config.
+				ditherDhFade = true
+				#
+				# How should vanilla Minecraft fade into Distant Horizons LODs? 
+				# 
+				# NONE: Fastest, there will be a pronounced border between DH and MC rendering. 
+				# SINGLE_PASS: Fades after MC's transparent pass, opaque blocks underwater won't be faded. 
+				# DOUBLE_PASS: Slowest, fades after both MC's opaque and transparent passes, provides the smoothest transition.
+				vanillaFadeMode = "DOUBLE_PASS"
+				#
+				# How bright LOD colors are. 
+				# 
+				# 0 = black 
+				# 1 = normal 
+				# 2 = near white
+				brightnessMultiplier = "1.0"
+				#
+				# How saturated LOD colors are. 
+				# 
+				# 0 = black and white 
+				# 1 = normal 
+				# 2 = very saturated
+				saturationMultiplier = "1.0"
+				#
+				# This is the same as vanilla Biome Blending settings for Lod area. 
+				#     Note that anything other than '0' will greatly effect Lod building time. 
+				# 
+				#     '0' equals to Vanilla Biome Blending of '1x1' or 'OFF', 
+				#     '1' equals to Vanilla Biome Blending of '3x3', 
+				#     '2' equals to Vanilla Biome Blending of '5x5'...
+				lodBiomeBlending = 3
+
+			[client.advanced.graphics.ssao]
+				#
+				# Enable Screen Space Ambient Occlusion
+				enableSsao = true
+				#
+				# Determines how many points in space are sampled for the occlusion test. 
+				# Higher numbers will improve quality and reduce banding, but will increase GPU load.
+				sampleCount = 6
+				#
+				# Determines the radius Screen Space Ambient Occlusion is applied, measured in blocks.
+				radius = "4.0"
+				#
+				# Determines how dark the Screen Space Ambient Occlusion effect will be.
+				strength = "0.2"
+				#
+				# Increasing the value can reduce banding at the cost of reducing the strength of the effect.
+				bias = "0.02"
+				#
+				# Determines how dark the occlusion shadows can be. 
+				# 0 = totally black at the corners 
+				# 1 = no shadow
+				minLight = "0.25"
+				#
+				# The radius, measured in pixels, that blurring is calculated for the SSAO. 
+				# Higher numbers will reduce banding at the cost of GPU performance.
+				blurRadius = 2
+
+			[client.advanced.graphics.genericRendering]
+				#
+				# If true non terrain objects will be rendered in DH's terrain. 
+				# This includes beacon beams and clouds.
+				enableGenericRendering = true
+				#
+				# If true LOD beacon beams will be rendered.
+				enableBeaconRendering = true
+				#
+				# Sets the maximum height at which beacons will render.This will only affect new beacons coming into LOD render distance.Beacons currently visible in LOD chunks will not be affected.
+				beaconRenderHeight = 6000
+				#
+				# If true LOD clouds will be rendered.
+				enableCloudRendering = true
+				#
+				# Can be disabled to use much slower but more compatible direct rendering. 
+				# Disabling this can be used to fix some crashes on Mac.
+				enableInstancedRendering = true
+
+			[client.advanced.graphics.fog]
+				#
+				# Determines if fog is drawn on DH LODs.
+				enableDhFog = true
+				#
+				# What color should fog use? 
+				# 
+				# USE_WORLD_FOG_COLOR: Use the world's fog color. 
+				# USE_SKY_COLOR: Use the sky's color.
+				colorMode = "USE_WORLD_FOG_COLOR"
+				#
+				# Should Minecraft's fog render? 
+				# Note: Other mods may conflict with this setting.
+				enableVanillaFog = false
+				#
+				# At what distance should the far fog start? 
+				# 
+				# 0.0: Fog starts at the player's position. 
+				# 1.0: Fog starts at the closest edge of the vanilla render distance. 
+				# 1.414: Fog starts at the corner of the vanilla render distance.
+				farFogStart = "0.4"
+				#
+				# Where should the far fog end? 
+				# 
+				# 0.0: Fog ends at player's position.
+				# 1.0: Fog ends at the closest edge of the vanilla render distance. 
+				# 1.414: Fog ends at the corner of the vanilla render distance.
+				farFogEnd = "1.0"
+				#
+				# What is the minimum fog thickness? 
+				# 
+				# 0.0: No fog. 
+				# 1.0: Fully opaque fog.
+				farFogMin = "0.0"
+				#
+				# What is the maximum fog thickness? 
+				# 
+				# 0.0: No fog. 
+				# 1.0: Fully opaque fog.
+				farFogMax = "1.0"
+				#
+				# How should the fog thickness should be calculated? 
+				# 
+				# LINEAR: Linear based on distance (will ignore 'density')
+				# EXPONENTIAL: 1/(e^(distance*density)) 
+				# EXPONENTIAL_SQUARED: 1/(e^((distance*density)^2)
+				farFogFalloff = "EXPONENTIAL_SQUARED"
+				#
+				# Used in conjunction with the Fog Falloff.
+				farFogDensity = "2.5"
+
+				[client.advanced.graphics.fog.heightFog]
+					#
+					# How should height effect the fog thickness? 
+					# Note: height fog is combined with the other fog settings. 
+					# 
+					# SPHERICAL: Fog is calculated based on camera distance. 
+					# CYLINDRICAL: Ignore height, fog is calculated based on horizontal distance. 
+					# 
+					# MAX: max(heightFog, farFog) 
+					# ADDITION: heightFog + farFog 
+					# MULTIPLY: heightFog * farFog 
+					# INVERSE_MULTIPLY: 1 - (1-heightFog) * (1-farFog) 
+					# LIMITED_ADDITION: farFog + max(farFog, heightFog) 
+					# MULTIPLY_ADDITION: farFog + farFog * heightFog 
+					# INVERSE_MULTIPLY_ADDITION: farFog + 1 - (1-heightFog) * (1-farFog) 
+					# AVERAGE: farFog*0.5 + heightFog*0.5
+					heightFogMixMode = "SPHERICAL"
+					#
+					# Where should the height fog start? 
+					# 
+					# ABOVE_CAMERA: Height fog starts at the camera and goes towards the sky 
+					# BELOW_CAMERA: Height fog starts at the camera and goes towards the void 
+					# ABOVE_AND_BELOW_CAMERA: Height fog starts from the camera to goes towards both the sky and void 
+					# ABOVE_SET_HEIGHT: Height fog starts from a set height and goes towards the sky 
+					# BELOW_SET_HEIGHT: Height fog starts from a set height and goes towards the void 
+					# ABOVE_AND_BELOW_SET_HEIGHT: Height fog starts from a set height and goes towards both the sky and void
+					heightFogDirection = "BELOW_SET_HEIGHT"
+					#
+					# If the height fog is calculated around a set height, what is that height position?
+					heightFogBaseHeight = "80.0"
+					#
+					# Should the start of the height fog be offset? 
+					# 
+					# 0.0: Fog start with no offset.
+					# 1.0: Fog start with offset of the entire world's height. (Includes depth)
+					heightFogStart = "0.0"
+					#
+					# Should the end of the height fog be offset? 
+					# 
+					# 0.0: Fog end with no offset.
+					# 1.0: Fog end with offset of the entire world's height. (Include depth)
+					heightFogEnd = "0.6"
+					#
+					# What is the minimum fog thickness? 
+					# 
+					# 0.0: No fog. 
+					# 1.0: Fully opaque fog.
+					heightFogMin = "0.0"
+					#
+					# What is the maximum fog thickness? 
+					# 
+					# 0.0: No fog. 
+					# 1.0: Fully opaque fog.
+					heightFogMax = "1.0"
+					#
+					# How should the height fog thickness should be calculated? 
+					# 
+					# LINEAR: Linear based on height (will ignore 'density')
+					# EXPONENTIAL: 1/(e^(height*density)) 
+					# EXPONENTIAL_SQUARED: 1/(e^((height*density)^2)
+					heightFogFalloff = "EXPONENTIAL_SQUARED"
+					#
+					# What is the height fog's density?
+					heightFogDensity = "20.0"
+
+			[client.advanced.graphics.noiseTexture]
+				#
+				# Should a noise texture be applied to LODs? 
+				# 
+				# This is done to simulate textures and make the LODs appear more detailed.
+				enableNoiseTexture = true
+				#
+				# How many steps of noise should be applied to LODs?
+				noiseSteps = 4
+				#
+				# How intense should the noise should be?
+				noiseIntensity = "5.0"
+				#
+				# Defines how far should the noise texture render before it fades away. (in blocks) 
+				# Set to 0 to disable noise from fading away
+				noiseDropoff = 1024
+
+			[client.advanced.graphics.culling]
+				#
+				# Determines how far from the camera Distant Horizons will start rendering. 
+				# Measured as a percentage of the vanilla render distance.
+				# 
+				# 0 = auto, overdraw will change based on the vanilla render distance.
+				# 
+				# Higher values will prevent LODs from rendering behind vanilla blocks at a higher distance,
+				# but may cause holes in the world. 
+				# Holes are most likely to appear when flying through unloaded terrain. 
+				# 
+				# Increasing the vanilla render distance increases the effectiveness of this setting.
+				overdrawPrevention = "0.0"
+				#
+				# If enabled caves won't be rendered. 
+				# 
+				#  Note: for some world types this can cause 
+				#  overhangs or walls for floating objects. 
+				#  Tweaking the caveCullingHeight, can resolve some 
+				#  of those issues.
+				enableCaveCulling = true
+				#
+				# At what Y value should cave culling start? 
+				# Lower this value if you get walls for areas with 0 light.
+				caveCullingHeight = 60
+				#
+				# If false all beacons near the camera won't be drawn to prevent vanilla overdraw. 
+				# If true all beacons will be rendered. 
+				# 
+				# Generally this should be left as true. It's main purpose is for debugging
+				# beacon updating/rendering.
+				disableBeaconDistanceCulling = true
+				#
+				# If true LODs outside the player's camera 
+				# aren't drawn, increasing GPU performance. 
+				# 
+				# If false all LODs are drawn, even those behind 
+				# the player's camera, decreasing GPU performance. 
+				# 
+				# Disable this if you see LODs disappearing at the corners of your vision.
+				disableFrustumCulling = false
+				#
+				# Identical to the other frustum culling option
+				# only used when a shader mod is present using the DH API
+				# and the shadow pass is being rendered.
+				# 
+				# Disable this if shadows render incorrectly.
+				disableShadowPassFrustumCulling = false
+				#
+				# A comma separated list of block resource locations that won't be rendered by DH. 
+				# Air is always included in this list. 
+				# Requires a restart to change.
+				ignoredRenderBlockCsv = "minecraft:barrier,minecraft:structure_void,minecraft:light,minecraft:tripwire,minecraft:brown_mushroom"
+				#
+				# A comma separated list of block resource locations that shouldn't be rendered 
+				# if they are in a 0 sky light underground area. 
+				# Air is always included in this list. 
+				# Requires a restart to change.
+				ignoredRenderCaveBlockCsv = "minecraft:glow_lichen,minecraft:rail,minecraft:water,minecraft:lava,minecraft:bubble_column,minecraft:cave_vines_plant,minecraft:vine,minecraft:cave_vines,minecraft:short_grass,minecraft:tall_grass,minecraft:small_dripleaf,minecraft:big_dripleaf,minecraft:big_dripleaf_stem,minecraft:sculk_vein"
+
+			[client.advanced.graphics.experimental]
+				#
+				# This is the earth size ratio when applying the curvature shader effect. 
+				# Note: Enabling this feature may cause rendering bugs. 
+				# 
+				# 0 = flat/disabled 
+				# 1 = 1 to 1 (6,371,000 blocks) 
+				# 100 = 1 to 100 (63,710 blocks) 
+				# 10000 = 1 to 10000 (637.1 blocks) 
+				# 
+				# Note: Due to current limitations, the min value is 50 
+				# and the max value is 5000. Any values outside this range 
+				# will be set to 0 (disabled).
+				earthCurveRatio = 0
+
+		[client.advanced.multiplayer]
+			#
+			# How should multiplayer save folders should be named? 
+			# 
+			# NAME_ONLY: Example: "Minecraft Server" 
+			# IP_ONLY: Example: "192.168.1.40" 
+			# NAME_IP: Example: "Minecraft Server IP 192.168.1.40" 
+			# NAME_IP_PORT: Example: "Minecraft Server IP 192.168.1.40:25565"NAME_IP_PORT_MC_VERSION: Example: "Minecraft Server IP 192.168.1.40:25565 GameVersion 1.16.5"
+			serverFolderNameMode = "NAME_ONLY"
+
+		[client.advanced.autoUpdater]
+			#
+			# Automatically check for updates on game launch?
+			enableAutoUpdater = true
+			#
+			# Should Distant Horizons silently, automatically download and install new versions? 
+			# This setting is force disabled on dedicated servers for stability reasons.
+			enableSilentUpdates = false
+			#
+			# If DH should use the nightly (provided by Gitlab), or stable (provided by Modrinth) build. 
+			# If [AUTO] is selected DH will update to new stable releases if the current jar is a stable jar 
+			# and will update to new nightly builds if the current jar is a nightly jar (IE the version number ends in '-dev').
+			updateBranch = "AUTO"
+
+		[client.advanced.debugging]
+			#
+			# What renderer is active? 
+			# 
+			# DEFAULT: Default lod renderer 
+			# DEBUG: Debug testing renderer 
+			# DISABLED: Disable rendering
+			rendererMode = "DEFAULT"
+			#
+			# Should specialized colors/rendering modes be used? 
+			# 
+			# OFF: LODs will be drawn with their normal colors. 
+			# SHOW_DETAIL: LODs' color will be based on their detail level. 
+			# SHOW_BLOCK_MATERIAL: LODs' color will be based on their material. 
+			# SHOW_OVERLAPPING_QUADS: LODs will be drawn with total white, but overlapping quads will be drawn with red.
+			debugRendering = "OFF"
+			#
+			# If enabled this will disable (most) vanilla Minecraft rendering. 
+			# 
+			# NOTE: Do not report any issues when this mode is on! 
+			#    This setting is only for fun and debugging. 
+			#    Mod compatibility is not guaranteed.
+			lodOnlyMode = false
+			#
+			# If enabled the LODs will render as wireframe.
+			renderWireframe = false
+			#
+			# If true the F8 key can be used to cycle through the different debug modes. 
+			# and the F6 key can be used to enable and disable LOD rendering.
+			enableDebugKeybindings = false
+			#
+			# Stops vertex colors from being passed. 
+			# Useful for debugging shaders
+			enableWhiteWorld = false
+			#
+			# If true overlapping quads will be rendered as bright red for easy identification. 
+			# If false the quads will be rendered normally.
+			showOverlappingQuadErrors = false
+			#
+			# If true OpenGL Buffer garbage collection will be logged 
+			# this also includes the number of live buffers.
+			logBufferGarbageCollection = false
+
+			[client.advanced.debugging.debugWireframe]
+				#
+				# If enabled, various wireframes for debugging internal functions will be drawn. 
+				# 
+				# NOTE: There WILL be performance hit! 
+				#    Additionally, only stuff that's loaded after you enable this 
+				#    will render their debug wireframes.
+				enableRendering = false
+				#
+				# Render queued world gen tasks?
+				showWorldGenQueue = false
+				#
+				# Render queued network sync on load tasks?
+				showNetworkSyncOnLoadQueue = false
+				#
+				# Render LOD section status?
+				showRenderSectionStatus = false
+				#
+				# A white box will be drawn when an LOD starts rendering 
+				# and a purple box when an LOD stops rendering. 
+				# 
+				# This can be used to debug Quad Tree holes.
+				showRenderSectionToggling = false
+				#
+				# Render Quad Tree Rendering status?
+				showQuadTreeRenderStatus = false
+				#
+				# Render full data update/lock status?
+				showFullDataUpdateStatus = false
+
+			[client.advanced.debugging.openGl]
+				#
+				# Defines how OpenGL errors are handled. 
+				#  Requires rebooting Minecraft to change. 
+				# Will catch OpenGL errors thrown by other mods.
+				overrideVanillaGLLogger = true
+				#
+				# If true each Open GL error will only be logged once. 
+				# Enabling this may cause some error logs to be missed. 
+				# Does nothing if overrideVanillaGLLogger is set to false. 
+				#  
+				# Generally this can be kept as 'true' to prevent log spam. 
+				# However, Please set this to 'false' if a developer needs your log to debug a GL issue.
+				onlyLogGlErrorsOnce = true
+				#
+				# Defines how OpenGL errors are handled. 
+				# May incorrectly catch OpenGL errors thrown by other mods. 
+				# 
+				# IGNORE: Do nothing. 
+				# LOG: write an error to the log. 
+				# LOG_THROW: write to the log and throw an exception. 
+				#            Warning: this should only be enabled when debugging the LOD renderer 
+				#            as it may break Minecraft's renderer when an exception is thrown.
+				glErrorHandlingMode = "IGNORE"
+				#
+				# Massively reduces FPS. 
+				# Should only be used if mysterious EXCEPTION_ACCESS_VIOLATION crashes are happening in DH's rendering code for troubleshooting.
+				validateBufferIdsBeforeRendering = false
+
+			[client.advanced.debugging.f3Screen]
+				#
+				# Shows the player's LOD position.
+				showPlayerPos = true
+				#
+				# Defines what internal detail level the player position will be shown as. 
+				# Internal detail level means: 6 = 1x1 block, 7 = 2x2 blocks, etc.
+				playerPosSectionDetailLevel = 6
+				#
+				# Shows info about each thread pool.
+				showThreadPools = true
+				#
+				# Shows the combined memory use and array counts for all DH pooled objects.
+				showCombinedObjectPools = false
+				#
+				# Shows the memory use and array counts for each DH object pool.
+				showSeparatedObjectPools = false
+				#
+				# Shows how many chunks are queud for processing and the max count that can be queued.
+				showQueuedChunkUpdateCount = true
+				#
+				# Shows what levels are loaded and world gen/rendering info about those levels.
+				showLevelStatus = true
+
+			[client.advanced.debugging.exampleConfigScreen]
+				boolTest = false
+				byteTest = "8"
+				intTest = 69420
+				doubleTest = "420.69"
+				shortTest = "69"
+				longTest = "42069"
+				floatTest = "0.42069"
+				stringTest = "Test input box"
+				listTest = ["option 1", "option 2", "option 3"]
+				mapTest = "{}"
+				linkableTest = 420
+
+[common]
+
+	[common.worldGenerator]
+		#
+		# Should Distant Horizons slowly generate LODs 
+		#  outside the vanilla render distance? 
+		# Depending on the generator mode, this will import existing chunks 
+		# and/or generating missing chunks.
+		enableDistantGeneration = true
+		#
+		# How detailed should LODs be generated outside the vanilla render distance? 
+		# 
+		# PRE_EXISTING_ONLY 
+		# Only create LOD data for already generated chunks. 
+		# 
+		# 
+		# SURFACE 
+		# Generate the world surface, 
+		# this does NOT include trees, 
+		# or structures. 
+		# 
+		# FEATURES 
+		# Generate everything except structures. 
+		# WARNING: This may cause world generator bugs or instability when paired with certain world generator mods. 
+		# 
+		# INTERNAL_SERVER 
+		# Ask the local server to generate/load each chunk. 
+		# This is the most compatible and will generate structures correctly, 
+		# but may cause server/simulation lag. 
+		# Note: unlike other modes this option DOES save generated chunks to 
+		# Minecraft's region files.
+		distantGeneratorMode = "INTERNAL_SERVER"
+		#
+		# How should distant generator progress be displayed? 
+		# 
+		# OVERLAY: may be the same as CHAT for some Minecraft versions 
+		# CHAT 
+		# LOG 
+		# DISABLED
+		showGenerationProgress = "DISABLED"
+		#
+		# How often should the distant generator progress be displayed?
+		generationProgressDisplayIntervalInSeconds = 2
+		#
+		# For how many seconds should instructions for disabling the distant generator progress be displayed? 
+		# Setting this to 0 hides the instructional message so the world gen progress is shown immediately when it starts.
+		generationProgressDisableMessageDisplayTimeInSeconds = 20
+		#
+		# When logging generation progress also include the rate at which chunks 
+		# are being generated. 
+		# This can be useful for troubleshooting performance.
+		generationProgressIncludeChunksPerSecond = true
+
+	[common.lodBuilding]
+		#
+		# Enabling this will drastically increase chunk processing time
+		# and you may need to increase your CPU load to handle it.
+		# 
+		# Normally DH will attempt to skip creating LODs for chunks it's already seen
+		# and that haven't changed.
+		# 
+		# However sometimes that logic incorrectly prevents LODs from being updated.
+		# Disabling this check may fix issues where LODs aren't updated after
+		# blocks have been changed.
+		disableUnchangedChunkCheck = false
+		#
+		# What algorithm should be used to compress new LOD data? 
+		# This setting will only affect new or updated LOD data, 
+		# any data already generated when this setting is changed will be
+		# unaffected until it needs to be re-written to the database.
+		# 
+		# UNCOMPRESSED 
+		# Should only be used for testing, is worse in every way vs [LZ4].
+		# Expected Compression Ratio: 1.0
+		# Estimated average DTO read speed: 6.09 milliseconds
+		# Estimated average DTO write speed: 6.01 milliseconds
+		# 
+		# LZ4 
+		# A good option if you're CPU limited and have plenty of hard drive space.
+		# Expected Compression Ratio: 0.4513
+		# Estimated average DTO read speed: 3.25 ms
+		# Estimated average DTO write speed: 5.99 ms
+		# 
+		# Z_STD 
+		# A good option if you're CPU limited and have plenty of hard drive space.
+		# Expected Compression Ratio: 0.2606
+		# Estimated average DTO read speed: 9.31 ms
+		# Estimated average DTO write speed: 15.13 ms
+		# 
+		# LZMA2 
+		# Slow but very good compression.
+		# Expected Compression Ratio: 0.2
+		# Estimated average DTO read speed: 13.29 ms
+		# Estimated average DTO write speed: 70.95 ms
+		dataCompression = "Z_STD"
+		#
+		# How should block data be compressed when creating LOD data? 
+		# This setting will only affect new or updated LOD data, 
+		# any data already generated when this setting is changed will be
+		# unaffected until it is modified or re-loaded.
+		# 
+		# MERGE_SAME_BLOCKS 
+		# Every block/biome change is recorded in the database. 
+		# This is what DH 2.0 and 2.0.1 all used by default and will store a lot of data. 
+		# Expected Compression Ratio: 1.0
+		# 
+		# VISUALLY_EQUAL 
+		# Only visible block/biome changes are recorded in the database. 
+		# Hidden blocks (IE ores) are ignored.  
+		# Expected Compression Ratio: 0.7
+		worldCompression = "VISUALLY_EQUAL"
+		#
+		# True: Recalculate chunk height maps before chunks can be used by DH.
+		#       This can fix problems with worlds created by World Painter or 
+		#       other external tools where the heightmap format may be incorrect. 
+		# False: Assume any height maps handled by Minecraft are correct. 
+		# 
+		# Fastest: False
+		# Most Compatible: True
+		recalculateChunkHeightmaps = false
+		#
+		# If true LOD generation for pre-existing chunks will attempt to pull the lighting data 
+		# saved in Minecraft's Region files. 
+		# If false DH will pull in chunks without lighting and re-light them. 
+		#  
+		# Setting this to true will result in faster LOD generation 
+		# for already generated worlds, but is broken by most lighting mods. 
+		#  
+		# Set this to false if LODs are black.
+		pullLightingForPregeneratedChunks = false
+		#
+		# When DH pulls in pre-existing chunks it will attempt to 
+		# run any missing world generation steps; for example: 
+		# if a chunk has the status SURFACE, DH will skip BIOMES 
+		# and SURFACE, but will run FEATURES. 
+		#  
+		# However if for some reason the chunks are malformed 
+		# or there's some other issue that causes the status 
+		# to be incorrect that can either cause world gen 
+		# lock-ups and/or crashes. 
+		# If either of those happen try setting this to True.
+		assumePreExistingChunksAreFinished = false
+
+		[common.lodBuilding.experimental]
+			#
+			# When active DH will attempt to fill missing LOD data 
+			# with any data that is present in the tree, preventing holes when moving 
+			# when a N-sized generator (or server) is active. 
+			# 
+			# This is only used when N-sized world generation is available 
+			# and/or when on a server where [generateOnlyInHighestDetail] is false. 
+			# 
+			# Experimental:
+			# Enabling this option will increase CPU and harddrive use
+			# and may cause rendering bugs.
+			upsampleLowerDetailLodsToFillHoles = false
+
+	[common.multiThreading]
+		#
+		# How many threads should be used by Distant Horizons?
+		numberOfThreads = 8
+		#
+		# A value between 1.0 and 0.0 that represents the percentage 
+		# of time each thread can run before going idle. 
+		# 
+		# This can be used to reduce CPU usage if the thread count 
+		# is already set to 1 for the given option, or more finely 
+		# tune CPU performance.
+		threadRunTimeRatio = "1.0"
+
+	[common.logging]
+		#
+		# If enabled, the mod will log information about the world generation process. 
+		# This can be useful for debugging.
+		logWorldGenEvent = "LOG_ERROR_TO_CHAT_AND_INFO_TO_FILE"
+		#
+		# If enabled, the mod will log performance about the world generation process. 
+		# This can be useful for debugging.
+		logWorldGenPerformance = "LOG_ERROR_TO_CHAT_AND_INFO_TO_FILE"
+		#
+		# If enabled, the mod will log information about the world generation process. 
+		# This can be useful for debugging.
+		logWorldGenLoadEvent = "LOG_ERROR_TO_CHAT_AND_INFO_TO_FILE"
+		#
+		# If enabled, the mod will log information about the renderer buffer process. 
+		# This can be useful for debugging.
+		logRendererBufferEvent = "LOG_ERROR_TO_CHAT_AND_INFO_TO_FILE"
+		#
+		# If enabled, the mod will log information about the renderer OpenGL process. 
+		# This can be useful for debugging.
+		logRendererGLEvent = "LOG_ERROR_TO_CHAT_AND_INFO_TO_FILE"
+		#
+		# If enabled, the mod will log information about network operations. 
+		# This can be useful for debugging.
+		logNetworkEvent = "LOG_ERROR_TO_CHAT_AND_WARNING_TO_FILE"
+
+		[common.logging.warning]
+			#
+			# If enabled, a chat message will be displayed if Java doesn't have enough 
+			# memory allocated to run DH well.
+			showLowMemoryWarningOnStartup = true
+			#
+			# If enabled, a chat message will be displayed if DH detects 
+			# that any pooled objects have been garbage collected.
+			showPoolInsufficientMemoryWarning = true
+			#
+			# If enabled, a chat message will be displayed if vanilla MC's 
+			# render distance is higher than the recommended amount.
+			showHighVanillaRenderDistanceWarning = true
+			#
+			# If enabled, a chat message will be displayed when a replay is started 
+			# giving some basic information about how DH will function.
+			showReplayWarningOnStartup = true
+			#
+			# If enabled, a chat message will be displayed when DH has too many chunks 
+			# queued for updating.
+			showUpdateQueueOverloadedChatWarning = false
+			#
+			# If enabled, a chat message will be displayed when a potentially problematic 
+			# mod is installed alongside DH.
+			showModCompatibilityWarningsOnStartup = true
+
+[server]
+	#
+	# Makes the server send level keys for each world.
+	# Disable this if you use alternative ways to send level keys.
+	sendLevelKeys = true
+	#
+	# Prefix of the level keys sent to the clients.
+	# If the mod is running behind a proxy, each backend should use a unique value.
+	# If this value is empty, level key will be based on the server's seed hash.
+	levelKeyPrefix = ""
+	#
+	# How many LOD generation requests per second should a client send? 
+	# Also limits the number of client requests allowed to stay in the server's queue.
+	generationRequestRateLimit = 20
+	#
+	# Defines the distance allowed to generate around the player.
+	maxGenerationRequestDistance = 4096
+	#
+	# Defines the X-coordinate of the central point for generation boundaries, in blocks.
+	generationBoundsX = 0
+	#
+	# Defines the Z-coordinate of the central point for generation boundaries, in blocks.
+	generationBoundsZ = 0
+	#
+	# Defines the radius around the central point within which generation is allowed, in blocks. 
+	# If this value is set to 0, generation bounds are disabled.
+	generationBoundsRadius = 0
+	#
+	# If true, clients will receive real-time LOD updates for chunks outside the client's render distance.
+	enableRealTimeUpdates = true
+	#
+	# Defines the distance the player will receive updates around.
+	realTimeUpdateDistanceRadiusInChunks = 256
+	#
+	# If true, clients will receive updated LODs when joining or loading new LODs.
+	synchronizeOnLoad = true
+	#
+	# How many LOD sync requests per second should a client send? 
+	# Also limits the amount of player's requests allowed to stay in the server's queue.
+	syncOnLoadRateLimit = 50
+	#
+	# Defines the distance allowed to be synchronized around the player. 
+	# Should be the same or larger than maxGenerationRequestDistance in most cases.
+	maxSyncOnLoadRequestDistance = 4096
+	#
+	# Maximum per-player speed for uploading LODs to the clients, in KB/s.
+	# Value of 0 disables the limit.
+	playerBandwidthLimit = 500
+	#
+	# Maximum global speed for uploading LODs to the clients, in KB/s.
+	# Value of 0 disables the limit.
+	globalBandwidthLimit = 0
+	#
+	# Enables adaptive transfer speed based on client performance.
+	# If true, DH will automatically adjust transfer rate to minimize connection lag.
+	# If false, transfer speed will remain fixed.
+	enableAdaptiveTransferSpeed = false
+
+	[server.experimental]
+		#
+		# When enabled on the client, this allows loading lower detail levels as needed to speed up terrain generation.
+		# This must also be enabled on the server; otherwise, it will have no effect.
+		# For better performance when switching LOD detail levels, enabling [upsampleLowerDetailLodsToFillHoles] is recommended.
+		enableNSizedGeneration = false
+

config/ftbquests/quests/chapters/applied_energistics_2.snbt

@@ -218,13 +218,6 @@
 					id: "432E105A84AEA630"
 					type: "checkmark"
 				}
-				{
-					dimension: "ad_astra:moon"
-					disable_toast: true
-					icon: "tfg:marker/moon"
-					id: "6A4F5147475443C5"
-					type: "dimension"
-				}
 			]
 			title: "{quests.ae2.fluix_liquid.title}"
 			x: -3.5d

config/ftbquests/quests/chapters/lv__low_voltage.snbt

@@ -36,6 +36,13 @@
 			x: -2.0d
 			y: 12.5d
 		}
+		{
+			id: "5A47760FCD164E74"
+			linked_quest: "61F58B402F1AE40B"
+			shape: "heart"
+			x: -7.5d
+			y: 4.5d
+		}
 	]
 	quests: [
 		{
@@ -1597,6 +1604,7 @@
 		{
 			description: ["{quests.low_voltage.cupronickel_ingot.desc}"]
 			id: "6042514C8FC54334"
+			shape: "diamond"
 			subtitle: "{quests.low_voltage.cupronickel_ingot.subtitle}"
 			tasks: [{
 				id: "701DEB748320107C"

config/ftbquests/quests/chapters/mv__medium_voltage.snbt

@@ -39,6 +39,7 @@
 				"53DC6E32C41C94C3"
 				"1A29EFBCEA017F99"
 			]
+			dependency_requirement: "one_completed"
 			description: [
 				"{quests.medium_voltage.mv_biomass.desc.1}"
 				"{@pagebreak}"
@@ -775,24 +776,6 @@
 			x: -10.0d
 			y: 10.0d
 		}
-		{
-			dependencies: ["10FB27DD3C7BEC2F"]
-			description: ["{quests.medium_voltage.mv_tank.desc}"]
-			icon: "gtceu:lv_super_tank"
-			id: "6C53B01A05FFF1DC"
-			optional: true
-			shape: "heart"
-			size: 2.0d
-			subtitle: "{quests.medium_voltage.mv_tank.subtitle}"
-			tasks: [{
-				id: "47EA273D728C158F"
-				item: "gtceu:lv_super_tank"
-				type: "item"
-			}]
-			title: "{quests.medium_voltage.mv_tank.title}"
-			x: -14.0d
-			y: 10.0d
-		}
 		{
 			dependencies: ["10FB27DD3C7BEC2F"]
 			description: ["{quests.medium_voltage.mv_pvc.desc}"]
@@ -1437,6 +1420,7 @@
 			description: ["{quests.medium_voltage.mv_seawater.desc}"]
 			id: "45449ECE4F8128E7"
 			optional: true
+			shape: "diamond"
 			subtitle: "{quests.medium_voltage.mv_seawater.subtitle}"
 			tasks: [{
 				id: "77395198DC98E3A5"

config/ftbquests/quests/chapters/questsmetallurgy.snbt

@@ -50,13 +50,14 @@
 		{
 			id: "19CF6D922179DFF9"
 			linked_quest: "11C45DBB20ED7647"
+			shape: "heart"
 			x: 9.0d
 			y: -34.0d
 		}
 		{
 			id: "3249AB9EB552BB77"
 			linked_quest: "4B79026C8D2DACC4"
-			x: 20.5d
+			x: 17.5d
 			y: -28.0d
 		}
 	]
@@ -286,7 +287,6 @@
 			description: ["{quests.metal_age.bellows.desc}"]
 			hide_dependency_lines: true
 			id: "021D3DEEB15A3D17"
-			shape: "rsquare"
 			subtitle: "{quests.metal_age.bellows.subtitle}"
 			tasks: [{
 				id: "588EB07E980386F9"
@@ -1203,6 +1203,8 @@
 			dependencies: ["3C173357029AB649"]
 			description: ["{quests.metal_age.copper_diving.desc}"]
 			id: "70FE6706B43FC5FC"
+			optional: true
+			shape: "heart"
 			subtitle: "{quests.metal_age.copper_diving.subtitle}"
 			tasks: [
 				{

config/ftbquests/quests/chapters/questssteam_age.snbt

@@ -487,8 +487,8 @@
 				}
 			]
 			title: "{quests.steam_age.miner.title}"
-			x: -7.0d
-			y: 14.0d
+			x: -12.0d
+			y: 15.0d
 		}
 		{
 			dependencies: [
@@ -577,6 +577,8 @@
 			description: ["{quests.steam_age.steam_bloomery.desc}"]
 			icon: "gtceu:steam_bloomery"
 			id: "0805CCABC8E7F6CF"
+			optional: true
+			shape: "heart"
 			size: 1.5d
 			subtitle: "{quests.steam_age.steam_bloomery.subtitle}"
 			tasks: [
@@ -790,6 +792,7 @@
 			description: ["{quests.steam_age.coiling_machine.desc}"]
 			id: "072F6E48A1C5ECE9"
 			optional: true
+			size: 1.25d
 			subtitle: "{quests.steam_age.coiling_machine.subtitle}"
 			tasks: [{
 				id: "07B7D41ACDCD1DEA"
@@ -797,8 +800,8 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.coiling_machine.title}"
-			x: -12.0d
-			y: 15.0d
+			x: -7.0d
+			y: 14.0d
 		}
 		{
 			dependencies: ["2C35D4E01AEC02AA"]
@@ -1652,6 +1655,7 @@
 			description: ["{quests.steam_age.fuel_sources.desc}"]
 			icon: "createdeco:decal_fire"
 			id: "753A53733C6DFA04"
+			shape: "circle"
 			subtitle: "{quests.steam_age.fuel_sources.subtitle}"
 			tasks: [{
 				id: "38A3F9A1D2F11EE3"
@@ -1675,6 +1679,30 @@
 			x: -3.5d
 			y: -2.0d
 		}
+		{
+			dependencies: ["2C35D4E01AEC02AA"]
+			description: ["{quests.steam_age.supers.desc}"]
+			icon: "gtceu:ulv_super_chest"
+			id: "671405A9F3A8DFDB"
+			optional: true
+			shape: "heart"
+			subtitle: "{quests.steam_age.supers.subtitle}"
+			tasks: [{
+				id: "5F5A6967B674C05A"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "or(item(gtceu:ulv_super_chest)item(gtceu:lv_super_chest)item(gtceu:mv_super_chest)item(gtceu:hv_super_chest)item(gtceu:ev_super_chest)item(gtceu:iv_quantum_chest)item(gtceu:luv_quantum_chest)item(gtceu:zpm_quantum_chest)item(gtceu:uv_quantum_chest)item(gtceu:uhv_quantum_chest)item(gtceu:ulv_super_tank)item(gtceu:lv_super_tank)item(gtceu:mv_super_tank)item(gtceu:hv_super_tank)item(gtceu:ev_super_tank)item(gtceu:iv_quantum_tank)item(gtceu:luv_quantum_tank)item(gtceu:zpm_quantum_tank)item(gtceu:uv_quantum_tank)item(gtceu:uhv_quantum_tank))"
+					}
+				}
+				title: "{quests.steam_age.supers.task}"
+				type: "item"
+			}]
+			title: "{quests.steam_age.supers.title}"
+			x: -12.0d
+			y: 13.0d
+		}
 	]
 	subtitle: ["{quests.steam_age.subtitle}"]
 	title: "{quests.steam_age}"

config/ftbquests/quests/chapters/questsstoneage.snbt

@@ -8,15 +8,7 @@
 	images: [
 		{
 			height: 1.0d
-			image: "tfc:item/grass_block_top"
-			rotation: 0.0d
-			width: 1.0d
-			x: -3.0d
-			y: 10.5d
-		}
-		{
-			height: 1.0d
-			image: "minecraft:block/blue_ice"
+			image: "ad_astra:textures/gui/sprites/snowflake.png"
 			rotation: 0.0d
 			width: 1.0d
 			x: -6.0d
@@ -24,36 +16,33 @@
 		}
 		{
 			height: 1.0d
-			image: "minecraft:block/lava_still"
+			image: "ad_astra:textures/gui/sprites/fire.png"
 			rotation: 0.0d
 			width: 1.0d
 			x: 0.0d
 			y: 10.5d
 		}
+		{
+			height: 1.0d
+			image: "tfc:textures/gui/book/icons/thermometer.png"
+			rotation: 0.0d
+			width: 1.0d
+			x: -3.0d
+			y: 10.5d
+		}
 	]
 	order_index: 0
-	quest_links: [
-		{
-			id: "409385C6F6640BEA"
-			linked_quest: "427814F6E9386772"
-			shape: "gear"
-			size: 4.0d
-			x: 0.0d
-			y: 0.0d
-		}
-		{
-			disable_toast: true
-			id: "40D0029A2097C68F"
-			linked_quest: "3D7B0F3134C30364"
-			shape: "octagon"
-			size: 3.0d
-			x: 4.5d
-			y: 0.0d
-		}
-	]
+	quest_links: [{
+		id: "409385C6F6640BEA"
+		linked_quest: "427814F6E9386772"
+		shape: "gear"
+		size: 4.0d
+		x: 4.0d
+		y: 0.0d
+	}]
 	quests: [
 		{
-			dependencies: ["3D7B0F3134C30364"]
+			dependencies: ["427814F6E9386772"]
 			description: [
 				"{quests.stone_age.find_rock.desc}"
 				"{@pagebreak}"
@@ -82,10 +71,11 @@
 			y: 0.0d
 		}
 		{
-			dependencies: ["3D7B0F3134C30364"]
+			dependencies: ["427814F6E9386772"]
 			description: ["{quests.stone_age.find_potable_water.desc}"]
 			icon: "createdeco:decal_fluid"
 			id: "1D40CAE675C4BB91"
+			shape: "circle"
 			size: 1.0d
 			subtitle: "{quests.stone_age.find_potable_water.subtitle}"
 			tasks: [{
@@ -96,7 +86,7 @@
 				type: "gamestage"
 			}]
 			title: "{quests.stone_age.find_potable_water.title}"
-			x: 4.5d
+			x: 4.0d
 			y: 6.0d
 		}
 		{
@@ -434,7 +424,7 @@
 				type: "item"
 			}]
 			title: "{quests.stone_age.water_jug.title}"
-			x: 7.0d
+			x: 6.5d
 			y: 6.0d
 		}
 		{
@@ -509,7 +499,7 @@
 				type: "item"
 			}]
 			title: "{quests.stone_age.leather_flask.title}"
-			x: 1.5d
+			x: 1.0d
 			y: 6.0d
 		}
 		{
@@ -540,7 +530,7 @@
 				type: "item"
 			}]
 			title: "{quests.stone_age.iron_flask.title}"
-			x: 2.5d
+			x: 2.0d
 			y: 8.0d
 		}
 		{
@@ -549,6 +539,7 @@
 			guide_page: "tfc:field_guide tfc:getting_started/pottery"
 			hide_dependency_lines: true
 			id: "021921B4D2044B3B"
+			shape: "diamond"
 			subtitle: "{quests.stone_age.find_clay.subtitle}"
 			tasks: [
 				{
@@ -601,7 +592,6 @@
 			guide_page: "tfc:field_guide tfc:getting_started/finding_ores"
 			hide_dependency_lines: true
 			id: "669F84C6A2A64145"
-			shape: "diamond"
 			subtitle: "{quests.stone_age.native_ores.subtitle}"
 			tasks: [{
 				id: "0B70FD35D2C27E4C"
@@ -1386,7 +1376,7 @@
 			guide_page: "tfc:field_guide tfc:mechanics/support_beams"
 			icon: "createdeco:decal_warning"
 			id: "618090A6D0D3B2F1"
-			shape: "diamond"
+			shape: "circle"
 			size: 1.0d
 			subtitle: "{quests.stone_age.hazards.subtitle}"
 			tasks: [{
@@ -1399,7 +1389,7 @@
 			y: 10.5d
 		}
 		{
-			dependencies: ["3D7B0F3134C30364"]
+			dependencies: ["427814F6E9386772"]
 			description: ["{quests.stone_age.foods.desc}"]
 			id: "0FB8FD84B13F10C6"
 			subtitle: "{quests.stone_age.foods.subtitle}"
@@ -1416,7 +1406,7 @@
 				type: "item"
 			}]
 			title: "{quests.stone_age.foods.title}"
-			x: 4.5d
+			x: 4.0d
 			y: -5.0d
 		}
 		{
@@ -1495,6 +1485,7 @@
 			guide_page: "tfc:field_guide tfc:getting_started/food_and_water 5"
 			icon: "minecraft:apple"
 			id: "749B3C8698D34E91"
+			shape: "circle"
 			size: 1.5d
 			subtitle: "{quests.stone_age.nutrition.subtitle}"
 			tasks: [{
@@ -1502,7 +1493,7 @@
 				type: "checkmark"
 			}]
 			title: "{quests.stone_age.nutrition.title}"
-			x: 3.0d
+			x: 2.5d
 			y: -5.0d
 		}
 		{
@@ -1666,7 +1657,7 @@
 				type: "item"
 			}]
 			title: "{quests.stone_age.leather.title}"
-			x: 1.5d
+			x: 1.0d
 			y: 13.5d
 		}
 		{
@@ -1688,28 +1679,37 @@
 				type: "checkmark"
 			}]
 			title: "{quests.stone_age.hydration.title}"
-			x: 6.0d
+			x: 5.5d
 			y: 4.5d
 		}
 		{
-			dependencies: ["3D7B0F3134C30364"]
+			dependencies: ["427814F6E9386772"]
 			description: ["{quests.stone_age.temperature.desc}"]
 			icon: "minecraft:sunflower"
 			id: "38839D3E049215CE"
+			shape: "circle"
 			subtitle: "{quests.stone_age.temperature.subtitle}"
 			tasks: [{
 				id: "5EF087A092F21202"
 				type: "checkmark"
 			}]
 			title: "{quests.stone_age.temperature.title}"
-			x: 1.0d
+			x: 0.5d
 			y: 3.0d
 		}
 		{
 			dependencies: ["38839D3E049215CE"]
 			description: ["{quests.stone_age.insulation.desc}"]
+			icon: {
+				Count: 1
+				id: "tfcambiental:straw_hat"
+				tag: {
+					Damage: 0
+				}
+			}
 			id: "4521BB8892B386AF"
-			size: 2.0d
+			shape: "circle"
+			size: 1.5d
 			subtitle: "{quests.stone_age.insulation.subtitle}"
 			tasks: [{
 				id: "139FA72AB6F06E57"
@@ -1834,7 +1834,7 @@
 				type: "item"
 			}]
 			title: "{quests.stone_age.glass_bottles.title}"
-			x: 6.5d
+			x: 6.0d
 			y: 8.0d
 		}
 		{
@@ -1848,7 +1848,7 @@
 				type: "checkmark"
 			}]
 			title: "{quests.stone_age.water_bucket.title}"
-			x: 4.5d
+			x: 4.0d
 			y: 9.0d
 		}
 		{

config/ftbquests/quests/chapters/space_survival.snbt

@@ -822,6 +822,7 @@
 			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.space_survival.spice.desc}"]
+			icon: "tfg:spice"
 			id: "0CA5B715B76E4A5B"
 			shape: "hexagon"
 			size: 1.5d
@@ -1108,15 +1109,23 @@
 				Count: 1
 				ForgeCaps: {
 					"tfc:food": {
-						creationDate: -9223372036854775808L
+						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: [ ]
 					}
-					"tfc:item_heat": {
-						heat: 0.0f
-						ticks: 0L
-					}
 				}
-				id: "betterend:cave_pumpkin_pie"
+				id: "tfg:food/cooked_dino_nugget"
 			}
 			id: "1AC201876984D248"
 			optional: true

config/ftbquests/quests/chapters/tips__tools.snbt

@@ -84,7 +84,7 @@
 		{
 			dependencies: [
 				"125563A12EE5C296"
-				"5088768AAA28FCBA"
+				"56CA2EB7812529C5"
 			]
 			description: ["{quests.tfg_tips.red_steel_backpack.desc}"]
 			id: "4B79026C8D2DACC4"
@@ -1170,6 +1170,7 @@
 			dependencies: ["037CDA933FBE2CBE"]
 			description: ["{quests.tfg_tips.olive_oil.desc}"]
 			id: "13FC17F88DFEB8A8"
+			optional: true
 			size: 1.5d
 			subtitle: "{quests.tfg_tips.olive_oil.subtitle}"
 			tasks: [{
@@ -1231,9 +1232,13 @@
 			y: 12.0d
 		}
 		{
-			dependencies: ["037CDA933FBE2CBE"]
+			dependencies: [
+				"037CDA933FBE2CBE"
+				"5B2696206205CB2E"
+			]
 			description: ["{quests.tfg_tips.glowstone_lamp.desc}"]
 			id: "61F58B402F1AE40B"
+			optional: true
 			shape: "heart"
 			size: 2.0d
 			subtitle: "{quests.tfg_tips.glowstone_lamp.subtitle}"
@@ -1256,6 +1261,7 @@
 			dependencies: ["037CDA933FBE2CBE"]
 			description: ["{quests.tfg_tips.tallow.desc}"]
 			id: "54E6994D5CC693A7"
+			optional: true
 			size: 1.15d
 			subtitle: "{quests.tfg_tips.tallow.subtitle}"
 			tasks: [{
@@ -1278,6 +1284,7 @@
 			dependencies: ["037CDA933FBE2CBE"]
 			description: ["{quests.tfg_tips.creosote.desc}"]
 			id: "72C1E430FF6D2DD8"
+			optional: true
 			size: 1.0d
 			subtitle: "{quests.tfg_tips.creosote.subtitle}"
 			tasks: [{
@@ -1304,6 +1311,7 @@
 			description: ["{quests.tfg_tips.lava_lamp.desc}"]
 			icon: "minecraft:lava_bucket"
 			id: "4EBABACAB444244D"
+			optional: true
 			shape: "square"
 			size: 1.75d
 			subtitle: "{quests.tfg_tips.lava_lamp.subtitle}"
@@ -2447,6 +2455,7 @@
 			dependencies: ["037CDA933FBE2CBE"]
 			description: ["{quests.tfg_tips.tools_tips.seed_oil.desc}"]
 			id: "30B9137740247627"
+			optional: true
 			size: 1.25d
 			subtitle: "{quests.tfg_tips.tools_tips.seed_oil.subtitle}"
 			tasks: [{
@@ -2469,6 +2478,7 @@
 			dependencies: ["037CDA933FBE2CBE"]
 			description: ["{quests.tfg_tips.tools_tips.soybean_oil.desc}"]
 			id: "6C0A087006DF8679"
+			optional: true
 			size: 1.25d
 			subtitle: "{quests.tfg_tips.tools_tips.soybean_oil.subtitle}"
 			tasks: [{

defaultconfigs/createhorsepower-server.toml

@@ -1,34 +1,34 @@
-
-#General Settings
-[general]
-	#Base rpm creatures can spin the horse crank.
-	#Range: > 1
-	creatureRPMRange = 16
-	#How much stress small creatures can produce for the horse crank.
-	#Range: > 1
-	smallCreatureStressRange = 8
-	#How much stress medium creatures can produce for the horse crank.
-	#Range: > 1
-	mediumCreatureStressRange = 12
-	#How much stress large creatures can produce for the horse crank.
-	#Range: > 1
-	largeCreatureStressRange = 16
-
-#Path Category
-[paths]
-	#Types of blocks valid as "Poor" quality,
-	poor_path_block = ["tfc:rooted_dirt/sandy_loam", "tfc:clay/sandy_loam", "tfc:dirt/sandy_loam", "tfc:rooted_dirt/loam", "tfc:clay/loam", "tfc:clay/silt", "tfc:dirt/loam", "tfc:rooted_dirt/silt", "tfc:dirt/silt", "tfc:dirt/silty_loam", "tfc:clay/silty_loam", "tfc:rooted_dirt/silty_loam", "tfc:peat_grass", "tfc:clay_grass/silty_loam", "tfc:grass/silty_loam", "tfc:clay_grass/sandy_loam", "tfc:grass/sandy_loam", "tfc:clay_grass/loam", "tfc:grass/loam", "tfc:clay_grass/silt", "tfc:grass/silt", "tfg:grass/mars_dirt", "tfg:grass/sangnum_mycelium", "tfg:grass/amber_mycelium", "tfg:grass/rusticus_mycelium", "tfg:grass/sangnum_clay_mycelium", "tfg:grass/amber_clay_mycelium", "tfg:grass/rusticus_clay_mycelium", "tfg:grass/sangnum_kaolin_mycelium", "tfg:grass/amber_kaolin_mycelium", "tfg:grass/rusticus_kaolin_mycelium"]
-	#Types of blocks valid as "Normal" quality,
-	normal_path_block = ["tfc:rock/gravel/granite", "tfc:rock/gravel/diorite", "tfc:rock/gravel/gabbro", "tfc:rock/gravel/shale", "tfc:rock/gravel/claystone", "tfc:rock/gravel/limestone", "tfc:rock/gravel/conglomerate", "tfc:rock/gravel/dolomite", "tfc:rock/gravel/chert", "tfc:rock/gravel/schist", "tfc:rock/gravel/phyllite", "tfc:rock/gravel/slate", "tfc:rock/gravel/quartzite", "tfc:rock/gravel/dacite", "tfc:rock/gravel/andesite", "tfc:rock/gravel/basalt", "tfc:rock/gravel/rhyolite", "tfc:rock/gravel/chalk", "tfc:rock/gravel/marble", "tfg:rock/gravel_dripstone", "tfg:rock/gravel_deepslate", "tfg:rock/gravel_blackstone", "tfg:rock/gravel_moon", "tfg:rock/gravel_moon_deepslate", "tfg:rock/gravel_glacio", "tfg:rock/gravel_mars", "tfg:rock/gravel_venus", "tfg:rock/gravel_mercury", "tfg:rock/gravel_crackrack", "tfc:grass_path/silt", "tfc:grass_path/loam", "tfc:grass_path/sandy_loam", "tfc:grass_path/silty_loam", "tfg:grass/mars_path", "rnr:hoggin"]
-	#Types of blocks valid as "Great" quality,
-	great_path_block = ["rnr:rock/gravel_road/chert", "rnr:rock/gravel_road/chalk", "rnr:rock/gravel_road/rhyolite", "rnr:rock/gravel_road/basalt", "rnr:rock/gravel_road/andesite", "rnr:rock/gravel_road/claystone", "rnr:rock/gravel_road/limestone", "rnr:rock/gravel_road/conglomerate", "rnr:rock/gravel_road/dolomite", "rnr:rock/sett_road/granite", "rnr:rock/sett_road/diorite", "rnr:rock/sett_road/chalk", "rnr:rock/sett_road/rhyolite", "rnr:rock/sett_road/basalt", "rnr:rock/sett_road/quartzite", "rnr:rock/sett_road/dacite", "rnr:rock/sett_road/andesite", "rnr:rock/cobbled_road/chert", "rnr:rock/cobbled_road/dolomite", "rnr:rock/gravel_road/granite", "rnr:rock/gravel_road/marble", "rnr:rock/gravel_road/schist", "rnr:rock/gravel_road/phyllite", "rnr:rock/gravel_road/slate", "rnr:rock/gravel_road/quartzite", "rnr:rock/gravel_road/dacite", "rnr:rock/macadam_road/rhyolite", "rnr:rock/macadam_road/chalk", "rnr:rock/macadam_road/chert", "rnr:rock/macadam_road/dolomite", "rnr:rock/macadam_road/conglomerate", "rnr:rock/macadam_road/limestone", "rnr:rock/macadam_road/gabbro", "rnr:rock/macadam_road/claystone", "rnr:rock/macadam_road/shale", "rnr:rock/macadam_road/gneiss", "rnr:rock/macadam_road/marble", "rnr:rock/macadam_road/schist", "rnr:rock/macadam_road/phyllite", "rnr:rock/macadam_road/slate", "rnr:rock/macadam_road/quartzite", "rnr:rock/macadam_road/dacite", "rnr:rock/macadam_road/andesite", "rnr:rock/macadam_road/basalt", "rnr:rock/gravel_road/diorite", "rnr:rock/gravel_road/gabbro", "rnr:rock/gravel_road/shale", "rnr:rock/macadam_road/diorite", "rnr:rock/macadam_road/granite", "rnr:rock/cobbled_road/conglomerate", "rnr:rock/cobbled_road/limestone", "rnr:rock/cobbled_road/claystone", "rnr:rock/cobbled_road/shale", "rnr:rock/cobbled_road/gabbro", "rnr:rock/cobbled_road/diorite", "rnr:rock/cobbled_road/granite", "rnr:rock/cobbled_road/phyllite", "rnr:rock/cobbled_road/schist", "rnr:rock/cobbled_road/slate", "rnr:rock/cobbled_road/quartzite", "rnr:rock/cobbled_road/dacite", "rnr:rock/cobbled_road/andesite", "rnr:rock/cobbled_road/rhyolite", "rnr:rock/cobbled_road/basalt", "rnr:rock/cobbled_road/chalk", "rnr:rock/cobbled_road/gneiss", "rnr:rock/cobbled_road/marble", "rnr:rock/sett_road/chert", "rnr:rock/sett_road/dolomite", "rnr:rock/sett_road/conglomerate", "rnr:rock/sett_road/limestone", "rnr:rock/sett_road/claystone", "rnr:rock/sett_road/shale", "rnr:rock/sett_road/gabbro", "rnr:rock/flagstones/gneiss", "rnr:rock/flagstones/marble", "rnr:black_sandstone_flagstones", "rnr:brown_sandstone_flagstones", "rnr:green_sandstone_flagstones", "rnr:pink_sandstone_flagstones", "rnr:red_sandstone_flagstones", "rnr:white_sandstone_flagstones", "rnr:yellow_sandstone_flagstones", "rnr:concrete_road_sett", "rnr:brick_road", "rnr:rock/sett_road/marble", "rnr:rock/sett_road/gneiss", "rnr:rock/sett_road/schist", "rnr:rock/sett_road/phyllite", "rnr:rock/sett_road/slate", "rnr:rock/sett_road/quartzite", "rnr:rock/sett_road/dacite", "rnr:rock/flagstones/chert", "rnr:rock/flagstones/dolomite", "rnr:rock/flagstones/conglomerate", "rnr:rock/flagstones/limestone", "rnr:rock/flagstones/claystone", "rnr:rock/flagstones/shale", "rnr:rock/flagstones/gabbro", "rnr:rock/flagstones/diorite", "rnr:rock/flagstones/granite", "rnr:rock/flagstones/schist", "rnr:rock/flagstones/phyllite", "rnr:rock/flagstones/slate", "rnr:rock/flagstones/quartzite", "rnr:rock/flagstones/andesite", "rnr:rock/flagstones/dacite", "rnr:rock/flagstones/basalt", "rnr:rock/flagstones/rhyolite", "rnr:rock/flagstones/chalk"]
-
-#Creature Category
-[workers]
-	#Valid "Small" creatures
-	small_creatures = ["tfc:wolf", "tfc:dog", "tfc:pig", "tfc:sheep", "tfc:goat", "tfc:alpaca", "tfg:glacian_ram", "tfg:wraptor", "species:springaling", "tfg:surfer"]
-	#Valid "Medium" creatures
-	medium_creatures = ["tfc:cow", "tfc:donkey", "tfc:dolphin", "wan_ancient_beasts:glider", "wan_ancient_beasts:soarer"]
-	#Valid "Large" creatures
-	large_creatures = ["tfc:horse", "tfc:mule", "tfc:musk_ox", "tfc:yak", "tfg:sniffer", "wan_ancient_beasts:walker", "species:cruncher"]
+#Base rpm creatures can spin the horse crank.
+#Range: > 1
+creatureRPMRange = 16
+#How much stress small creatures can produce for the horse crank.
+#Range: > 1
+smallCreatureStressRange = 8
+#How much stress medium creatures can produce for the horse crank.
+#Range: > 1
+mediumCreatureStressRange = 12
+#How much stress large creatures can produce for the horse crank.
+#Range: > 1
+largeCreatureStressRange = 16
+#The multiplier for "Poor" paths
+#Range: 0.0 ~ 1.7976931348623157E308
+poorMultiplier = 0.5
+#The multiplier for "Normal" paths
+#Range: 0.0 ~ 1.7976931348623157E308
+normalMultiplier = 1.0
+#The multiplier for "Great" paths
+#Range: 0.0 ~ 1.7976931348623157E308
+greatMultiplier = 2.0
+#Types of blocks valid as "Poor" quality
+poorPathBlock = ["tfc:rooted_dirt/sandy_loam", "tfc:clay/sandy_loam", "tfc:dirt/sandy_loam", "tfc:rooted_dirt/loam", "tfc:clay/loam", "tfc:clay/silt", "tfc:dirt/loam", "tfc:rooted_dirt/silt", "tfc:dirt/silt", "tfc:dirt/silty_loam", "tfc:clay/silty_loam", "tfc:rooted_dirt/silty_loam", "tfc:peat_grass", "tfc:clay_grass/silty_loam", "tfc:grass/silty_loam", "tfc:clay_grass/sandy_loam", "tfc:grass/sandy_loam", "tfc:clay_grass/loam", "tfc:grass/loam", "tfc:clay_grass/silt", "tfc:grass/silt", "tfg:grass/mars_dirt", "tfg:grass/sangnum_mycelium", "tfg:grass/amber_mycelium", "tfg:grass/rusticus_mycelium", "tfg:grass/sangnum_clay_mycelium", "tfg:grass/amber_clay_mycelium", "tfg:grass/rusticus_clay_mycelium", "tfg:grass/sangnum_kaolin_mycelium", "tfg:grass/amber_kaolin_mycelium", "tfg:grass/rusticus_kaolin_mycelium"]
+#Types of blocks valid as "Normal" quality
+normalPathBlock = ["tfc:rock/gravel/granite", "tfc:rock/gravel/diorite", "tfc:rock/gravel/gabbro", "tfc:rock/gravel/shale", "tfc:rock/gravel/claystone", "tfc:rock/gravel/limestone", "tfc:rock/gravel/conglomerate", "tfc:rock/gravel/dolomite", "tfc:rock/gravel/chert", "tfc:rock/gravel/schist", "tfc:rock/gravel/phyllite", "tfc:rock/gravel/slate", "tfc:rock/gravel/quartzite", "tfc:rock/gravel/dacite", "tfc:rock/gravel/andesite", "tfc:rock/gravel/basalt", "tfc:rock/gravel/rhyolite", "tfc:rock/gravel/chalk", "tfc:rock/gravel/marble", "tfg:rock/gravel_dripstone", "tfg:rock/gravel_deepslate", "tfg:rock/gravel_blackstone", "tfg:rock/gravel_moon", "tfg:rock/gravel_moon_deepslate", "tfg:rock/gravel_glacio", "tfg:rock/gravel_mars", "tfg:rock/gravel_venus", "tfg:rock/gravel_mercury", "tfg:rock/gravel_crackrack", "tfc:grass_path/silt", "tfc:grass_path/loam", "tfc:grass_path/sandy_loam", "tfc:grass_path/silty_loam", "tfg:grass/mars_path", "rnr:hoggin"]
+#Types of blocks valid as "Great" quality
+greatPathBlock = ["rnr:rock/gravel_road/chert", "rnr:rock/gravel_road/chalk", "rnr:rock/gravel_road/rhyolite", "rnr:rock/gravel_road/basalt", "rnr:rock/gravel_road/andesite", "rnr:rock/gravel_road/claystone", "rnr:rock/gravel_road/limestone", "rnr:rock/gravel_road/conglomerate", "rnr:rock/gravel_road/dolomite", "rnr:rock/sett_road/granite", "rnr:rock/sett_road/diorite", "rnr:rock/sett_road/chalk", "rnr:rock/sett_road/rhyolite", "rnr:rock/sett_road/basalt", "rnr:rock/sett_road/quartzite", "rnr:rock/sett_road/dacite", "rnr:rock/sett_road/andesite", "rnr:rock/cobbled_road/chert", "rnr:rock/cobbled_road/dolomite", "rnr:rock/gravel_road/granite", "rnr:rock/gravel_road/marble", "rnr:rock/gravel_road/schist", "rnr:rock/gravel_road/phyllite", "rnr:rock/gravel_road/slate", "rnr:rock/gravel_road/quartzite", "rnr:rock/gravel_road/dacite", "rnr:rock/macadam_road/rhyolite", "rnr:rock/macadam_road/chalk", "rnr:rock/macadam_road/chert", "rnr:rock/macadam_road/dolomite", "rnr:rock/macadam_road/conglomerate", "rnr:rock/macadam_road/limestone", "rnr:rock/macadam_road/gabbro", "rnr:rock/macadam_road/claystone", "rnr:rock/macadam_road/shale", "rnr:rock/macadam_road/gneiss", "rnr:rock/macadam_road/marble", "rnr:rock/macadam_road/schist", "rnr:rock/macadam_road/phyllite", "rnr:rock/macadam_road/slate", "rnr:rock/macadam_road/quartzite", "rnr:rock/macadam_road/dacite", "rnr:rock/macadam_road/andesite", "rnr:rock/macadam_road/basalt", "rnr:rock/gravel_road/diorite", "rnr:rock/gravel_road/gabbro", "rnr:rock/gravel_road/shale", "rnr:rock/macadam_road/diorite", "rnr:rock/macadam_road/granite", "rnr:rock/cobbled_road/conglomerate", "rnr:rock/cobbled_road/limestone", "rnr:rock/cobbled_road/claystone", "rnr:rock/cobbled_road/shale", "rnr:rock/cobbled_road/gabbro", "rnr:rock/cobbled_road/diorite", "rnr:rock/cobbled_road/granite", "rnr:rock/cobbled_road/phyllite", "rnr:rock/cobbled_road/schist", "rnr:rock/cobbled_road/slate", "rnr:rock/cobbled_road/quartzite", "rnr:rock/cobbled_road/dacite", "rnr:rock/cobbled_road/andesite", "rnr:rock/cobbled_road/rhyolite", "rnr:rock/cobbled_road/basalt", "rnr:rock/cobbled_road/chalk", "rnr:rock/cobbled_road/gneiss", "rnr:rock/cobbled_road/marble", "rnr:rock/sett_road/chert", "rnr:rock/sett_road/dolomite", "rnr:rock/sett_road/conglomerate", "rnr:rock/sett_road/limestone", "rnr:rock/sett_road/claystone", "rnr:rock/sett_road/shale", "rnr:rock/sett_road/gabbro", "rnr:rock/flagstones/gneiss", "rnr:rock/flagstones/marble", "rnr:black_sandstone_flagstones", "rnr:brown_sandstone_flagstones", "rnr:green_sandstone_flagstones", "rnr:pink_sandstone_flagstones", "rnr:red_sandstone_flagstones", "rnr:white_sandstone_flagstones", "rnr:yellow_sandstone_flagstones", "rnr:concrete_road_sett", "rnr:brick_road", "rnr:rock/sett_road/marble", "rnr:rock/sett_road/gneiss", "rnr:rock/sett_road/schist", "rnr:rock/sett_road/phyllite", "rnr:rock/sett_road/slate", "rnr:rock/sett_road/quartzite", "rnr:rock/sett_road/dacite", "rnr:rock/flagstones/chert", "rnr:rock/flagstones/dolomite", "rnr:rock/flagstones/conglomerate", "rnr:rock/flagstones/limestone", "rnr:rock/flagstones/claystone", "rnr:rock/flagstones/shale", "rnr:rock/flagstones/gabbro", "rnr:rock/flagstones/diorite", "rnr:rock/flagstones/granite", "rnr:rock/flagstones/schist", "rnr:rock/flagstones/phyllite", "rnr:rock/flagstones/slate", "rnr:rock/flagstones/quartzite", "rnr:rock/flagstones/andesite", "rnr:rock/flagstones/dacite", "rnr:rock/flagstones/basalt", "rnr:rock/flagstones/rhyolite", "rnr:rock/flagstones/chalk", "greate:andesite_shaft", "greate:steel_shaft", "greate:andesite_cogwheel", "greate:steel_cogwheel", "greate:large_andesite_cogwheel", "greate:large_steel_cogwheel"]
+#Valid "Small" creatures
+smallCreatures = ["tfc:wolf", "tfc:dog", "tfc:pig", "tfc:sheep", "tfc:goat", "tfc:alpaca", "tfg:glacian_ram", "tfg:wraptor", "species:springaling", "tfg:surfer"]
+#Valid "Medium" creatures
+mediumCreatures = ["tfc:cow", "tfc:donkey", "tfc:dolphin", "wan_ancient_beasts:glider", "wan_ancient_beasts:soarer"]
+#Valid "Large" creatures
+largeCreatures = ["tfc:horse", "tfc:mule", "tfc:musk_ox", "tfc:yak", "tfg:sniffer", "wan_ancient_beasts:walker", "species:cruncher"]
 

kubejs/assets/gtceu/lang/en_us.json

@@ -132,7 +132,6 @@
   "material.gtceu.damascus_steel": "Swine-steel",
   "material.gtceu.air": "Earth Air",
   "material.gtceu.liquid_air": "Liquid Earth Air",
-  "material.gtceu.fish_oil": "Tallowate",
   "material.gtceu.cooperite": "Cooperite",
   "material.gtceu.armalcolite": "Armalcolite",
   "material.gtceu.desh": "Desh",
@@ -206,6 +205,7 @@
   "gtceu.jei.bedrock_fluid.heavy_ammoniacal_water": "Martian Heavy Ammoniacal Water",
   "gtceu.jei.bedrock_fluid.liquid_ice": "Martian Ice",
   "gtceu.recipe.category.ingot_molding": "Material Molding",
+  "block.gtceu.wire_coil.tooltip_cracking": "§8Cracking Unit, Coal Liquefaction Tower,§r\n§8Moon and Ostrum Harvesters:§r",
   "tagprefix.sword_head": "%s Sword Head",
   "tagprefix.pickaxe_head": "%s Pickaxe Head",
   "tagprefix.shovel_head": "%s Shovel Head",

kubejs/assets/gtceu/lang/zh_cn.json

@@ -13,8 +13,8 @@
   "block.gtceu.evaporation_tower": "蒸发塔",
   "block.gtceu.ostrum_harvester": "紫金采集器",
   "block.gtceu.moon_dust_harvester": "月壤采集器",
-  "block.gtceu.coal_liquefaction_tower": "煤炭液化塔",
   "block.tfg.ostrum_linear_accelerator": "紫金线性加速器",
+  "block.gtceu.coal_liquefaction_tower": "煤炭液化塔",
   "block.gtceu.ulv_super_tank": "基础超级缸",
   "block.gtceu.ulv_super_chest": "基础超级箱",
   "block.gtceu.ulv_hermetic_casing": "基础密封机械方块",
@@ -63,6 +63,8 @@
   "gtceu.tooltip.machine.nuclear_fuel_factory_2": "§7将原始放射性材料加工成裂变燃料§r",
   "gtceu.tooltip.machine.steam_bloomery_1": "§7用蒸汽动力升级你的锻铁炉！§r",
   "gtceu.tooltip.machine.steam_bloomery_2": "§7将含铁矿粉或锭加工成生铁方坯。\n使用焦煤或无烟煤可倍增产量。\n支持最多8组配方并行处理，相应调整蒸汽需求。§r",
+  "gtceu.tooltip.machine.coal_liquefaction_tower_1": "§7碳素奶昔制造机§r",
+  "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7从碳质固体与杂酚油中提取气体燃料§r",
   "item.gtceu.tiny_wood_dust": "小撮软木浆",
   "item.gtceu.small_wood_dust": "小堆软木浆",
   "item.gtceu.wood_dust": "软木浆",
@@ -130,14 +132,13 @@
   "material.gtceu.damascus_steel": "猪灵钢",
   "material.gtceu.air": "地球空气",
   "material.gtceu.liquid_air": "液态地球空气",
-  "material.gtceu.fish_oil": "脂酸盐",
   "material.gtceu.cooperite": "硫铂矿",
   "material.gtceu.armalcolite": "阿姆阿尔柯尔矿",
   "material.gtceu.desh": "戴斯",
   "material.gtceu.ostrum": "紫金",
   "material.gtceu.calorite": "耐热金属",
   "material.gtceu.etrium": "埃忒恩",
-  "material.gtceu.tarkianite": "塔基安石",
+  "material.gtceu.tarkianite": "塔基安矿",
   "material.gtceu.aluminium_silicate": "硅酸铝",
   "material.gtceu.rocket_alloy_t1": "R型铝钢火箭合金",
   "material.gtceu.rocket_alloy_t2": "ASM 4914 钛合金火箭合金",
@@ -204,7 +205,7 @@
   "gtceu.jei.bedrock_fluid.heavy_ammoniacal_water": "火星重氨水",
   "gtceu.jei.bedrock_fluid.liquid_ice": "火星冰",
   "gtceu.recipe.category.ingot_molding": "压模",
-  "tagprefix.sword_head": "%s剑头",
+  "tagprefix.sword_head": "%s剑身",
   "tagprefix.pickaxe_head": "%s镐头",
   "tagprefix.shovel_head": "%s铲头",
   "tagprefix.axe_head": "%s斧头",
@@ -214,13 +215,13 @@
   "tagprefix.hammer_head": "%s锤头",
   "tagprefix.saw_head": "%s锯头",
   "tagprefix.knife_head": "%s刀头",
-  "tagprefix.butchery_knife_head": "%s屠刀头",
+  "tagprefix.butchery_knife_head": "%s屠宰刀头",
   "tagprefix.mining_hammer_head": "%s采矿锤头",
   "tagprefix.spade_head": "%s锹头",
   "tagprefix.double_ingot": "%s双锭",
-  "tagprefix.poor_raw": "贫瘠%s原矿",
-  "tagprefix.rich_raw": "富集%s原矿",
-  "tagprefix.dusty_raw": "积尘%s原矿",
+  "tagprefix.poor_raw": "贫瘠粗%s",
+  "tagprefix.rich_raw": "富集粗%s",
+  "tagprefix.dusty_raw": "积尘粗%s",
   "tagprefix.gabbro": "辉长岩%s矿石",
   "tagprefix.shale": "页岩%s矿石",
   "tagprefix.claystone": "黏土岩%s矿石",

kubejs/assets/gtceu/models/block/cube_3_layer/all.json

@@ -0,0 +1,24 @@
+{
+  "parent": "gtceu:block/cube_3_layer/default",
+  "textures": {
+    "particle": "#bot_all",
+    "bot_down": "#bot_all",
+    "bot_up": "#bot_all",
+    "bot_north": "#bot_all",
+    "bot_east": "#bot_all",
+    "bot_south": "#bot_all",
+    "bot_west": "#bot_all",
+    "mid_down": "#mid_all",
+    "mid_up": "#mid_all",
+    "mid_north": "#mid_all",
+    "mid_east": "#mid_all",
+    "mid_south": "#mid_all",
+    "mid_west": "#mid_all",
+    "top_down": "#top_all",
+    "top_up": "#top_all",
+    "top_north": "#top_all",
+    "top_east": "#top_all",
+    "top_south": "#top_all",
+    "top_west": "#top_all"
+  }
+}

kubejs/assets/gtceu/models/block/cube_3_layer/all_translucent.json

@@ -0,0 +1,25 @@
+{
+  "parent": "gtceu:block/cube_3_layer/default",
+  "render_type": "translucent",
+  "textures": {
+    "particle": "#bot_all",
+    "bot_down": "#bot_all",
+    "bot_up": "#bot_all",
+    "bot_north": "#bot_all",
+    "bot_east": "#bot_all",
+    "bot_south": "#bot_all",
+    "bot_west": "#bot_all",
+    "mid_down": "#mid_all",
+    "mid_up": "#mid_all",
+    "mid_north": "#mid_all",
+    "mid_east": "#mid_all",
+    "mid_south": "#mid_all",
+    "mid_west": "#mid_all",
+    "top_down": "#top_all",
+    "top_up": "#top_all",
+    "top_north": "#top_all",
+    "top_east": "#top_all",
+    "top_south": "#top_all",
+    "top_west": "#top_all"
+  }
+}

kubejs/assets/gtceu/models/block/cube_3_layer/default.json

@@ -0,0 +1,43 @@
+{
+  "parent": "block/block",
+  "elements": [
+    {
+      "from": [  0,  0,  0 ],
+      "to":   [ 16, 16, 16 ],
+      "faces": {
+        "down":  { "texture": "#bot_down", "cullface": "down", "tintindex": 0 },
+        "up":    { "texture": "#bot_up", "cullface": "up", "tintindex": 0 },
+        "north": { "texture": "#bot_north", "cullface": "north", "tintindex": 0 },
+        "south": { "texture": "#bot_south", "cullface": "south", "tintindex": 0 },
+        "west":  { "texture": "#bot_west", "cullface": "west", "tintindex": 0 },
+        "east":  { "texture": "#bot_east", "cullface": "east", "tintindex": 0 }
+      }
+    },
+    {
+      "from": [  0,  0,  0 ],
+      "to":   [ 16, 16, 16 ],
+      "shade": false,
+      "faces": {
+        "down":  { "texture": "#mid_down", "cullface": "down", "tintindex": 1 },
+        "up":    { "texture": "#mid_up", "cullface": "up", "tintindex": 1 },
+        "north": { "texture": "#mid_north", "cullface": "north", "tintindex": 1 },
+        "south": { "texture": "#mid_south", "cullface": "south", "tintindex": 1 },
+        "west":  { "texture": "#mid_west", "cullface": "west", "tintindex": 1 },
+        "east":  { "texture": "#mid_east", "cullface": "east", "tintindex": 1 }
+      }
+    },
+    {
+      "from": [  0,  0,  0 ],
+      "to":   [ 16, 16, 16 ],
+      "shade": false,
+      "faces": {
+        "down":  { "texture": "#top_down", "cullface": "down", "tintindex": 2 },
+        "up":    { "texture": "#top_up", "cullface": "up", "tintindex": 2 },
+        "north": { "texture": "#top_north", "cullface": "north", "tintindex": 2 },
+        "south": { "texture": "#top_south", "cullface": "south", "tintindex": 2 },
+        "west":  { "texture": "#top_west", "cullface": "west", "tintindex": 2 },
+        "east":  { "texture": "#top_east", "cullface": "east", "tintindex": 2 }
+      }
+    }
+  ]
+}

kubejs/assets/gtceu/models/block/material_sets/chonky/block.json

@@ -0,0 +1,8 @@
+{
+  "parent": "gtceu:block/cube_3_layer/all",
+  "textures": {
+    "bot_all": "gtceu:block/material_sets/chonky/block",
+    "mid_all": "gtceu:block/material_sets/chonky/block_secondary",
+    "top_all": "gtceu:block/material_sets/chonky/block_overlay"
+  }
+}

kubejs/assets/gtceu/models/block/material_sets/chonky/frame_gt.json

@@ -0,0 +1,8 @@
+{
+  "parent": "gtceu:block/cube_3_layer/all_translucent",
+  "textures": {
+    "bot_all": "gtceu:block/material_sets/chonky/frame_gt",
+    "mid_all": "gtceu:block/material_sets/chonky/frame_gt_secondary",
+    "top_all": "gtceu:block/material_sets/chonky/frame_gt_overlay"
+  }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/block.json

@@ -0,0 +1,3 @@
+{
+    "parent": "gtceu:item/material_sets/chonky/block"
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/bolt.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/bolt",
+        "layer1": "gtceu:item/material_sets/chonky/bolt_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/bolt_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/foil.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/foil",
+        "layer1": "gtceu:item/material_sets/chonky/foil_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/foil_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/frame_gt.json

@@ -0,0 +1,3 @@
+{
+    "parent": "gtceu:item/material_sets/chonky/frame_gt"
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/gear.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/gear",
+        "layer1": "gtceu:item/material_sets/chonky/gear_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/gear_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/gear_small.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/gear_small",
+        "layer1": "gtceu:item/material_sets/chonky/gear_small_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/gear_small_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/ingot.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/ingot",
+        "layer1": "gtceu:item/material_sets/chonky/ingot_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/ingot_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/ingot_double.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/ingot_double",
+        "layer1": "gtceu:item/material_sets/chonky/ingot_double_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/ingot_double_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/ingot_hot.json

@@ -0,0 +1,9 @@
+{
+    "parent": "gtceu:item/material_sets/chonky/ingot",
+    "textures": {
+        "layer0":"gtceu:item/material_sets/chonky/ingot",
+        "layer1":"gtceu:item/material_sets/chonky/ingot_secondary",
+        "layer2":"gtceu:item/material_sets/chonky/ingot_overlay",
+        "layer3":"gtceu:item/material_sets/chonky/ingot_hot_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/nugget.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/nugget",
+        "layer1": "gtceu:item/material_sets/chonky/nugget_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/nugget_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/plate.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/plate",
+        "layer1": "gtceu:item/material_sets/chonky/plate_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/plate_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/plate_dense.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/plate_dense",
+        "layer1": "gtceu:item/material_sets/chonky/plate_dense_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/plate_dense_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/plate_double.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/plate_double",
+        "layer1": "gtceu:item/material_sets/chonky/plate_double_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/plate_double_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/ring.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/ring",
+        "layer1": "gtceu:item/material_sets/chonky/ring_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/ring_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/rod.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/rod",
+        "layer1": "gtceu:item/material_sets/chonky/rod_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/rod_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/rod_long.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/rod_long",
+        "layer1": "gtceu:item/material_sets/chonky/rod_long_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/rod_long_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/rotor.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/rotor",
+        "layer1": "gtceu:item/material_sets/chonky/rotor_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/rotor_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/round.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/round",
+        "layer1": "gtceu:item/material_sets/chonky/round_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/round_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/screw.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/screw",
+        "layer1": "gtceu:item/material_sets/chonky/screw_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/screw_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/spring.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/spring",
+        "layer1": "gtceu:item/material_sets/chonky/spring_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/spring_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/spring_small.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/spring_small",
+        "layer1": "gtceu:item/material_sets/chonky/spring_small_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/spring_small_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/tool_head_buzz_saw.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/tool_head_buzz_saw",
+        "layer1": "gtceu:item/material_sets/chonky/tool_head_buzz_saw_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/tool_head_buzz_saw_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/tool_head_chainsaw.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/tool_head_chainsaw",
+        "layer1": "gtceu:item/material_sets/chonky/tool_head_chainsaw_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/tool_head_chainsaw_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/tool_head_drill.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/tool_head_drill",
+        "layer1": "gtceu:item/material_sets/chonky/tool_head_drill_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/tool_head_drill_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/tool_head_screwdriver.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/tool_head_screwdriver",
+        "layer1": "gtceu:item/material_sets/chonky/tool_head_screwdriver_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/tool_head_screwdriver_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/tool_head_wrench.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/tool_head_wrench",
+        "layer1": "gtceu:item/material_sets/chonky/tool_head_wrench_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/tool_head_wrench_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/turbine_blade.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/turbine_blade",
+        "layer1": "gtceu:item/material_sets/chonky/turbine_blade_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/turbine_blade_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/wire_fine.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/wire_fine",
+        "layer1": "gtceu:item/material_sets/chonky/wire_fine_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/wire_fine_overlay"
+    }
+}