Merge pull request #2079 from TerraFirmaGreg-Team/dev

Release: 0.11.4

.github/workflows/build.yml

@@ -194,7 +194,7 @@ jobs:
       - name: 📄 Format diff
         id: format_diff
         if: ${{ steps.read_diff.outputs.diff != '' }}
-        uses: roamingowl/template-output-with-eta@v2.0.0
+        uses: roamingowl/template-output-with-eta@v2.1.0
         with:
           template: |
             ```markdown
@@ -266,7 +266,7 @@ jobs:
 
       - name: 🔍 Create Pull Request if tag not found
         if: ${{ steps.check_existing_pr.outputs.exists == 'false' }}
-        uses: devops-infra/action-pull-request@v0.6.1
+        uses: devops-infra/action-pull-request@v1.0.2
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           source_branch: dev
@@ -429,7 +429,7 @@ jobs:
       - name: 📄 Format diff
         id: format_diff
         if: ${{ needs.info.outputs.diff != '' }}
-        uses: roamingowl/template-output-with-eta@v2.0.0
+        uses: roamingowl/template-output-with-eta@v2.1.0
         with:
           template: |
             ```markdown
@@ -438,7 +438,7 @@ jobs:
 
       - name: 🚀 Create release
         id: release
-        uses: softprops/action-gh-release@v2.3.4
+        uses: softprops/action-gh-release@v2.4.1
         with:
           name: ${{ needs.info.outputs.project_version }}
           tag_name: ${{ needs.info.outputs.project_version }}

.gitignore

@@ -115,13 +115,13 @@ hei_bookmarks.ini
 icon.png
 
 # Server data
-.pakku/server-overrides/libraries
-.pakku/server-overrides/config
-.pakku/server-overrides/defaultconfigs
-.pakku/server-overrides/groovy
-.pakku/server-overrides/scripts
-.pakku/server-overrides/mods
-.pakku/server-overrides/user_jvm_args.txt
+# .pakku/server-overrides/libraries
+# .pakku/server-overrides/config
+# .pakku/server-overrides/defaultconfigs
+# .pakku/server-overrides/groovy
+# .pakku/server-overrides/scripts
+# .pakku/server-overrides/mods
+# .pakku/server-overrides/user_jvm_args.txt
 
 /tacz/tacz_default_gun
 EffekseerNativeForJava.dll

.pakku/server-overrides/README.md

@@ -9,4 +9,15 @@ To run the Server Pack:
     * You should be able to run it using the "BASH" command, assuming your server machine has BASH capabilities
         * ``bash start_server.bat``
     * Or just open the batch file if on a windows machine.
