Merge pull request #2124 from TerraFirmaGreg-Team/dev

Release: 0.11.6

.gitignore

@@ -56,6 +56,8 @@ config/stellarcore_stitcher_cache_vanilla.dat
 
 !config/defaultoptions/options.txt
 
+defaultconfigs/ftbranks/players.snbt
+
 # .minecraft
 !bansoukou/**.zip
 

CHANGELOG.md

@@ -4,6 +4,50 @@
 ### Changes
 ### Bug fixes
 
+## [0.11.6] - 29-10-2025
+### Mod updates
+- New GregTech patch, check the patch notes [here](https://github.com/GregTechCEu/GregTech-Modern/releases/tag/v7.2.1-1.20.1)
+- Changed to a different third-person mod that supports TACZ better
+- Aged Alcohols added their own effects for aged corn whiskey and rye whiskey (replacing our own), and now also has aged mead
+### Changes
+- Changed TACZ ammo stack sizes to be more normal @BlueBoat29 
+- Buffed how far each Soarer "flap" can glide for @Pyritie
+- Polycaprolactam string and phantom string now use circuit 3 in a wiremill instead of 0 (#2096) @SverhRazum-Nah
+- Added flax bundles for much faster scraping (#2080) @Xaligal
+- Added more mineable tags to cobwebs since swords don't want to work @Pyritie
+- Added TACZ Ammo Boxes @BlueBoat29
+- Added TACZ Guns and Ammo Boxes to tool rack @BlueBoat29
+- Overhauled the recycling recipes and added many more (#1576) @Pyritie
+- Added an earlier way to make dough using a normal tfc ceramic/wood bowl @Pyritie
+- Added ABS recipe for T2 Rocket Alloy @Xtrial-01
+- Changed the color of Rhodium Plated Palladium to be more unique @BlueBoat29
+- Changed the Ad Astra planet screen to reflect TFG @BlueBoat29 @Redeix
+- Added assembler recipes for railgun buses (#2119) @Xtrial-01
+- Changed Salvos to use Phenol instead of Aminophenol (#2119) @Xtrial-01
+- The teleporting between the Beneath and the Overworld should now only replace collapsible blocks with air (instead of everything), and will give 30 sec of slow fall and fire protection @Pyritie
+- Added tortilla chips, tomato sauce, salsa, and shredded cheese to the meal bag tag @Pyritie
+- Glacian Rams now give more wool @BlueBoat29
+- Rotor Holders now require an Assembler of the appropriate tier to be crafted (#2123) @TomPlop
+- Lowered the craft time of Refrigerant Pellets until a better solution is finished (#2123) @TomPlop
+- Lowered the craft time of ammonium tungstate dust (#2123) @TomPlop
+### Bug fixes
+- Fixed part of the tungsten processing loop giving way too much salt (#2095) @Redeix
+- Fixed basic super tanks so you can now left/right click with them in GUIs like you can with the others (#2100) @jurrejelle
+- Fixed sometimes crash on startup (#2098) @Pyritie
+- Fixed some quest misinformation (#2097, #2119) @Pyritie, @jmecn, @Xtrial-01
+- Fixed not being able to ride Soarers (#2082) @Pyritie
+- Fixed Soarer "flap" GUI overlapping with the minimap @Pyritie
+- Fixed aqueduct recipes (#2101) @vidal-adrien
+- Fixed some AFC logs not having stripping recipes @Pyritie
+- Fixed some issues related to AE2 blocking mode @ko-lja
+- Fixed wild bulbkin plants not dropping bulbkin seeds @Pyritie
+- Fixed graphite moderator frame interactions @BlueBoat29
+- Fixed some casings not being mineable with a wrench (#2123) @TomPlop
+### Translation updates
+- Chinese (simplified) @jmecn
+- Ukranian @MetEnBouldry
+- Japanese @sakura-gondra
+
 ## [0.11.5] - 22-10-2025
 - Fixed missing ComputerCraft in single player modpack, due to a bug in the latest pakku version
 

config/ftbquests/quests/chapters/ev__extreme_voltage.snbt

@@ -115,10 +115,10 @@
 			size: 2.0d
 			subtitle: "{quests.extreme_voltage.mars.subtitle}"
 			tasks: [{
-				dimension: "ad_astra:moon"
+				dimension: "ad_astra:mars"
 				icon: "ad_astra:mars_globe"
 				id: "18D9C6ACD5513680"
-				title: "I'm on the Moon"
+				title: "{quests.extreme_voltage.mars.task}"
 				type: "dimension"
 			}]
 			title: "{quests.extreme_voltage.mars.title}"

config/ftbquests/quests/chapters/hv__high_voltage.snbt

@@ -1127,7 +1127,7 @@
 				dimension: "ad_astra:moon"
 				icon: "ad_astra:moon_globe"
 				id: "39DDB5FE1449E38A"
-				title: "I'm on the Moon"
+				title: "{quests.high_voltage.welcome_moon.title}"
 				type: "dimension"
 			}]
 			title: "{quests.high_voltage.welcome_moon.title}"

config/ftbquests/quests/chapters/questssteam_age.snbt

@@ -1140,7 +1140,7 @@
 						Count: 1
 						id: "ftbfiltersystem:smart_filter"
 						tag: {
-							"ftbfiltersystem:filter": "or(item(gtceu:copper_wrench)item(gtceu:bronze_wrench)item(gtceu:black_bronze_wrench)item(gtceu:bismuth_bronze_wrench)item(gtceu:wrought_iron_wrench)item(gtceu:steel_wrench))"
+							"ftbfiltersystem:filter": "or(item(gtceu:copper_wrench)item(gtceu:bronze_wrench)item(gtceu:black_bronze_wrench)item(gtceu:bismuth_bronze_wrench)item(gtceu:wrought_iron_wrench)item(gtceu:steel_wrench)item(gtceu:cobalt_brass_wrench))"
 						}
 					}
 					type: "item"

config/ftbquests/quests/chapters/questsstoneage.snbt

@@ -517,6 +517,8 @@
 			]
 			description: ["{quests.stone_age.iron_flask.desc}"]
 			id: "11C45DBB20ED7647"
+			optional: true
+			shape: "heart"
 			subtitle: "{quests.stone_age.iron_flask.subtitle}"
 			tasks: [{
 				id: "6D628C84743356F0"
@@ -1705,6 +1707,7 @@
 			dependencies: ["560B17BFBE8D477D"]
 			description: ["{quests.stone_age.leather_armor.desc}"]
 			id: "04E900CFE39D6A6C"
+			optional: true
 			subtitle: "{quests.stone_age.leather_armor.subtitle}"
 			tasks: [
 				{
@@ -1820,12 +1823,12 @@
 		{
 			dependencies: ["1D40CAE675C4BB91"]
 			description: ["{quests.stone_age.water_bucket.desc}"]
+			icon: "minecraft:water_bucket"
 			id: "1F9321F1743A0B79"
 			subtitle: "{quests.stone_age.water_bucket.subtitle}"
 			tasks: [{
-				id: "17FFB1D3212BECEA"
-				item: "minecraft:water_bucket"
-				type: "item"
+				id: "64BE95016DF461FD"
+				type: "checkmark"
 			}]
 			title: "{quests.stone_age.water_bucket.title}"
 			x: 4.5d
@@ -1838,6 +1841,7 @@
 			]
 			description: ["{quests.stone_age.insulated_leather_clothes.desc}"]
 			id: "6D6270D9B2F1EC01"
+			optional: true
 			subtitle: "{quests.stone_age.insulated_leather_clothes.subtitle}"
 			tasks: [
 				{
@@ -1893,6 +1897,7 @@
 			dependencies: ["4521BB8892B386AF"]
 			description: ["{quests.stone_age.wool_clothes.desc}"]
 			id: "1E9033DF269C80DC"
+			optional: true
 			subtitle: "{quests.stone_age.wool_clothes.subtitle}"
 			tasks: [
 				{
@@ -1948,6 +1953,7 @@
 			dependencies: ["4521BB8892B386AF"]
 			description: ["{quests.stone_age.burlap_clothes.desc}"]
 			id: "1602438D9FCADA5E"
+			optional: true
 			subtitle: "{quests.stone_age.burlap_clothes.subtitle}"
 			tasks: [
 				{
@@ -2003,6 +2009,7 @@
 			dependencies: ["4521BB8892B386AF"]
 			description: ["{quests.stone_age.silk_clothes.desc}"]
 			id: "37108D618CF60730"
+			optional: true
 			subtitle: "{quests.stone_age.silk_clothes.subtitle}"
 			tasks: [
 				{

config/ftbquests/quests/chapters/space_survival.snbt

@@ -174,6 +174,10 @@
 			shape: "octagon"
 			size: 3.0d
 			subtitle: "{quests.space_survival.preparations.subtitle}"
+			tasks: [{
+				id: "6EEAC1505DD6E058"
+				type: "checkmark"
+			}]
 			title: "{quests.space_survival.preparations.title}"
 			x: -4.0d
 			y: -8.0d
@@ -1098,7 +1102,7 @@
 				Count: 1
 				ForgeCaps: {
 					"tfc:food": {
-						creationDate: 23862000L
+						creationDate: -9223372036854775808L
 						traits: [ ]
 					}
 					"tfc:item_heat": {

config/ftbquests/quests/chapters/tips__tools.snbt

@@ -874,6 +874,7 @@
 						TorchPlacing: 1b
 					}
 					GT.Tool: {
+						DefaultEnchantments: [ ]
 						HarvestLevel: 2
 						MaxDamage: 5543
 						ToolSpeed: 6.0f
@@ -2763,6 +2764,20 @@
 			x: -3.0d
 			y: 10.0d
 		}
+		{
+			dependencies: ["72B3EA6588E18CCC"]
+			description: ["{quests.tfg_tips.lightning_rod.desc}"]
+			id: "674B27738ADA1830"
+			subtitle: "{quests.tfg_tips.lightning_rod.subtitle}"
+			tasks: [{
+				id: "0BADD52A3A4E3E98"
+				item: "minecraft:lightning_rod"
+				type: "item"
+			}]
+			title: "{quests.tfg_tips.lightning_rod.title}"
+			x: 2.5d
+			y: 0.5d
+		}
 	]
 	subtitle: ["{quests.tfg_tips.tools_tips.subtitle}"]
 	title: "{quests.tfg_tips.tools_tips.title}"

defaultconfigs/ftbessentials.snbt

@@ -4,6 +4,18 @@
 {
 	# Admin commands for cheating and moderation
 	admin: {
+		# Allows admins to extinguish themselves or a player using a command
+		extinguish: {
+			# Default: true
+			enabled: true
+		}
+		
+		# Allows admins to fully feed themselves or a player using a command
+		feed: {
+			# Default: true
+			enabled: true
+		}
+		
 		# Allows admins to toggle flying status using a command, without having to use Creative Mode
 		fly: {
 			# Default: true
@@ -16,7 +28,7 @@
 			enabled: true
 		}
 		
-		# Allows admins to heal themselves using a command
+		# Allows admins to fully heal (health, food, fire, potion effects) themselves or a player using a command
 		heal: {
 			# Default: true
 			enabled: true
@@ -28,15 +40,45 @@
 			enabled: true
 		}
 		
+		# Allows admins to configure kits of items that can be given to players.
+		kit: {
+			# Default: true
+			enabled: true
+		}
+		
 		# Allows admins to restrict players from chatting by using a command to mute (or unmute) them
 		mute: {
 			# Default: true
 			enabled: true
 		}
+		
+		# Allows admins to change walk speed for themselves or a player
+		speed: {
+			# Default: true
+			enabled: true
+		}
+		
+		# Allows admins to change the location of offline players.
+		tp_offline: {
+			# Default: true
+			enabled: true
+		}
 	}
 	
 	# Miscellaneous features and utilities
 	misc: {
+		# Allows users to access an Anvil GUI without needing an Anvil.
+		anvil: {
+			# Default: true
+			enabled: true
+		}
+		
+		# Allows users to access a Crafting Table GUI without needing a Crafting Table.
+		crafting: {
+			# Default: true
+			enabled: true
+		}
+		
 		# Allows users to access their ender chest, as well as admins to manage other players' ender chests.
 		enderchest: {
 			# Default: true
@@ -46,7 +88,7 @@
 		# Allows users to set a custom hat as their head item by using a command
 		hat: {
 			# Default: true
-			enabled: false
+			enabled: true
 		}
 		
 		# Allows users to kick themselves from the server, for example if they are stuck or desynced
@@ -55,12 +97,18 @@
 			enabled: false
 		}
 		
-		# Allows users to view player leaderboard stats.
+		# Allows users to view leaderboard stats about everyone on the server.
 		leaderboard: {
 			# Default: true
 			enabled: true
 		}
 		
+		# Allows users to list nearby players, sorted by distance
+		near: {
+			# Default: true
+			enabled: true
+		}
+		
 		# Allows users to change their display name, as well as admins to change nicknames for other users
 		nick: {
 			# Default: true
@@ -73,6 +121,18 @@
 			enabled: false
 		}
 		
+		# Allows users to access a Smithing Table GUI without needing a Smithing Table.
+		smithing: {
+			# Default: true
+			enabled: true
+		}
+		
+		# Allows users to access a Stonecutter GUI without needing a Stonecutter.
+		stonecutter: {
+			# Default: true
+			enabled: true
+		}
+		
 		# Enables usage of a trash can inventory, which can be used to void unneeded items
 		trashcan: {
 			# Default: true
@@ -99,6 +159,10 @@
 			# Range: 0 ~ 2147483647
 			max: 10
 			
+			# Should be the /back command only be used for returning to the last death point?
+			# Default: false
+			only_on_death: false
+			
 			# Warm-up time before /back command executes (in seconds)
 			# You can override this with FTB Ranks using ftbessentials.back.warmup
 			# Default: 0
@@ -130,6 +194,12 @@
 			warmup: 0
 		}
 		
+		# Allows admins to jump (teleport) to the focused block
+		jump: {
+			# Default: true
+			enabled: true
+		}
+		
 		# Allows players to teleport to a random point in the Wilderness
 		# Note: This currently does not respect Claimed Chunks yet!
 		rtp: {
@@ -139,11 +209,21 @@
 			# Range: 0 ~ 604800
 			cooldown: 600
 			
+			# Blacklisted dimension ID's for /rtp (player *must not* be in any of these dimensions)
+			# Wildcarded dimensions (e.g. 'somemod:*') are supported
+			# Default: ["minecraft:the_end"]
+			dimension_blacklist: ["minecraft:the_end"]
+			
+			# Whitelisted dimension ID's for /rtp (if non-empty, player *must* be in one of these dimensions)
+			# Wildcarded dimensions (e.g. 'somemod:*') are supported
+			# Default: []
+			dimension_whitelist: [ ]
+			
 			# Default: true
 			enabled: false
 			
 			# /rtp max distance from spawn point
-			# Default: 100000
+			# Default: 25000
 			# Range: 0 ~ 30000000
 			max_distance: 100000
 			
@@ -153,7 +233,7 @@
 			max_tries: 100
 			
 			# /rtp min distance from spawn point
-			# Default: 1000
+			# Default: 500
 			# Range: 0 ~ 30000000
 			min_distance: 1000
 			
@@ -208,7 +288,7 @@
 		# Allows admins to teleport to dimension
 		tpx: {
 			# Default: true
-			enabled: false
+			enabled: true
 		}
 		
 		# Allows admins to create 'warps', which are fixed points in the world that users may teleport to using /warp

defaultconfigs/ftbranks/players.snbt

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

defaultconfigs/jumbofurnace-server.toml

@@ -1,10 +0,0 @@
-
-["Cooking Settings"]
-	#Cook Time: Time in ticks needed for one cooking cycle
-	#Range: > 1
-	cooktime = 200
-
-["Construction Settings"]
-	#Shearable: Allow jumbo furnaces to be cleanly dismantled with shears
-	shearable = true
-

eslint.config.js

@@ -13,7 +13,7 @@ export default defineConfig([
     }, 
 
     extends: ["js/recommended"], 
-    languageOptions: { globals: globals.node, ecmaVersion: 2015 },
+    languageOptions: { globals: globals.node, ecmaVersion: 2020 },
     rules: {
       "no-undef": "off",
       "no-unused-vars": "off",

kubejs/assets/ags_modernmarkings/lang/zh_cn.json

@@ -57,7 +57,7 @@
   "block.ags_modernmarkings.wall_marking_hazardline_left": "左转角警戒线墙面标识",
   "block.ags_modernmarkings.wall_marking_warning_danger": "危险警告墙面标识",
   "block.ags_modernmarkings.wall_marking_exit": "出口墙面标识",
-  "block.ags_modernmarkings.wall_marking_hazard_diamond": "危险品钻石标墙面标识",
+  "block.ags_modernmarkings.wall_marking_hazard_diamond": "危险品菱形墙面标识",
   "block.ags_modernmarkings.wall_marking_symbol_production": "生产区墙面标识",
   "block.ags_modernmarkings.wall_marking_symbol_radiation": "辐射警示墙面标识",
   "block.ags_modernmarkings.wall_marking_symbol_pinch": "挤压点警示墙面标识",

kubejs/assets/create/lang/ja_jp.json

@@ -0,0 +1,108 @@
+{
+  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
+  "block.create.netherite_backtank": "青鋼のバックタンク",
+  "block.create.industrial_iron_block": "鋼材ブロック",
+  "block.create.weathered_iron_block": "錆びた鋼材ブロック",
+  "block.create.industrial_iron_window": "鋼材の窓",
+  "block.create.weathered_iron_window": "錆びた鋼材の窓",
+  "block.create.industrial_iron_window_pane": "鋼材の板窓",
+  "block.create.weathered_iron_window_pane": "錆びた鋼材の板窓",
+  "block.create.dark_oak_window": "Hickory Window",
+  "block.create.dark_oak_window_pane": "Hickory Window Pane",
+  "block.create.cherry_window": "Fig Window",
+  "block.create.cherry_window_pane": "Fig Window Pane",
+  "block.create.spruce_window": "Cypress Window",
+  "block.create.spruce_window_pane": "Cypress Window Pane",
+  "block.create.jungle_window": "Teak Window",
+  "block.create.jungle_window_pane": "Teak Window Pane",
+  "block.create.birch_window": "Eucalyptus Window",
+  "block.create.birch_window_pane": "Eucalyptus Window Pane",
+  "block.create.acacia_window": "Baobab Window",
+  "block.create.acacia_window_pane": "Baobab Window Pane",
+  "block.create.andesite_bars": "錫合金格子",
+  "block.create.andesite_belt_funnel": "錬鉄ベルトファンネル",
+  "block.create.andesite_casing": "錬鉄ケーシング",
+  "block.create.andesite_door": "錫合金のドア",
+  "block.create.andesite_encased_cogwheel": "錬鉄ケース入り歯車",
+  "block.create.andesite_encased_large_cogwheel": "錬鉄ケース入り大きな歯車",
+  "block.create.andesite_encased_shaft": "錬鉄ケース入りシャフト",
+  "block.create.andesite_funnel": "錬鉄ファンネル",
+  "block.create.andesite_ladder": "錫合金のはしご",
+  "block.create.andesite_scaffolding": "錫合金の足場",
+  "block.create.andesite_tunnel": "錬鉄トンネル",
+  "block.create.andesite_table_cloth": "錬鉄のテーブルカバー",
+  "block.create.cut_deepslate": "研がれた混成岩",
+  "block.create.cut_deepslate_stairs": "研がれた混成岩の階段",
+  "block.create.cut_deepslate_slab": "研がれた混成岩の半ブロック",
+  "block.create.cut_deepslate_wall": "研がれた混成岩の塀",
+  "block.create.polished_cut_deepslate": "磨かれた研がれた混成岩",
+  "block.create.polished_cut_deepslate_stairs": "磨かれた研がれた混成岩の階段",
+  "block.create.polished_cut_deepslate_slab": "磨かれた研がれた混成岩の半ブロック",
+  "block.create.polished_cut_deepslate_wall": "磨かれた研がれた混成岩の塀",
+  "block.create.cut_deepslate_bricks": "研がれた混成岩レンガ",
+  "block.create.cut_deepslate_brick_stairs": "研がれた混成岩レンガの階段",
+  "block.create.cut_deepslate_brick_slab": "研がれた混成岩レンガの半ブロック",
+  "block.create.cut_deepslate_brick_wall": "研がれた混成岩レンガの塀",
+  "block.create.small_deepslate_bricks": "小さな混成岩レンガ",
+  "block.create.small_deepslate_brick_stairs": "小さな混成岩レンガの階段",
+  "block.create.small_deepslate_brick_slab": "小さな混成岩レンガの半ブロック",
+  "block.create.small_deepslate_brick_wall": "小さな混成岩レンガの塀",
+  "block.create.layered_deepslate": "混成岩の組石",
+  "block.create.deepslate_pillar": "混成岩の柱",
+  "block.create.cut_dripstone": "研がれた鍾乳石",
+  "block.create.cut_dripstone_stairs": "研がれた鍾乳石の階段",
+  "block.create.cut_dripstone_slab": "研がれた鍾乳石の半ブロック",
+  "block.create.cut_dripstone_wall": "研がれた鍾乳石の塀",
+  "block.create.polished_cut_dripstone": "磨かれた研がれた鍾乳石",
+  "block.create.polished_cut_dripstone_stairs": "磨かれた研がれた鍾乳石の階段",
+  "block.create.polished_cut_dripstone_slab": "磨かれた研がれた鍾乳石の半ブロック",
+  "block.create.polished_cut_dripstone_wall": "磨かれた研がれた鍾乳石の塀",
+  "block.create.cut_dripstone_bricks": "研がれた鍾乳石レンガ",
+  "block.create.cut_dripstone_brick_stairs": "研がれた鍾乳石レンガの階段",
+  "block.create.cut_dripstone_brick_slab": "研がれた鍾乳石レンガの半ブロック",
+  "block.create.cut_dripstone_brick_wall": "研がれた鍾乳石レンガの塀",
+  "block.create.small_dripstone_bricks": "小さな鍾乳石レンガ",
+  "block.create.small_dripstone_brick_stairs": "小さな鍾乳石レンガの階段",
+  "block.create.small_dripstone_brick_slab": "小さな鍾乳石レンガの半ブロック",
+  "block.create.small_dripstone_brick_wall": "小さな鍾乳石レンガの塀",
+  "block.create.layered_dripstone": "鍾乳石の組石",
+  "block.create.dripstone_pillar": "鍾乳石の柱",
+  "block.create.cut_granite": "研がれた角岩",
+  "block.create.cut_granite_stairs": "研がれた角岩の階段",
+  "block.create.cut_granite_slab": "研がれた角岩の半ブロック",
+  "block.create.cut_granite_wall": "研がれた角岩の塀",
+  "block.create.polished_cut_granite": "磨かれた研がれた角岩",
+  "block.create.polished_cut_granite_stairs": "磨かれた研がれた角岩の階段",
+  "block.create.polished_cut_granite_slab": "磨かれた研がれた角岩の半ブロック",
+  "block.create.polished_cut_granite_wall": "磨かれた研がれた角岩の塀",
+  "block.create.cut_granite_bricks": "研がれた角岩レンガ",
+  "block.create.cut_granite_brick_stairs": "研がれた角岩レンガの階段",
+  "block.create.cut_granite_brick_slab": "研がれた角岩レンガの半ブロック",
+  "block.create.cut_granite_brick_wall": "研がれた角岩レンガの塀",
+  "block.create.small_granite_bricks": "小さな角岩レンガ",
+  "block.create.small_granite_brick_stairs": "小さな角岩レンガの階段",
+  "block.create.small_granite_brick_slab": "小さな角岩レンガの半ブロック",
+  "block.create.small_granite_brick_wall": "小さな角岩レンガの塀",
+  "block.create.layered_granite": "組石角岩",
+  "block.create.granite_pillar": "角岩の柱",
+  "item.create.netherite_diving_helmet.tooltip.summary": "Together with a _Blue Steel Backtank_, this can protect you from _extreme heat_. To be effective, _Legs and Feet_ have to be covered in a _Blue Steel Diving Equipment_, too.",
+  "item.create.netherite_backtank": "青鋼のバックタンク",
+  "item.create.netherite_diving_helmet": "青鋼の潜水ヘルメット",
+  "item.create.netherite_diving_boots": "青鋼の潜水ブーツ",
+  "item.create.copper_sheet": "銅プレート",
+  "item.create.brass_sheet": "真鍮プレート",
+  "item.create.golden_sheet": "金プレート",
+  "item.create.crushed_raw_gold": "洗浄した金鉱石",
+  "item.create.crushed_raw_copper": "洗浄した銅鉱石",
+  "item.create.crushed_raw_zinc": "洗浄した亜鉛鉱石",
+  "item.create.crushed_raw_silver": "洗浄した銀鉱石",
+  "item.create.crushed_raw_tin": "洗浄した錫鉱石",
+  "item.create.crushed_raw_lead": "洗浄した鉛鉱石",
+  "create.ponder.andesite_tunnel.header": "Using Metal Tunnels",
+  "create.ponder.andesite_tunnel.text_1": "Metal Tunnels can be used to cover up your belts",
+  "create.ponder.andesite_tunnel.text_2": "Whenever an Metal Tunnel has connections to the sides...",
+  "create.ponder.belt_casing.text_1": "Brass or Metal Casing can be used to decorate Mechanical Belts",
+  "create.ponder.brass_funnel.text_1": "Metal Funnels can only ever extract single items.",
+  "create.ponder.cogwheel_casing.text_1": "Brass or Metal Casing can be used to decorate Cogwheels",
+  "create.ponder.shaft_casing.text_1": "Brass or Metal Casing can be used to decorate Shafts"
+}

kubejs/assets/createhorsepower/lang/ja_jp.json

@@ -0,0 +1,4 @@
+{
+  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
+  "block.createhorsepower.horse_crank": "アニマルクランク"
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1 +1 @@
-{"gtceu:evaporation_tower":{"order":141}}
+{"gtceu:evaporation_tower":{"order":138}}

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

@@ -1 +1 @@
-{"gtceu:extractor":{"order":102}}
+{"gtceu:extractor":{"order":101}}

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

@@ -1 +1 @@
-{"gtceu:extractor_recycling":{"order":103}}
+{"gtceu:extractor_recycling":{"order":156}}

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

@@ -1 +1 @@
-{"gtceu:extruder":{"order":105}}
+{"gtceu:extruder":{"order":103}}

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

@@ -1 +1 @@
-{"gtceu:fermenter":{"order":106}}
+{"gtceu:fermenter":{"order":104}}

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

@@ -1 +1 @@
-{"gtceu:fission_reactor":{"order":143}}
+{"gtceu:fission_reactor":{"order":140}}

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

@@ -1 +1 @@
-{"gtceu:fluid_heater":{"order":107}}
+{"gtceu:fluid_heater":{"order":105}}

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

@@ -1 +1 @@
-{"gtceu:fluid_solidifier":{"order":108}}
+{"gtceu:fluid_solidifier":{"order":106}}

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

@@ -1 +1 @@
-{"gtceu:forge_hammer":{"order":110}}
+{"gtceu:forge_hammer":{"order":108}}

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

@@ -1 +1 @@
-{"gtceu:forming_press":{"order":112}}
+{"gtceu:forming_press":{"order":110}}

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

@@ -1 +1 @@
-{"gtceu:fusion_reactor":{"order":144}}
+{"gtceu:fusion_reactor":{"order":141}}

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

@@ -1 +1 @@
-{"gtceu:gas_collector":{"order":113}}
+{"gtceu:gas_collector":{"order":111}}

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

@@ -1 +1 @@
-{"gtceu:gas_pressurizer":{"order":114}}
+{"gtceu:gas_pressurizer":{"order":112}}

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

@@ -1 +1 @@
-{"gtceu:greenhouse":{"order":145}}
+{"gtceu:greenhouse":{"order":142}}

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

@@ -1 +1 @@
-{"gtceu:heat_exchanger":{"order":146}}
+{"gtceu:heat_exchanger":{"order":143}}

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

@@ -1 +1 @@
-{"gtceu:implosion_compressor":{"order":147}}
+{"gtceu:implosion_compressor":{"order":144}}

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

@@ -1 +1 @@
-{"gtceu:large_chemical_reactor":{"order":92}}
+{"gtceu:large_chemical_reactor":{"order":91}}

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

@@ -1 +1 @@
-{"gtceu:laser_engraver":{"order":116}}
+{"gtceu:laser_engraver":{"order":114}}

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

@@ -1 +1 @@
-{"gtceu:lathe":{"order":118}}
+{"gtceu:lathe":{"order":116}}

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

@@ -1 +1 @@
-{"gtceu:macerator":{"order":121}}
+{"gtceu:macerator":{"order":119}}

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

@@ -1 +1 @@
-{"gtceu:macerator_recycling":{"order":122}}
+{"gtceu:macerator_recycling":{"order":155}}

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

@@ -1 +1 @@
-{"gtceu:mixer":{"order":124}}
+{"gtceu:mixer":{"order":121}}

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

@@ -1 +1 @@
-{"gtceu:moon_dust_harvester":{"order":150}}
+{"gtceu:moon_dust_harvester":{"order":147}}

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

@@ -1 +1 @@
-{"gtceu:nuclear_fuel_factory":{"order":148}}
+{"gtceu:nuclear_fuel_factory":{"order":145}}

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

@@ -1 +1 @@
-{"gtceu:ore_bathing":{"order":90}}
+{"gtceu:ore_bathing":{"order":89}}

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

@@ -1 +1 @@
-{"gtceu:ore_crushing":{"order":123}}
+{"gtceu:ore_crushing":{"order":120}}

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

@@ -1 +1 @@
-{"gtceu:ore_forging":{"order":111}}
+{"gtceu:ore_forging":{"order":109}}

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

@@ -1 +1 @@
-{"gtceu:ore_washer":{"order":126}}
+{"gtceu:ore_washer":{"order":123}}

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

@@ -1 +1 @@
-{"gtceu:ostrum_harvester":{"order":149}}
+{"gtceu:ostrum_harvester":{"order":146}}

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

@@ -1 +1 @@
-{"gtceu:ostrum_linear_accelerator":{"order":142}}
+{"gtceu:ostrum_linear_accelerator":{"order":139}}

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

@@ -1 +1 @@
-{"gtceu:packer":{"order":128}}
+{"gtceu:packer":{"order":125}}

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

@@ -1 +1 @@
-{"gtceu:polarizer":{"order":129}}
+{"gtceu:polarizer":{"order":126}}

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

@@ -1 +1 @@
-{"gtceu:pyrolyse_oven":{"order":151}}
+{"gtceu:pyrolyse_oven":{"order":148}}

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

@@ -1 +1 @@
-{"gtceu:research_station":{"order":152}}
+{"gtceu:research_station":{"order":149}}

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

@@ -1 +1 @@
-{"gtceu:rock_breaker":{"order":130}}
+{"gtceu:rock_breaker":{"order":127}}

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

@@ -1 +1 @@
-{"gtceu:scanner":{"order":131}}
+{"gtceu:scanner":{"order":128}}

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

@@ -1 +1 @@
-{"gtceu:sifter":{"order":133}}
+{"gtceu:sifter":{"order":130}}

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

@@ -1 +1 @@
-{"gtceu:steam_bloomery":{"order":153}}
+{"gtceu:steam_bloomery":{"order":150}}

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

@@ -1 +1 @@
-{"gtceu:thermal_centrifuge":{"order":134}}
+{"gtceu:thermal_centrifuge":{"order":131}}

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

@@ -1 +1 @@
-{"gtceu:vacuum_freezer":{"order":154}}
+{"gtceu:vacuum_freezer":{"order":151}}

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

@@ -1 +1 @@
-{"gtceu:wire_coating":{"order":155}}
+{"gtceu:wire_coating":{"order":152}}

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

@@ -1 +1 @@
-{"gtceu:wiremill":{"order":136}}
+{"gtceu:wiremill":{"order":133}}

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

@@ -1 +1 @@
-{"vintageimprovements:centrifugation":{"order":86}}
+{"vintageimprovements:centrifugation":{"order":85}}

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

@@ -1 +1 @@
-{"vintageimprovements:coiling":{"order":135}}
+{"vintageimprovements:coiling":{"order":132}}

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

@@ -1 +1 @@
-{"vintageimprovements:curving":{"order":104}}
+{"vintageimprovements:curving":{"order":102}}