-3. The batch file will start the server, install forge on it and then boot up your world.
+3. The batch file will start the server, install forge on it and then boot up your world.
+
+# Config Settings
+
+The config files shipped with the server pack should be a good starting point for bigger servers, however there's a few settings you may want to tweak:
+
+* defaultconfigs/tfc-server.toml
+   * `torchTicks` and `candleTicks` - This controls how fast torches and candles burn out. By default, torches last for two days and candles last for eight. You may want to increase this if your server players are spread out and have different bases. (You'll be able to craft permanent light sources once you enter LV)
+   * `foodDecayModifier` - This controls how fast food decays. For single player worlds or small groups that share a base, we recommend changing this to `1.0`, the TFC default. For larger servers with players in many time zones, `0.25` should work fine.
+ 
+* defaultconfigs/ftbranks/ranks.snbt
+   * Depending on how powerful of a server you're using, you may want to change the amount of force-loaded chunks each player is allowed to have. Note that players on the same team will combine their total allowance, so small numbers can encourage team play.

.pakku/server-overrides/defaultconfigs/ftbranks/ranks.snbt

@@ -0,0 +1,44 @@
+{
+	member: {
+		name: "Player"
+		power: 1
+		condition: "always_active"
+		ftbranks.name_format: "&a{name}"
+		ftbchunks.max_claimed: 50
+		ftbchunks.max_force_loaded: 6
+		ftbchunks.chunk_load_offline: false
+		command.trashcan: true
+		command.enderchest: false
+	}
+	vip: {
+		name: "VIP"
+		power: 50
+		ftbranks.name_format: "&e{name}"
+		ftbchunks.max_claimed: 200
+		ftbchunks.max_force_loaded: 8
+		ftbchunks.chunk_load_offline: true
+	}
+	moderator_girl: {
+		name: "Moderator"
+		power: 51
+		ftbranks.name_format: "&d{name}"
+		ftbchunks.max_claimed: 200
+		ftbchunks.max_force_loaded: 8
+	}
+	moderator: {
+		name: "Moderator"
+		power: 51
+		ftbranks.name_format: "&b{name}"
+		ftbchunks.max_claimed: 200
+		ftbchunks.max_force_loaded: 8
+	}
+	admin: {
+		name: "Admin"
+		power: 1000
+		xaero.pac_admin_mode: true
+		xaero.pac_server_claims: true
+		ftbranks.name_format: "&c{name}&c"
+		ftbchunks.max_claimed: 10000
+		ftbchunks.max_force_loaded: 10000
+	}
+}

CHANGELOG.md

@@ -1,8 +1,47 @@
 # Changelog
+
 ## [Unreleased]
 ### Changes
 ### Bug fixes
+
+## [0.11.4] - 22-10-2025
+### Major Changes
+- Refrigerators now have a toggle for forcing food stacking, as a workaround for the food oven's output. It will stack everything down to the oldest expiring item, so be careful when using this! @Redeix
+- Refrigerators can now also be connected to AE2 and Create Logistics, so you can pull out your food remotely. AE2 doesn't understand the food traits, however, so all your food will show as it does in EMI @Redeix
+### Changes
+- Finished EV quest line (#2069) @TomPlop
+- Normalized ladder crafting outputs, reduced ladders and wood frame burn times @oosyrag
+- Added beer battered dinosaur nuggets, made from real dinosaur and real beer @Pyritie
+- Added create packages/jars back to JEI so you can use them in filters, and added a tag for all jars (#2044) @Nashy1232
+- Slightly reduced spawn chance of illages and nerfed the amount of loot you get from them @Pyritie
+- Rebalanced some of the moon/mars food nutrition/saturation values @Pyritie
+- Added casting/extruder molds to tool racks @Pyritie
+- Added sandstorms to mars @Zippity
+- Massively buffed the density of Beneath naquadah veins until they get a proper home later @Pyritie
+- Increased amount of pyrolusite and tantalite on mars @Pyritie
+- Added new textures for the fission material holders, redstone ports, and fuel holders (#2073) @Redeix
+- Refrigerators now have more inventory space per tier @Redeix
+- Buffed the Tungsten Bismuth turbine rotor since it had worse stats than HSS-G which was available at a similar time (#2078) @TomPlop
+### Bug fixes
+- Fixed the interplanetary wireless card so it doesn't use a huge amount of power when just having it open @ko-lja
+- Fixed Firmalife cellar shelves resetting food expiration @Redeix
+- Added circuit numbers to the Formic Acid and Ammonium Chloride chemical reactor recipes @Pyritie
+- Fixed inconsistent circuit numbers between CR and LCR for specific recipes (#2047) @Redeix
+- Driverless rockets should now properly explode at world height limit instead of getting stuck @Pyritie
+- Fix inconsistent emitter recipes (#2059) @SpicyNoodle5
+- Removed inventory sorting from all Sacks n Such containers and Lunchboxes because they were causing weird stack sizes or voiding (#2018) @Pyritie
+- Fixed train conductors suffocating on planets (#2055) @Pyritie
+- Fixed firepit with pot and grill not raising the ambient temperature (#2002) @Pyritie
+- Fixed a few recipes wanting missing items (#2012) @Pyritie
+- Fixed inconsistency between the belt sander and lathe (#2022) @Pyritie
+- Fixed double plates not stacking to 16 (#1952, #2051) @WIPocket
+- Fixed some EV TACZ extended mags requiring the wrong kind of spring (#2065) @BlueBoat29
+- Fixed warped, crimson, and glacian pressure plates using the wrong spring @Pyritie
 ### Translation updates
+- Chinese (simplified) @jmecn
+- Russian @DI-GitH
+- French @Mattisso3500 
+- Japanese @sakura-gondra
 
 ## [0.11.3] - 15-10-2025
 ### Major Changes

config/fancymenu/panoramas/mars/properties.txt

@@ -5,5 +5,5 @@ panorama-meta {
 	speed = 1.0
 	fov = 85.0
 	angle = 0.0
-	start_rotation = 20
+	start_rotation = 80
 }

config/ftbquests/quests/chapters/applied_energistics_2.snbt

@@ -1259,6 +1259,7 @@
 			description: ["{quests.ae2.interplanetary_wireless.desc}"]
 			icon: "tfg:wireless_card"
 			id: "4B1F957EB41A5E9B"
+			shape: "hexagon"
 			subtitle: "{quests.ae2.interplanetary_wireless.subtitle}"
 			tasks: [{
 				id: "647F84B024E272BA"

config/ftbquests/quests/chapters/gregtech_energy.snbt

@@ -599,7 +599,7 @@
 							"ftbfiltersystem:filter": "or(item(gtceu:bronze_large_boiler)item(gtceu:steel_large_boiler)item(gtceu:titanium_large_boiler)item(gtceu:tungstensteel_large_boiler))"
 						}
 					}
-					title: "Large Boilers"
+					title: "{quests.gregtech_energy.lst_fuel.task.1}"
 					type: "item"
 				}
 			]
@@ -1033,12 +1033,19 @@
 		}
 		{
 			dependencies: ["7AF726555D721DFC"]
+			description: [
+				"{quests.gregtech_energy.lce.desc.1}"
+				"{@pagebreak}"
+				"{quests.gregtech_energy.lce.desc.2}"
+			]
 			id: "351AED1612D00EF8"
+			subtitle: "{quests.gregtech_energy.lce.subtitle}"
 			tasks: [{
 				id: "6A35D4E3C93A70FC"
 				item: "gtceu:large_combustion_engine"
 				type: "item"
 			}]
+			title: "{quests.gregtech_energy.lce.title}"
 			x: -4.5d
 			y: -1.0d
 		}

config/ftbquests/quests/chapters/ore_processing.snbt

@@ -284,10 +284,10 @@
 		}
 		{
 			dependencies: ["0F0525A70047EEB2"]
-			description: ["{quests.ore_proc.sodium_persuflate.desc}"]
+			description: ["{quests.ore_proc.sodium_persulfate.desc}"]
 			icon: "gtceu:sodium_persulfate_bucket"
 			id: "3513778F204293CD"
-			subtitle: "{quests.ore_proc.sodium_persuflate.subtitle}"
+			subtitle: "{quests.ore_proc.sodium_persulfate.subtitle}"
 			tasks: [
 				{
 					disable_toast: true
@@ -303,7 +303,7 @@
 					type: "item"
 				}
 			]
-			title: "{quests.ore_proc.sodium_persuflate.title}"
+			title: "{quests.ore_proc.sodium_persulfate.title}"
 			x: -3.0d
 			y: -6.5d
 		}

config/ftbquests/quests/chapters/progression.snbt

@@ -371,6 +371,18 @@
 			x: 3.0d
 			y: 5.0d
 		}
+		{
+			id: "224FC863B2974E78"
+			linked_quest: "37B7342CD1B3B76D"
+			x: 9.0d
+			y: 3.0d
+		}
+		{
+			id: "6D3D80BCCB44CFB7"
+			linked_quest: "7F4E529627AD9148"
+			x: 8.0d
+			y: 3.0d
+		}
 	]
 	quests: [
 		{

config/ftbquests/quests/chapters/space_survival.snbt

@@ -783,6 +783,7 @@
 		{
 			dependencies: ["70F93982FC045A08"]
 			description: ["{quests.space_survival.sandworm.desc}"]
+			icon: "sandworm_mod:sandworm_tooth"
 			id: "62A5111836CB4D37"
 			optional: true
 			shape: "heart"
@@ -1097,7 +1098,7 @@
 				Count: 1
 				ForgeCaps: {
 					"tfc:food": {
-						creationDate: -9223372036854775808L
+						creationDate: 23862000L
 						traits: [ ]
 					}
 					"tfc:item_heat": {
@@ -1112,17 +1113,45 @@
 			shape: "heart"
 			size: 1.5d
 			subtitle: "{quests.space_survival.bulbkin_pie.subtitle}"
-			tasks: [{
-				id: "5F863BCE6DAA30D6"
-				item: {
-					Count: 1
-					id: "ftbfiltersystem:smart_filter"
-					tag: {
-						"ftbfiltersystem:filter": "or(item(betterend:cave_pumpkin_pie))"
+			tasks: [
+				{
+					id: "5F863BCE6DAA30D6"
+					item: {
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item(betterend:cave_pumpkin_pie))"
+						}
 					}
+					type: "item"
 				}
-				type: "item"
-			}]
+				{
+					id: "0B5E81AEEDFE0B7A"
+					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: "tfg:food/cooked_dino_nugget"
+					}
+					type: "item"
+				}
+			]
 			title: "{quests.space_survival.bulbkin_pie.title}"
 			x: 13.5d
 			y: 0.0d

config/immersive_aircraft.json

@@ -1,74 +1,75 @@
 {
-  "enableDropsForNonPlayer": true,
-  "enableCrashExplosion": true,
-  "enableCrashBlockDestruction": false,
-  "enableCrashFire": false,
-  "crashExplosionRadius": 2.0,
-  "crashDamage": 2.0,
-  "preventKillThroughCrash": true,
-  "healthBarRow": 0,
-  "damagePerHealthPoint": 30,
-  "separateCamera": true,
-  "useThirdPersonByDefault": true,
-  "enableTrails": true,
-  "renderDistance": 192.0,
-  "fuelConsumption": 1.0,
-  "windClearWeather": 1.0,
-  "windRainWeather": 3.0,
-  "windThunderWeather": 3.0,
-  "repairSpeed": 0.025,
-  "repairExhaustion": 0.5,
-  "collisionDamage": true,
-  "collisionDamageMultiplier": 40.0,
-  "burnFuelInCreative": false,
-  "acceptVanillaFuel": true,
-  "useCustomKeybindSystem": true,
-  "showHotbarEngineGauge": true,
-  "weaponsAreDestructive": false,
-  "dropAircraft": true,
-  "dropInventory": true,
-  "dropUpgrades": false,
-  "regenerateHealthEveryNTicks": 0,
-  "requireShiftForRepair": false,
-  "bombBayEntity": {
-    "minecraft:egg": "tfc:chicken"
-  },
-  "rotaryCannonDamage": 5.0,
-  "heavyCrossBowVelocity": 3.0,
-  "fuelList": {
-    "minecraft:blaze_powder": 1200,
-    "gtceu:coke_gem": 1200,
-    "beneath:cursecoal": 1200
-  },
-  "validDimensions": {
-    "minecraft:the_end": true,
-    "minecraft:the_nether": true,
-    "minecraft:overworld": true,
-    "ad_astra:earth_orbit": false,
-    "ad_astra:moon": false,
-    "ad_astra:moon_orbit": false,
-    "ad_astra:mars": false,
-    "ad_astra:mars_orbit": false,
-    "ad_astra:venus_orbit": false,
-    "ad_astra:mercury": false,
-    "ad_astra:mercury_orbit": false,
-    "ad_astra:glacio": false,
-    "ad_astra:glacio_orbit": false
-  },
-  "gunpowderAmmunition": {
-    "minecraft:gunpowder": 100
-  },
-  "arrowAmmunition": {
-    "minecraft:arrow": 100,
-    "minecraft:spectral_arrow": 100,
-    "minecraft:tipped_arrow": 100
-  },
-  "bombBayAmmunition": {
-    "minecraft:tnt": 100,
-    "gtceu:powderbarrel": 80,
-    "gtceu:industrial_tnt": 50,
-    "gtceu:dynamite": 200
-  },
-  "version": 1,
-  "name": "immersive_aircraft"
+	"enableDropsForNonPlayer": true,
+	"enableCrashExplosion": true,
+	"enableCrashBlockDestruction": false,
+	"enableCrashFire": false,
+	"crashExplosionRadius": 2.0,
+	"crashDamage": 2.0,
+	"preventKillThroughCrash": true,
+	"healthBarRow": 0,
+	"damagePerHealthPoint": 30,
+	"separateCamera": true,
+	"useThirdPersonByDefault": true,
+	"enableTrails": true,
+	"renderDistance": 192.0,
+	"fuelConsumption": 1.0,
+	"windClearWeather": 1.0,
+	"windRainWeather": 3.0,
+	"windThunderWeather": 3.0,
+	"repairSpeed": 0.025,
+	"repairExhaustion": 0.5,
+	"collisionDamage": true,
+	"collisionDamageMultiplier": 40.0,
+	"burnFuelInCreative": false,
+	"acceptVanillaFuel": true,
+	"useCustomKeybindSystem": true,
+	"showHotbarEngineGauge": true,
+	"weaponsAreDestructive": false,
+	"dropAircraft": true,
+	"dropInventory": true,
+	"dropUpgrades": false,
+	"regenerateHealthEveryNTicks": 0,
+	"requireShiftForRepair": false,
+	"bombBayEntity": {
+		"minecraft:egg": "tfc:chicken"
+	},
+	"rotaryCannonDamage": 5.0,
+	"heavyCrossBowVelocity": 3.0,
+	"fuelList": {
+		"minecraft:blaze_powder": 1200,
+		"gtceu:coke_gem": 1200,
+		"beneath:cursecoal": 1200
+	},
+	"validDimensions": {
+		"minecraft:the_end": true,
+		"minecraft:the_nether": true,
+		"minecraft:overworld": true,
+		"ad_astra:earth_orbit": false,
+		"ad_astra:moon": false,
+		"ad_astra:moon_orbit": false,
+		"ad_astra:mars": false,
+		"ad_astra:mars_orbit": false,
+		"ad_astra:venus": true,
+		"ad_astra:venus_orbit": false,
+		"ad_astra:mercury": false,
+		"ad_astra:mercury_orbit": false,
+		"ad_astra:glacio": false,
+		"ad_astra:glacio_orbit": false
+	},
+	"gunpowderAmmunition": {
+		"minecraft:gunpowder": 100
+	},
+	"arrowAmmunition": {
+		"minecraft:arrow": 100,
+		"minecraft:spectral_arrow": 100,
+		"minecraft:tipped_arrow": 100
+	},
+	"bombBayAmmunition": {
+		"minecraft:tnt": 100,
+		"gtceu:powderbarrel": 80,
+		"gtceu:industrial_tnt": 50,
+		"gtceu:dynamite": 200
+	},
+	"version": 1,
+	"name": "immersive_aircraft"
 }

config/immersive_optimization.json

@@ -1,32 +1,43 @@
 {
-  "_documentation": "https://github.com/Luke100000/ImmersiveOptimization/wiki",
-  "enableEntities": true,
-  "enableBlockEntities": true,
-  "enableDistanceCulling": true,
-  "enableTrackingCulling": true,
-  "enableViewportCulling": true,
-  "minDistance": 6,
-  "blocksPerLevel": 64,
-  "blocksPerLevelDistanceCulled": 10,
-  "blocksPerLevelTrackingCulled": 10,
-  "blocksPerLevelViewportCulled": 20,
-  "maxLevel": 20,
-  "blocksPerLevelBlockEntities": 32,
-  "entityTickBudget": 30.0,
-  "stressedThreshold": 45,
-  "dimensions": {
-    "minecraft:overworld": true,
-    "minecraft:the_nether": true,
-    "minecraft:the_end": true
-  },
-  "entities": {
-    "fromanotherworld:starship": false,
-    "minecraft:player": false,
-    "minecraft:arrow": false,
-    "create": false,
-    "minecraft:ender_dragon": false,
-    "sandworm_mod": false
-  },
-  "version": 2,
-  "name": "immersive_optimization"
+	"_documentation": "https://github.com/Luke100000/ImmersiveOptimization/wiki",
+	"enableEntities": true,
+	"enableBlockEntities": true,
+	"enableDistanceCulling": true,
+	"enableTrackingCulling": true,
+	"enableViewportCulling": true,
+	"minDistance": 6,
+	"blocksPerLevel": 64,
+	"blocksPerLevelDistanceCulled": 10,
+	"blocksPerLevelTrackingCulled": 10,
+	"blocksPerLevelViewportCulled": 20,
+	"maxLevel": 20,
+	"blocksPerLevelBlockEntities": 32,
+	"entityTickBudget": 30.0,
+	"stressedThreshold": 45,
+	"dimensions": {
+		"minecraft:overworld": true,
+		"minecraft:the_nether": true,
+		"minecraft:the_end": true,
+		"ad_astra:earth_orbit": true,
+		"ad_astra:moon": true,
+		"ad_astra:moon_orbit": true,
+		"ad_astra:mars": true,
+		"ad_astra:mars_orbit": true,
+		"ad_astra:venus": true,
+		"ad_astra:venus_orbit": true,
+		"ad_astra:mercury": true,
+		"ad_astra:mercury_orbit": true,
+		"ad_astra:glacio": true,
+		"ad_astra:glacio_orbit": true
+	},
+	"entities": {
+		"fromanotherworld:starship": false,
+		"minecraft:player": false,
+		"minecraft:arrow": false,
+		"create": false,
+		"minecraft:ender_dragon": false,
+		"sandworm_mod": false
+	},
+	"version": 2,
+	"name": "immersive_optimization"
 }

config/invtweaks-client.toml

@@ -137,6 +137,14 @@
 		containerClass = "com.simibubi.create.content.equipment.toolbox.ToolboxMenu"
 		sortRange = ""
 
+	[[sorting.containerOverrides]]
+		containerClass = "mod.traister101.sns.client.screen.ContainerItemScreen"
+		sortRange = ""
+
+	[[sorting.containerOverrides]]
+		containerClass = "dev.thomas.tfclunchbox.client.screen.*"
+		sortRange = ""
+
 #Tweaks
 [tweaks]
 	#Enable auto-refill

config/tfc-client.toml

@@ -85,7 +85,7 @@
 	#   BUMP = Move elements closer to the hotbar; when fishing or riding a jumping entity, other elements move to their default positions
 	#   LEFT_HOTBAR = Move elements closer to the hotbar; when fishing or riding a jumping entity, those elements will appear as a vertical bar between the hotbar and offhand slot
 	#Allowed Values: HOVER, BUMP, LEFT_HOTBAR
-	disabledExperienceBarStyle = "BUMP"
+	disabledExperienceBarStyle = "HOVER"
 	#
 	# If prospect information should appear in the space above the hotbar (the actionbar). False will put them in the chat window.
 	sendProspectResultsToActionbar = true

defaultconfigs/ftbranks/ranks.snbt

@@ -4,41 +4,10 @@
 		power: 1
 		condition: "always_active"
 		ftbranks.name_format: "&a{name}"
-		ftbchunks.max_claimed: 50
-		ftbchunks.max_force_loaded: 3
+		ftbchunks.max_claimed: 10000
+		ftbchunks.max_force_loaded: 10000
 		ftbchunks.chunk_load_offline: false
 		command.trashcan: true
 		command.enderchest: false
 	}
-	vip: {
-		name: "VIP"
-		power: 50
-		ftbranks.name_format: "&e{name}"
-		ftbchunks.max_claimed: 200
-		ftbchunks.max_force_loaded: 5
-		ftbchunks.chunk_load_offline: true
-	}
-	moderator_girl: {
-		name: "Moderator"
-		power: 51
-		ftbranks.name_format: "&d{name}"
-		ftbchunks.max_claimed: 200
-		ftbchunks.max_force_loaded: 5
-	}
-	moderator: {
-		name: "Moderator"
-		power: 51
-		ftbranks.name_format: "&b{name}"
-		ftbchunks.max_claimed: 200
-		ftbchunks.max_force_loaded: 5
-	}
-	admin: {
-		name: "Admin"
-		power: 1000
-		xaero.pac_admin_mode: true
-		xaero.pac_server_claims: true
-		ftbranks.name_format: "&c{name}&c"
-		ftbchunks.max_claimed: 10000
-		ftbchunks.max_force_loaded: 10000
-	}
 }

defaultconfigs/tfc-server.toml

@@ -810,7 +810,7 @@ familiarityDecayLimit = 0.3
 	[mechanics.fluids]
 		#
 		# If true, TFC buckets that naturally place sources (colored steel) will place sources. If false, this behavior is disabled. By default, colored steel buckets do not place sources.
-		enableBucketsPlacingSources1 = false
+		enableBucketsPlacingSources1 = true
 
 	[mechanics.vanillaChanges]
 		#

kubejs/assets/alekiroofs/lang/zh_cn.json

@@ -0,0 +1,15 @@
+{
+  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
+  "block.alekiroofs.baobab_roofing": "猴面包木屋顶",
+  "block.alekiroofs.crimson_roofing": "绯红菌屋顶",
+  "block.alekiroofs.cypress_roofing": "柏木屋顶",
+  "block.alekiroofs.eucalyptus_roofing": "桉木屋顶",
+  "block.alekiroofs.fig_roofing": "无花果木屋顶",
+  "block.alekiroofs.hevea_roofing": "三叶胶木屋顶",
+  "block.alekiroofs.ipe_roofing": "重蚁木屋顶",
+  "block.alekiroofs.ironwood_roofing": "铁木屋顶",
+  "block.alekiroofs.mahogany_roofing": "桃花心木屋顶",
+  "block.alekiroofs.teak_roofing": "柚木屋顶",
+  "block.alekiroofs.tualang_roofing": "大干巴豆木屋顶",
+  "block.alekiroofs.warped_roofing": "诡异菌屋顶"
+}

kubejs/assets/create/lang/zh_cn.json

@@ -85,7 +85,7 @@
   "block.create.small_granite_brick_wall": "小型燧石砖墙",
   "block.create.layered_granite": "层叠燧石",
   "block.create.granite_pillar": "燧石柱",
-  "item.create.netherite_diving_helmet.tooltip.summary": "当和_蓝钢背罐_一起装备时，它将保护您免受_极端高温_的伤害。当然，为了您的人身安全，_腿部和脚部_也必须穿上_蓝钢潜水装备_。",
+  "item.create.netherite_diving_helmet.tooltip.summary": "当和_蓝钢背罐_一起装备时，它将保护你免受_极端高温_的伤害。当然，为了你的人身安全，_腿部和脚部_也必须穿上_蓝钢潜水装备_。",
   "item.create.netherite_backtank": "蓝钢背罐",
   "item.create.netherite_diving_helmet": "蓝钢潜水头盔",
   "item.create.netherite_diving_boots": "蓝钢潜水靴",

kubejs/assets/deafission/models/block/machine/redstone_port/default.json

@@ -0,0 +1,69 @@
+{
+	"format_version": "1.9.0",
+	"credit": "Made with Blockbench",
+	"textures": {
+		"0": "gtceu:block/casings/gcym/atomic_casing",
+		"1": "deafission:block/machine/redstone_port/overlay",
+		"particle": "gtceu:block/casings/gcym/atomic_casing"
+	},
+	"elements": [
+		{
+			"from": [0, 0, 0],
+			"to": [16, 16, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 16, 16], "texture": "#0"},
+				"east": {"uv": [0, 0, 16, 16], "texture": "#0"},
+				"south": {"uv": [0, 0, 16, 16], "texture": "#0"},
+				"west": {"uv": [0, 0, 16, 16], "texture": "#0"},
+				"up": {"uv": [0, 0, 16, 16], "texture": "#0"},
+				"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
+			}
+		},
+		{
+			"from": [-0.01, -0.01, -0.01],
+			"to": [16.01, 16.01, 16.01],
+			"shade": false,
+            "forge_data": { "block_light": 15, "sky_light": 15 },
+			"rotation": {"angle": 0, "axis": "y", "origin": [-0.1, -0.2, -0.1]},
+			"faces": {
+				"north": {"uv": [0, 0, 16, 16], "texture": "#1"},
+				"east": {"uv": [0, 0, 16, 16], "texture": "#1"},
+				"south": {"uv": [0, 0, 16, 16], "texture": "#1"},
+				"west": {"uv": [0, 0, 16, 16], "texture": "#1"},
+				"up": {"uv": [0, 0, 16, 16], "texture": "#1"},
+				"down": {"uv": [0, 0, 16, 16], "texture": "#1"}
+			}
+		}
+	],
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [75, 45, 0],
+			"translation": [0, 2.5, 0],
+			"scale": [0.375, 0.375, 0.375]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [75, 45, 0],
+			"translation": [0, 2.5, 0],
+			"scale": [0.375, 0.375, 0.375]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, 45, 0],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, -135, 0],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"ground": {
+			"translation": [0, 3, 0],
+			"scale": [0.25, 0.25, 0.25]
+		},
+		"gui": {
+			"rotation": [30, -135, 0],
+			"scale": [0.625, 0.625, 0.625]
+		},
+		"fixed": {
+			"scale": [0.5, 0.5, 0.5]
+		}
+	}
+}

kubejs/assets/deafission/textures/block/machine/fuel_holder/1.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "animation": {
+        "frametime": 1
+    }
+}

kubejs/assets/deafission/textures/block/machine/fuel_holder/2.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "animation": {
+        "frametime": 1
+    }
+}

kubejs/assets/deafission/textures/block/machine/fuel_holder/3.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "animation": {
+        "frametime": 1
+    }
+}

kubejs/assets/deafission/textures/block/machine/fuel_holder/4.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "animation": {
+        "frametime": 1
+    }
+}

kubejs/assets/deafission/textures/block/machine/material_holder/1.png.mcmeta

@@ -0,0 +1,5 @@
+{
+    "animation": {
+        "frametime": 1
+    }
+}

kubejs/assets/deafission/textures/block/machine/redstone_port/overlay.png.mcmeta

@@ -0,0 +1 @@
+{"animation": {"frametime": 1}}

kubejs/assets/emi/category/properties/ae2_condenser.json

@@ -1 +1 @@
-{"ae2:condenser":{"order":155}}
+{"ae2:condenser":{"order":156}}

kubejs/assets/emi/category/properties/ae2_item_transformation.json

@@ -1 +1 @@
-{"ae2:item_transformation":{"order":144}}
+{"ae2:item_transformation":{"order":49}}

kubejs/assets/emi/category/properties/ae2_p2p_attunement.json

@@ -1 +1 @@
-{"ae2:p2p_attunement":{"order":165}}
+{"ae2:p2p_attunement":{"order":167}}

kubejs/assets/emi/category/properties/create_deploying.json

@@ -1 +1 @@
-{"create:deploying":{"order":51}}
+{"create:deploying":{"order":52}}

kubejs/assets/emi/category/properties/create_draining.json

@@ -1 +1 @@
-{"create:draining":{"order":166}}
+{"create:draining":{"order":168}}

kubejs/assets/emi/category/properties/create_item_application.json

@@ -1 +1 @@
-{"create:item_application":{"order":52}}
+{"create:item_application":{"order":53}}

kubejs/assets/emi/category/properties/create_sandpaper_polishing.json

@@ -1 +1 @@
-{"create:sandpaper_polishing":{"order":49}}
+{"create:sandpaper_polishing":{"order":50}}

kubejs/assets/emi/category/properties/create_sequenced_assembly.json

@@ -1 +1 @@
-{"create:sequenced_assembly":{"order":54}}
+{"create:sequenced_assembly":{"order":55}}

kubejs/assets/emi/category/properties/create_spout_filling.json

@@ -1 +1 @@
-{"create:spout_filling":{"order":167}}
+{"create:spout_filling":{"order":169}}

kubejs/assets/emi/category/properties/createaddition_rolling.json

@@ -1 +1 @@
-{"createaddition:rolling":{"order":77}}
+{"createaddition:rolling":{"order":81}}

kubejs/assets/emi/category/properties/deafission_fission_component.json

@@ -0,0 +1 @@
+{"deafission:fission_component":{"order":70}}

kubejs/assets/emi/category/properties/deafission_fission_reactor_coolant.json

@@ -1 +1 @@
-{"deafission:fission_reactor_coolant":{"order":66}}
+{"deafission:fission_reactor_coolant":{"order":67}}

kubejs/assets/emi/category/properties/deafission_fission_reactor_fuel.json

@@ -1 +1 @@
-{"deafission:fission_reactor_fuel":{"order":68}}
+{"deafission:fission_reactor_fuel":{"order":69}}

kubejs/assets/emi/category/properties/deafission_fission_reactor_processing.json

@@ -1 +1 @@
-{"deafission:fission_reactor_processing":{"order":67}}
+{"deafission:fission_reactor_processing":{"order":68}}

kubejs/assets/emi/category/properties/diggerhelmet_helmet_repair.json

@@ -0,0 +1 @@
+{"diggerhelmet:helmet_repair":{"order":162}}

kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json

@@ -1 +1 @@
-{"domum_ornamentum:architects_cutter":{"order":164}}
+{"domum_ornamentum:architects_cutter":{"order":166}}

kubejs/assets/emi/category/properties/emi_info.json

@@ -1 +1 @@
-{"emi:info":{"order":172}}
+{"emi:info":{"order":174}}

kubejs/assets/emi/category/properties/emi_tag.json

@@ -1 +1 @@
-{"emi:tag":{"order":173}}
+{"emi:tag":{"order":175}}

kubejs/assets/emi/category/properties/exposure_photograph_printing.json

@@ -1 +1 @@
-{"exposure:photograph_printing":{"order":160}}
+{"exposure:photograph_printing":{"order":161}}

kubejs/assets/emi/category/properties/exposure_photograph_stacking.json

@@ -1 +1 @@
-{"exposure:photograph_stacking":{"order":168}}
+{"exposure:photograph_stacking":{"order":170}}

kubejs/assets/emi/category/properties/framedblocks_framing_saw.json

@@ -1 +1 @@
-{"framedblocks:framing_saw":{"order":163}}
+{"framedblocks:framing_saw":{"order":165}}

kubejs/assets/emi/category/properties/greate_automatic_packing.json

@@ -1 +1 @@
-{"greate:automatic_packing":{"order":158}}
+{"greate:automatic_packing":{"order":159}}

kubejs/assets/emi/category/properties/greate_automatic_shaped.json

@@ -1 +1 @@
-{"greate:automatic_shaped":{"order":156}}
+{"greate:automatic_shaped":{"order":157}}

kubejs/assets/emi/category/properties/greate_automatic_shapeless.json

@@ -1 +1 @@
-{"greate:automatic_shapeless":{"order":157}}
+{"greate:automatic_shapeless":{"order":158}}

kubejs/assets/emi/category/properties/greate_block_cutting.json

@@ -1 +1 @@
-{"greate:block_cutting":{"order":162}}
+{"greate:block_cutting":{"order":164}}

kubejs/assets/emi/category/properties/greate_crushing.json

@@ -1 +1 @@
-{"greate:crushing":{"order":112}}
+{"greate:crushing":{"order":120}}

kubejs/assets/emi/category/properties/greate_fan_washing.json

@@ -1 +1 @@
-{"greate:fan_washing":{"order":146}}
+{"greate:fan_washing":{"order":127}}

kubejs/assets/emi/category/properties/greate_milling.json

@@ -1 +1 @@
-{"greate:milling":{"order":111}}
+{"greate:milling":{"order":119}}

kubejs/assets/emi/category/properties/greate_mixing.json

@@ -1 +1 @@
-{"greate:mixing":{"order":115}}
+{"greate:mixing":{"order":125}}

kubejs/assets/emi/category/properties/greate_pressing.json

@@ -1 +1 @@
-{"greate:pressing":{"order":102}}
+{"greate:pressing":{"order":109}}

kubejs/assets/emi/category/properties/greate_sawing.json

@@ -1 +1 @@
-{"greate:sawing":{"order":89}}
+{"greate:sawing":{"order":95}}

kubejs/assets/emi/category/properties/gtceu_air_scrubber.json

@@ -1 +1 @@
-{"gtceu:air_scrubber":{"order":71}}
+{"gtceu:air_scrubber":{"order":73}}

kubejs/assets/emi/category/properties/gtceu_alloy_blast_smelter.json

@@ -1 +1 @@
-{"gtceu:alloy_blast_smelter":{"order":125}}
+{"gtceu:alloy_blast_smelter":{"order":137}}

kubejs/assets/emi/category/properties/gtceu_alloy_smelter.json

@@ -1 +1 @@
-{"gtceu:alloy_smelter":{"order":72}}
+{"gtceu:alloy_smelter":{"order":74}}

kubejs/assets/emi/category/properties/gtceu_aqueous_accumulator.json

@@ -1 +1 @@
-{"gtceu:aqueous_accumulator":{"order":73}}
+{"gtceu:aqueous_accumulator":{"order":76}}

kubejs/assets/emi/category/properties/gtceu_arc_furnace.json

@@ -1 +1 @@
-{"gtceu:arc_furnace":{"order":74}}
+{"gtceu:arc_furnace":{"order":77}}

kubejs/assets/emi/category/properties/gtceu_arc_furnace_recycling.json

@@ -1 +1 @@
-{"gtceu:arc_furnace_recycling":{"order":152}}
+{"gtceu:arc_furnace_recycling":{"order":78}}

kubejs/assets/emi/category/properties/gtceu_assembler.json

@@ -1 +1 @@
-{"gtceu:assembler":{"order":75}}
+{"gtceu:assembler":{"order":79}}

kubejs/assets/emi/category/properties/gtceu_assembly_line.json

@@ -1 +1 @@
-{"gtceu:assembly_line":{"order":126}}
+{"gtceu:assembly_line":{"order":138}}

kubejs/assets/emi/category/properties/gtceu_autoclave.json

@@ -1 +1 @@
-{"gtceu:autoclave":{"order":76}}
+{"gtceu:autoclave":{"order":80}}

kubejs/assets/emi/category/properties/gtceu_bender.json

@@ -1 +1 @@
-{"gtceu:bender":{"order":79}}
+{"gtceu:bender":{"order":83}}

kubejs/assets/emi/category/properties/gtceu_brewery.json

@@ -1 +1 @@
-{"gtceu:brewery":{"order":80}}
+{"gtceu:brewery":{"order":84}}

kubejs/assets/emi/category/properties/gtceu_canner.json

@@ -1 +1 @@
-{"gtceu:canner":{"order":81}}
+{"gtceu:canner":{"order":85}}

kubejs/assets/emi/category/properties/gtceu_centrifuge.json

@@ -1 +1 @@
-{"gtceu:centrifuge":{"order":83}}
+{"gtceu:centrifuge":{"order":87}}

kubejs/assets/emi/category/properties/gtceu_chem_dyes.json

@@ -1 +1 @@
-{"gtceu:chem_dyes":{"order":150}}
+{"gtceu:chem_dyes":{"order":89}}

kubejs/assets/emi/category/properties/gtceu_chemical_bath.json

@@ -1 +1 @@
-{"gtceu:chemical_bath":{"order":84}}
+{"gtceu:chemical_bath":{"order":88}}

kubejs/assets/emi/category/properties/gtceu_chemical_reactor.json

@@ -1 +1 @@
-{"gtceu:chemical_reactor":{"order":85}}
+{"gtceu:chemical_reactor":{"order":91}}

kubejs/assets/emi/category/properties/gtceu_circuit_assembler.json

@@ -1 +1 @@
-{"gtceu:circuit_assembler":{"order":87}}
+{"gtceu:circuit_assembler":{"order":93}}

kubejs/assets/emi/category/properties/gtceu_coke_oven.json

@@ -1 +1 @@
-{"gtceu:coke_oven":{"order":58}}
+{"gtceu:coke_oven":{"order":59}}

kubejs/assets/emi/category/properties/gtceu_combustion_generator.json

@@ -1 +1 @@
-{"gtceu:combustion_generator":{"order":60}}
+{"gtceu:combustion_generator":{"order":61}}

kubejs/assets/emi/category/properties/gtceu_compressor.json

@@ -1 +1 @@
-{"gtceu:compressor":{"order":88}}
+{"gtceu:compressor":{"order":94}}

kubejs/assets/emi/category/properties/gtceu_cracker.json

@@ -1 +1 @@
-{"gtceu:cracker":{"order":127}}
+{"gtceu:cracker":{"order":139}}

kubejs/assets/emi/category/properties/gtceu_cutter.json

@@ -1 +1 @@
-{"gtceu:cutter":{"order":90}}
+{"gtceu:cutter":{"order":96}}

kubejs/assets/emi/category/properties/gtceu_distillation_tower.json

@@ -1 +1 @@
-{"gtceu:distillation_tower":{"order":92}}
+{"gtceu:distillation_tower":{"order":98}}

kubejs/assets/emi/category/properties/gtceu_distillery.json

@@ -1 +1 @@
-{"gtceu:distillery":{"order":91}}
+{"gtceu:distillery":{"order":97}}

kubejs/assets/emi/category/properties/gtceu_electric_blast_furnace.json

@@ -1 +1 @@
-{"gtceu:electric_blast_furnace":{"order":128}}
+{"gtceu:electric_blast_furnace":{"order":140}}

kubejs/assets/emi/category/properties/gtceu_electrolyzer.json

@@ -1 +1 @@
-{"gtceu:electrolyzer":{"order":93}}
+{"gtceu:electrolyzer":{"order":99}}

kubejs/assets/emi/category/properties/gtceu_electromagnetic_separator.json

@@ -1 +1 @@
-{"gtceu:electromagnetic_separator":{"order":94}}
+{"gtceu:electromagnetic_separator":{"order":100}}