missed some stuff

config/enigmaticgraves-common.toml

@@ -0,0 +1,39 @@
+
+#Misc Options
+[misc]
+	#Should you get a grave finder item after you respawn?
+	spawnGraveFinder = true
+	#Set to false to disable retrieval by sneaking on top of the grave.
+	sneakRetrieval = true
+
+#How the grave data is handled
+[data]
+	#Defines how the experience should be handled when the player dies.
+	#DROP: Drops the xp as normal.
+	#REMOVE: Doesn't drop or restore the xp. Effectively removes it on death.
+	#KEEP_VANILLA: Stores the same amount of xp that would've been dropped normally into the grave.
+	#KEEP_ALL: Stores all the players xp in the graves to restore it.
+	#Allowed Values: DROP, REMOVE, KEEP_VANILLA, KEEP_ALL
+	experienceHandling = "KEEP_ALL"
+	#Defines the amount of entries per player that can be stored to retrieve using commands.
+	#Once the entry count overflows, the oldest entries will be removed.
+	#Range: 1 ~ 99
+	graveEntryCount = 10
+
+#Grave Spawn Place Handling
+#The grave will first scan down from the death position until it finds a solid block to place the grave on.
+#If there is no solid block below the death position, it will attempt to scan from the 'scanHeight' value
+#It will scan up to +-'scanRange' in attempt to find a solid block with 2 air blocks above it to spawn the grave on.
+#If it fails to find a place, it will then either: 
+#   - Place a block at y=1 with the grave on top, if the 'scanHeight' were filled with block
+#   - Place a block at y='scanHeight' with the grave on top, if the 'scanHeight' were filled with air
+[position]
+	#The scanning start position for a valid place to spawn
+	#Range: -64 ~ 319
+	scanHeight = 60
+	#The vertical range (up/down) from the initial position to scan for a valid spot to place a grave
+	#Range: -64 ~ 319
+	scanRange = 10
+	#The block that should spawn below the grave if there is none
+	floorBlock = "minecraft:dirt"
+

config/ftbquests/quests/chapters/ev__extreme_voltage.snbt

@@ -731,7 +731,7 @@
 				}
 			]
 			title: "The \"Fun\" will never stop"
-			x: 3.375d
+			x: 5.625d
 			y: 6.75d
 		}
 		{
@@ -754,29 +754,6 @@
 			x: 5.625d
 			y: 4.5d
 		}
-		{
-			dependencies: [
-				"40408FFD02134148"
-				"4AFD3073C731A1E4"
-				"7FA0ACB7F161F378"
-			]
-			description: [
-				"You've probably noticed the &9\"chance per tier\"&r when hovering over the bonus outputs in &2EMI&r Each overclock above the required tier will add that % bonus to the chanced output!"
-				""
-				"This means using an &3EV Macerator&r will yield &6more Byproducts&r!"
-			]
-			id: "7B23AF5B6B62BC19"
-			size: 0.75d
-			subtitle: "Avarice and hedonism in a single block"
-			tasks: [{
-				id: "4EC5F44332F7533B"
-				item: "gtceu:ev_macerator"
-				type: "item"
-			}]
-			title: "Even More Byproducts"
-			x: 5.625d
-			y: 6.75d
-		}
 		{
 			dependencies: [
 				"73E8283634E5E33A"
@@ -1035,21 +1012,40 @@
 				"16B735F9C391D260"
 			]
 			description: [
-				"In lieu of GTCEu's &3Ender Fluid Links&r being fully implemented, &dEnder Storage&r makes its way into the pack."
+				"&aEnder Fluid Link Covers&r are &dGregTech&r's &r&3Ender Tanks&r. Each Cover sends fluids through a frequency defined by an &68-digit hexadecimal number&r (0-9, then A-F for each digit). That gives you &64.29 billion&r channels to work with! Ender fluid Link Covers work as long as their chunk is loaded - regardless of distance or dimension."
 				""
-				"Recipes have been adjusted to a &asimilar tier&r. You can change the \"frequency\" of &6each tank&r by using dye on the wool pads on top."
+				"Setting the mode to Import will &o&c&opull&r fluids from the world location it is attached to, while Export will &o&9&opush&r fluids to the world. Each channel has a buffer of &d64 buckets&r."
 				""
-				"You can also make similar &3Ender Chests&r to transport items - which is nice, because there's currently &cno way&r to wirelessly transport items in base &bGTCEu&r! Don't ever say we don't treat you!"
+				"You can also make similar &3Ender Item Link Covers&r to transport items, these have the same mechanics as the fluid ones. Craft any of them to complete this quest"
 				""
-				"Lastly, using a &eDiamond&r on an Ender Tank will lock the tank to your own &dprivate frequency&r, which is helpful if you're playing on a server."
+				"Lastly, clicking on the &eLock&r in the ui lock the cover to your own &dprivate channel&r, which is helpful if you're playing on a server."
+				"{@pagebreak}"
+				"You can assign a description to each channel in the cover, and list all of them. I recommend you set up a system to organise all those channels. I would also advise against using the default channel (FFFFFFFF) in all cases."
+				""
+				"&l&3Lore:&r&o Before these were added to GTm, we had &dEnder Storage&r&o in the pack. If you are still using them we &lhighly&r&o recommend changing them over to the &aGregTech covers&r&o, which can be done in a crafting table."
 			]
 			id: "23A7E6D95549B1F8"
 			shape: "rsquare"
 			size: 0.66d
 			subtitle: "Ender? I ha- Ok, this joke is old"
 			tasks: [{
-				id: "5AAF6386B4AA7C69"
+				id: "063E326F5BEA79A5"
-				item: "enderstorage:ender_tank"
+				item: {
+					Count: 1
+					id: "itemfilters:or"
+					tag: {
+						items: [
+							{
+								Count: 1b
+								id: "gtceu:ender_fluid_link_cover"
+							}
+							{
+								Count: 1b
+								id: "gtceu:ender_item_link_cover"
+							}
+						]
+					}
+				}
 				type: "item"
 			}]
 			title: "Ender Fluid Linking"

config/ftbquests/quests/chapters/gtceu.snbt

@@ -8,9 +8,7 @@
 		id: "gtceu:iron_wrench"
 		tag: {
 			Damage: 0
-			GT.Tool: {
+			GT.Tool: { }
-				Damage: 0
-			}
 		}
 	}
 	id: "2F8B0AFE317363C9"
@@ -187,9 +185,7 @@
 				id: "gtceu:steel_axe"
 				tag: {
 					Damage: 0
-					GT.Tool: {
+					GT.Tool: { }
-						Damage: 0
-					}
 				}
 			}
 			id: "13354F24F80F65FB"
@@ -743,9 +739,7 @@
 					id: "gtceu:steel_hammer"
 					tag: {
 						Damage: 0
-						GT.Tool: {
+						GT.Tool: { }
-							Damage: 0
-						}
 					}
 				}
 				id: "1A4DDB914D7D2F3C"
@@ -781,9 +775,7 @@
 				id: "gtceu:steel_mining_hammer"
 				tag: {
 					Damage: 0
-					GT.Tool: {
+					GT.Tool: { }
-						Damage: 0
-					}
 				}
 			}
 			id: "4A365A7CC9E374F9"
@@ -796,9 +788,7 @@
 					id: "gtceu:steel_mining_hammer"
 					tag: {
 						Damage: 0
-						GT.Tool: {
+						GT.Tool: { }
-							Damage: 0
-						}
 					}
 				}
 				id: "4F372C393ADC6CE2"
@@ -908,9 +898,7 @@
 				id: "gtceu:iron_wrench"
 				tag: {
 					Damage: 0
-					GT.Tool: {
+					GT.Tool: { }
-						Damage: 0
-					}
 				}
 			}
 			id: "2001CB4968D3E0A2"
@@ -980,8 +968,6 @@
 				"&9&lScythe:&r A powerful farming tool that can automatically replant your crops in a large area. It's also a surprisingly good weapon!"
 				""
 				"&9&lPlunger:&r A tool to clear stuck fluids from GregTech&a machines."
-				""
-				"&9&lButchery Knife:&r A weapon that comes pre-enchanted with &6Looting III&r. You might want to use it to gather leather and food."
 				"{@pagebreak}"
 				"&e&lNote:&r This quest's reward is &3Damascus Steel&r - a rare material which can only be found as overworld loot. It far surpasses the materials you have now, so be sure to use it."
 			]
@@ -991,7 +977,7 @@
 				tag: {
 					Damage: 0
 					GT.Tool: {
-						Damage: 0
+						DefaultEnchantments: [ ]
 					}
 				}
 			}
@@ -1329,9 +1315,7 @@
 						id: "gtceu:iron_shovel"
 						tag: {
 							Damage: 0
-							GT.Tool: {
+							GT.Tool: { }
-								Damage: 0
-							}
 						}
 					}
 					type: "item"
@@ -1342,13 +1326,13 @@
 						Count: 1
 						id: "gtceu:iron_axe"
 						tag: {
+							Damage: 0
 							DisallowContainerItem: 0b
 							GT.Behaviours: {
 								DisableShields: 1b
 								TreeFelling: 1b
 							}
 							GT.Tool: {
-								Damage: 0
 								HarvestLevel: 2
 								MaxDamage: 255
 								ToolSpeed: 4.0f

config/ftbquests/quests/chapters/hv__high_voltage.snbt

@@ -461,6 +461,8 @@
 				"Visiting &dThe End&r allows you to access a richer Bauxite vein, as well as &9Ilmenite&r - an even better source of Rutile."
 				""
 				"&9Tip:&r Ore processing for &aBauxite&r is ridiculously good! Including the &3Thermal Centrifuge&r step easily &6triples&r your &aRutile&r yield."
+				""
+				"&9Bonus Tip:&r There is also an alternate route you can process &aPurified Bauxite&r in a &3Mixer&r and process into a greater return of &aRutile&r, however this is much harder to initally batch so it is more ideal to use when you set up a dedicated Titanium processing line."
 			]
 			icon: "gtceu:rutile_dust"
 			id: "59DFC4DA7D29C315"
@@ -1035,7 +1037,11 @@
 				""
 				"&aToluene&r can also optionally be used in &5EV&r to make &dGasoline&r."
 				""
-				"&cTNT&r is used in the &3Implosion Compressor&r to make Gems. It also blows stuff (and your friends) up."
+				"&cTNT&r is used in the &3Implosion Compressor&r to make Gems. It also blows stuff (and your friends) up. "
+				"{@pagebreak}"
+				"&cITNT&r can also be used in the &3Implosion Compressor&r at a better rate but require &aNitration Mixture&r to make. It also ignites when punched so be careful when it is placed."
+				""
+				"Get &9either&r TNT or ITNT to complete this quest."
 				""
 				"Technically, Dynamite or Powerbarrels could also be used... but Dynamite is a pain to obtain, whereas Powerbarrels are weaker."
 			]
@@ -1047,11 +1053,28 @@
 				{
 					id: "1CB85F57BA45252D"
 					item: "gtceu:gelled_toluene"
+					optional_task: true
 					type: "item"
 				}
 				{
 					id: "04BF6A36E965C348"
-					item: "minecraft:tnt"
+					item: {
+						Count: 1
+						id: "itemfilters:or"
+						tag: {
+							items: [
+								{
+									Count: 1b
+									id: "minecraft:tnt"
+								}
+								{
+									Count: 1b
+									id: "gtceu:industrial_tnt"
+								}
+							]
+						}
+					}
+					title: "TNT"
 					type: "item"
 				}
 			]

config/ftbquests/quests/chapters/iv__insane_voltage.snbt

@@ -483,7 +483,9 @@
 				"14D277A164202FF8"
 			]
 			description: [
-				"Better Ore Processing for &6chanced Byproducts&r, only at the cost of this &3Macerator&r! A must have."
+				"Faster Ore Processing only at the cost of this &3Macerator&r! A must have."
+				""
+				"Also used to craft the &3Large Maceration Tower&r."
 				""
 				"And now, it's finally time for mass ore processing automation."
 				""
@@ -497,7 +499,7 @@
 				item: "gtceu:iv_macerator"
 				type: "item"
 			}]
-			title: "Shredding your Ores with further more Byproducts"
+			title: "Shredding your Ores with greater speed"
 			x: 1.5d
 			y: 4.875d
 		}
@@ -1091,10 +1093,10 @@
 				Count: 1
 				id: "gtceu:polybenzimidazole_mallet"
 				tag: {
+					Damage: 0
 					DisallowContainerItem: 0b
 					GT.Behaviours: { }
 					GT.Tool: {
-						Damage: 0
 						MaxDamage: 1023
 					}
 					HideFlags: 2
@@ -1110,10 +1112,10 @@
 					Count: 1
 					id: "gtceu:polybenzimidazole_mallet"
 					tag: {
+						Damage: 0
 						DisallowContainerItem: 0b
 						GT.Behaviours: { }
 						GT.Tool: {
-							Damage: 0
 							MaxDamage: 1023
 						}
 						HideFlags: 2

config/ftbquests/quests/chapters/lv__low_voltage.snbt

@@ -430,11 +430,11 @@
 		{
 			dependencies: ["32EA7E81885C8E87"]
 			description: [
-				"The Lathe is an important machine to help shape metals. Thanks to it, you can turn &6one Ingot into two Rods&r, and &6one Bolt into one screw&r. That's twice the efficiency on those recipes as opposed to crafting by hand."
+				"The Lathe is an important machine to help shape metals. Thanks to it, you can turn &6one Ingot into one Rod and 2 small piles of Dust&r, and &6one Bolt into one screw&r. That's twice the material efficiency on those recipes as opposed to crafting by hand. "
-				"{@pagebreak}"
-				"&l&3Lore:&r&o The GregTech 5 Lathe produces one Rod and 2 small piles of Dust per Ingot. We also have a setting for this in GTCEu, but it's turned off by default."
 				""
-				"&oThe GT6 Lathe acts like GT5's, but Bolts lathe into one Screw and 1/72 of a pile of Dust. Disgusting!"
+				"However the &bMV&r &3Extruder&r has the ability to turn &6one Ingot&r directly into &6two Rods&r alongside its many other functions."
+				""
+				"&l&3Lore:&r &oThe GT6 Lathe acts like GTm's lathe, but Bolts lathe into one Screw and 1/72 of a pile of Dust. Disgusting!"
 			]
 			id: "07E7678095258EDB"
 			rewards: [{
@@ -506,19 +506,21 @@
 			description: [
 				"&oThe &3Large Boiler&r is an &6optional&r big-boy variant of the Small Boilers. It runs off solid or liquid fuel."
 				""
-				"If you want Steam-based power production, this will be your first port-of-call. Other power options are listed in the &bMV&r chapter."
+				"If you want Steam-based power production, this will be your first port-of-call. Other power options are listed in the &bMV&r chapter, if you want to invest in those, you can &cskip this quest&r with the checkmark."
 				""
-				"We should note that the LBB in its &bcurrent state&r isn't... great. It's probably better to use an alternate fuel source for now (or just spam &dsingleblock Boilers&r). This will be &2rebalanced&r in due time, don't you worry. For that reason, though, you can &cskip this quest&r with the checkmark."
+				"One \"easy\" fuel option is producing &dCharcoal&r from &3Coke Ovens&r. One piece of Charcoal lasts 20s in the LBB and the wood can be sourced from a tree farm."
 				""
 				"&cImportant:&r This Boiler &lCAN&r also &cexplode&r similarly to the regular Boilers! Usually, the explosion can be rather devastating... but it's configured to not damage blocks or entities in this modpack."
 				"{@pagebreak}"
 				"&cWater supply is &lcrucial&r&r. Dedicate a &3Primitive Pump&r with a &7LV&r Output Hatch in the &lsame chunk&r as the Boiler. Any biome will still be enough to supply enough water."
 				""
-				"Once fully heated up, the &3LBB&r produces 800 Steam per tick, which is &d400EU/t&r after conversion, or 12.5 Basic Steam Turbines. Such (relatively!) immense power comes at the cost of &la lot&r of burnable fuel."
+				"Once fully heated up, the &3LBB&r produces 800 Steam per tick, which is &d400EU/t&r after conversion, or 12.5 Basic Steam Turbines. Such (relatively!) immense power comes at the cost of automating fuel."
 				"{@pagebreak}"
 				"&5&lWith this in consideration&r, the GUI lets you &9throttle&r the Boiler down to 25% power for 200 Steam per tick. That's &d100EU/t&r, or slightly above 3 Basic Steam Turbines."
 				""
 				"&9Note:&r An in-depth tutorial about Multiblocks is given after you get the &3Electric Blast Furnace&r. We recommend you aim for that first."
+				""
+				"&l&3Lore:&r&o The LBB used to be terrible, however it recently got rebalanced in 7.3.0 to make it actually viable to use."
 			]
 			icon: "gtceu:bronze_large_boiler"
 			id: "33263404ED38C6D2"
@@ -610,8 +612,6 @@
 				""
 				"A small amount of &dFlawless Emeralds&r will be required in &bMV&r, and running ores in &3Sifting Machine&r is how you obtain these."
 				""
-				"Each higher tier of &3Sifter&r increases the chance of all Gem types to be found, at the cost of more energy. "
-				""
 				"&9Note:&r If you crushed Gem Ores (such as Diamond), it is critical you use this machine to recover the actual gems in non dust form. However, this is a rather slow process, so you may want to smelt this type of ore directly into the Gem."
 			]
 			id: "7A64425597F58015"
@@ -1744,7 +1744,7 @@
 				type: "item"
 			}]
 			title: "Gallium Arsenide"
-			x: 1.125d
+			x: 2.25d
 			y: 7.875d
 		}
 		{
@@ -2258,6 +2258,7 @@
 				id: "gtceu:lv_iron_drill"
 				tag: {
 					Charge: 2147483647L
+					Damage: 0
 					DisallowContainerItem: 0b
 					GT.Behaviours: {
 						AoEColumn: 1
@@ -2268,7 +2269,6 @@
 						MaxAoERow: 1
 					}
 					GT.Tool: {
-						Damage: 0
 						HarvestLevel: 2
 						MaxDamage: 767
 						ToolSpeed: 6.0f
@@ -2289,6 +2289,7 @@
 						id: "gtceu:lv_iron_drill"
 						tag: {
 							Charge: 2147483647L
+							Damage: 0
 							DisallowContainerItem: 0b
 							GT.Behaviours: {
 								AoEColumn: 1
@@ -2299,7 +2300,6 @@
 								MaxAoERow: 1
 							}
 							GT.Tool: {
-								Damage: 0
 								HarvestLevel: 2
 								MaxDamage: 767
 								ToolSpeed: 6.0f
@@ -2431,10 +2431,10 @@
 				Count: 1
 				id: "gtceu:polybenzimidazole_mallet"
 				tag: {
+					Damage: 0
 					DisallowContainerItem: 0b
 					GT.Behaviours: { }
 					GT.Tool: {
-						Damage: 0
 						MaxDamage: 1023
 					}
 					HideFlags: 2
@@ -2501,6 +2501,111 @@
 			x: -2.25d
 			y: 7.875d
 		}
+		{
+			dependencies: [
+				"257DB4B39B2A928E"
+				"581CDF545E1EA1FD"
+			]
+			description: [
+				"&3Concrete&r and &3Studs&r are two decorative block families added that increse your speed when walking on them, with &3Concrete&r increasing your speed more."
+				""
+				"Get &9either&r of them to complete this quest."
+			]
+			hide_dependency_lines: true
+			icon: "gtceu:light_concrete"
+			id: "41DD503169987D50"
+			shape: "rsquare"
+			size: 0.66d
+			subtitle: "Subsonic!"
+			tasks: [{
+				id: "755F679F2DA97A4F"
+				item: {
+					Count: 1
+					id: "itemfilters:or"
+					tag: {
+						items: [
+							{
+								Count: 1b
+								id: "gtceu:light_concrete"
+							}
+							{
+								Count: 1b
+								id: "gtceu:dark_concrete"
+							}
+							{
+								Count: 1b
+								id: "gtceu:white_studs"
+							}
+							{
+								Count: 1b
+								id: "gtceu:orange_studs"
+							}
+							{
+								Count: 1b
+								id: "gtceu:magenta_studs"
+							}
+							{
+								Count: 1b
+								id: "gtceu:light_blue_studs"
+							}
+							{
+								Count: 1b
+								id: "gtceu:yellow_studs"
+							}
+							{
+								Count: 1b
+								id: "gtceu:lime_studs"
+							}
+							{
+								Count: 1b
+								id: "gtceu:pink_studs"
+							}
+							{
+								Count: 1b
+								id: "gtceu:gray_studs"
+							}
+							{
+								Count: 1b
+								id: "gtceu:light_gray_studs"
+							}
+							{
+								Count: 1b
+								id: "gtceu:cyan_studs"
+							}
+							{
+								Count: 1b
+								id: "gtceu:purple_studs"
+							}
+							{
+								Count: 1b
+								id: "gtceu:blue_studs"
+							}
+							{
+								Count: 1b
+								id: "gtceu:brown_studs"
+							}
+							{
+								Count: 1b
+								id: "gtceu:green_studs"
+							}
+							{
+								Count: 1b
+								id: "gtceu:red_studs"
+							}
+							{
+								Count: 1b
+								id: "gtceu:black_studs"
+							}
+						]
+					}
+				}
+				title: "Blocks"
+				type: "item"
+			}]
+			title: "Gotta go fast"
+			x: 1.12d
+			y: 7.875d
+		}
 	]
 	subtitle: ["Tame electricity and make your first machines"]
 	title: "&7LV&r - Low Voltage"

config/ftbquests/quests/chapters/mv__medium_voltage.snbt

@@ -103,7 +103,7 @@
 			}]
 			title: "Biomass"
 			x: 0.0d
-			y: -1.875d
+			y: -2.64d
 		}
 		{
 			dependencies: ["74180AC57AE9F0FE"]
@@ -142,7 +142,7 @@
 				}
 			]
 			title: "Local Brewery selling Booze"
-			x: 1.125d
+			x: -1.125d
 			y: -1.875d
 		}
 		{
@@ -197,7 +197,7 @@
 			}]
 			title: "Ethanol"
 			x: 0.0d
-			y: -3.0d
+			y: -3.63d
 		}
 		{
 			dependencies: ["6A304E453D74C57C"]
@@ -265,7 +265,7 @@
 		{
 			dependencies: [
 				"0DBC148D92A9F69F"
-				"7567E885B7166603"
+				"1BE0349B8F3890D3"
 				"6E186F9C57155BFA"
 			]
 			description: [
@@ -310,8 +310,8 @@
 				type: "item"
 			}]
 			title: "Electricity Generation in MV"
-			x: 2.25d
+			x: 0.0d
-			y: -1.875d
+			y: 2.44d
 		}
 		{
 			dependencies: ["2AD44111B9B39C90"]
@@ -376,8 +376,8 @@
 				type: "item"
 			}]
 			title: "Transformers"
-			x: 0.0d
+			x: 1.125d
-			y: -0.75d
+			y: 2.44d
 		}
 		{
 			dependencies: [
@@ -839,8 +839,8 @@
 				type: "item"
 			}]
 			title: "Greenhouse"
-			x: 0.0d
+			x: -1.125d
-			y: -1.875d
+			y: 0.375d
 		}
 		{
 			dependencies: [
@@ -1579,8 +1579,8 @@
 				type: "checkmark"
 			}]
 			title: "It will Melt Your Flesh"
-			x: 2.25d
+			x: 3.375d
-			y: -4.125d
+			y: -3.0d
 		}
 		{
 			dependencies: [
@@ -1625,7 +1625,7 @@
 				""
 				"The Extruder shapes solid materials into (almost!) any form using &aIngots&r. This is a great way to reduce the amount of microcrafting, as well as keeping a high conversion ratio."
 				""
-				"The Extruder can make &6Bolts&r, &6&6Small Gears&r, &6Gears&r, and &6&6Rings&r at the highest efficiency in a single step!"
+				"The Extruder can make &6Rods&r, &6Bolts&r, &6&6Small Gears&r, &6Gears&r, and &6&6Rings&r at the highest efficiency in a single step!"
 				""
 				"You may also like to use it for &dPipes&r, &dLong Rods&r, and &dRotors&r."
 			]
@@ -2310,8 +2310,8 @@
 				type: "item"
 			}]
 			title: "I Believe I Can Fly"
-			x: -5.625d
+			x: -3.37d
-			y: -0.75d
+			y: -3.56d
 		}
 		{
 			dependencies: ["75F38905DEA60F15"]

config/ftbquests/quests/chapters/steam_age.snbt

@@ -299,9 +299,7 @@
 						id: "gtceu:red_steel_pickaxe"
 						tag: {
 							Damage: 0
-							GT.Tool: {
+							GT.Tool: { }
-								Damage: 0
-							}
 						}
 					}
 					type: "item"
@@ -459,8 +457,6 @@
 				""
 				"Introducing... &aDrums&r! They have large internal buffers, and any &aDrum&r can be broken and picked up and will &dkeep the fluid&r inside."
 				"{@pagebreak}"
-				"&l&4[ NOT YET IMPLEMENTED ]"
-				""
 				"Additionally, &binternal tanks&r from machines will interact with items containing fluid. This is great for manual crafting - this means you can use fluid drums instead of multiple buckets in crafting. To &5void fluid&r contained in a Drum, place it alone in any crafting grid."
 				""
 				"&o&7Pssst:&8 &oA right-click with a Screwdriver allows a Drum to drain its content into another container placed under it. This is great if you want to keep your Liquid Boilers fueled for longer."
@@ -496,7 +492,7 @@
 				"{@pagebreak}"
 				"The &cOutput Hatch&r is where water will be generated. You can make it face up or down to auto-output water into your pipes, which can go &ethrough&r the Treated Wood Frames - just place the pipe before you encase it in the frames. "
 				""
-				"When you reach &7LV&r or &bMV&r, you can use an Output Hatch from either tier to further boost the Pump's output."
+				"Later you can use a &8ULV&r or &7LV&r Output Hatch to further boost the Pump's output."
 				""
 				"&2Reminder:&r Use a Wrench to rotate GregTech blocks (sneak right-click)."
 				""
@@ -1133,19 +1129,16 @@
 		}
 		{
 			dependencies: ["48AED37B4E20A99A"]
-			description: ["Invar has &650% more durability&r when used in GregTech tools compared to Iron (yes, that is the same as &aWrought Iron&r), and comes with inherent &bEfficiency I&r. Great for mining - you might want to consider using this in your tools if you &5haven't unlocked&r Steel."]
+			description: ["Invar has &650% more durability&r when used in GregTech tools compared to Iron (yes, that is the same as &aWrought Iron&r). Great for mining - you might want to consider using this in your tools if you &5haven't unlocked&r Steel."]
 			id: "76F61E499780C30B"
 			rewards: [{
-				id: "15C0F36A7E35F7A6"
+				id: "4B335E308869FC4B"
 				item: {
 					Count: 1
 					id: "gtceu:invar_mining_hammer"
 					tag: {
+						Damage: 0
 						DisallowContainerItem: 0b
-						Enchantments: [{
-							id: "minecraft:efficiency"
-							lvl: 1s
-						}]
 						GT.Behaviours: {
 							AoEColumn: 1
 							AoELayer: 0
@@ -1153,9 +1146,12 @@
 							MaxAoEColumn: 1
 							MaxAoELayer: 0
 							MaxAoERow: 1
+							TorchPlacing: 1b
 						}
 						GT.Tool: {
-							Damage: 0
+							AttackDamage: 4.5f
+							AttackSpeed: -3.2f
+							DefaultEnchantments: [ ]
 							HarvestLevel: 2
 							MaxDamage: 1151
 							ToolSpeed: 5.6f
@@ -1619,9 +1615,11 @@
 				""
 				"The &3Wooden Multiblock Tank&r&r holds &a250,000 mB&r, but you won't be able to use it to store &chot Fluids&r such as Lava, or &cGases&r such as Steam or Oxygen."
 				""
-				"The &3Steel Multiblock Tank&r holds &a1,000,000 mB&r, and lifts the aforementioned fluid restrictions."
+				"The &3Bronze Multiblock Tank&r holds &a500,000 mB&r, lifiting the maximum fluid tempreture and can now store &cGases&r. "
 				""
-				"Get &eany&r of the Tanks to complete this quest. The Steel version is &dway too expensive&r right now - so you should probably make the Wooden one instead."
+				"The &3Steel Multiblock Tank&r holds &a1,000,000 mB&r, and lifts all the aforementioned fluid restrictions."
+				""
+				"Get &eany&r of the Tanks to complete this quest. The Steel version is &dway too expensive&r right now - so you should probably make the Wooden  or Bronze one instead."
 				"{@pagebreak}"
 				"Fluid transfer can either be facilitated through the Controller block, or through up to &atwo Valves&r."
 				""
@@ -1665,6 +1663,10 @@
 								}
 								{
 									Count: 1b
+									id: "gtceu:bronze_multiblock_tank"
+								}
+								{
+									Count: 1
 									id: "gtceu:steel_multiblock_tank"
 								}
 							]
@@ -1684,6 +1686,10 @@
 									Count: 1b
 									id: "gtceu:wooden_tank_valve"
 								}
+								{
+									Count: 1b
+									id: "gtceu:bronze_tank_valve"
+								}
 								{
 									Count: 1b
 									id: "gtceu:steel_tank_valve"
@@ -1706,6 +1712,10 @@
 									Count: 1b
 									id: "gtceu:solid_machine_casing"
 								}
+								{
+									Count: 1b
+									id: "gtceu:steam_machine_casing"
+								}
 								{
 									Count: 1b
 									id: "gtceu:wood_wall"

config/ftbquests/quests/chapters/tips_and_tricks_2.snbt

@@ -684,7 +684,7 @@
 			description: [
 				"A shopping list for anyone looking to automate &6Ore Processing&r on a large scale:"
 				""
-				"&9-&r One or more &3IV Macerators&r (the higher the tier, the higher your chances of byproducts!)."
+				"&9-&r One or more &3IV Macerators&r."
 				"&9-&r The &3Large Centrifuge&r. Set it to work as a Thermal Centrifuge, and you're off to the races."
 				"&9-&r One or more &3MV Electrolyzers&r - you could possibly make the large version if there's enough demand."
 				"&9-&r A &3Multi Smelter&r."
@@ -698,7 +698,7 @@
 				"&9-&r Alternately, a &3Large Ore Washer&r, accompanied with a set of &3Distilleries&r for &dDistilled Water&r."
 				"&9-&r A second &3Large Centrifuge&r... this time set to Centrifuge mode for impure/purified dusts."
 				"&9-&r &3Chemical Baths&r for the special Byproducts that require &dMercury&r or &dSodium Persulfate&r to obtain."
-				"&9-&r &3Sifters&r of any tier (higher tier = better chanced output), for gem ores."
+				"&9-&r &3Sifters&r of any tier for gem ores."
 				"&9-&r &3Electromagnetic Separators&r."
 				"{@pagebreak}"
 				"If the Large Machines aren't your thing, you could always try using tons of &7LV&r machinery, and route with some clever piping."

config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt

@@ -61,9 +61,7 @@
 				id: "gtceu:iron_wrench"
 				tag: {
 					Damage: 0
-					GT.Tool: {
+					GT.Tool: { }
-						Damage: 0
-					}
 				}
 			}
 			id: "6E8F257261F93501"

config/ftbquests/quests/data.snbt

@@ -19,6 +19,7 @@
 	}
 	pause_game: false
 	progression_mode: "default"
+	show_lock_icons: true
 	title: "GregTech Community Pack"
 	version: 13
 }

config/gtceu.yaml

@@ -9,8 +9,8 @@ recipes:
   disableManualCompression: false
 
   # Change the recipe of Rods in the Lathe to 1 Rod and 2 Small Piles of Dust, instead of 2 Rods.
-  # Default: false
+  # Default: true
-  harderRods: false
+  harderRods: true
 
   # Whether to make crafting recipes for Bricks, Firebricks, Nether Bricks, and Coke Bricks harder.
   # Default: false
@@ -50,7 +50,7 @@ recipes:
   nerfPaperCrafting: true
 
   # Recipes for items like Iron Doors, Trapdoors, Anvil require Iron Plates, Rods, and more.
-  # Default: false
+  # Default: true
   hardAdvancedIronRecipes: false
 
   # Whether to make coloring blocks like Concrete or Glass harder.
@@ -81,15 +81,43 @@ recipes:
   # Default: false
   harderCircuitRecipes: false
 
+  # Whether to nerf machine controller recipes.
+  # Default: false
+  hardMultiRecipes: false
+
+  # Whether tools should have enchants or not. Like the flint sword getting fire aspect.
+  # Default: false
+  enchantedTools: false
+
+  # Whether to enable macerator decomposition recycling
+  # Default: true
+  enableMaceratorRecycling: true
+
+  # Percentage yield of macerator decomposition recycling outputs, 1.0 means 100%
+  # Default: 1.0f
+  maceratorRecyclingYield: 1.0
+
+  # Whether to enable arc furnace decomposition recycling
+  # Default: true
+  enableArcRecycling: true
+
+  # Percentage yield of arc furnace decomposition recycling outputs, 1.0 means 100%
+  # Default: 1.0f
+  arcRecyclingYield: 1.0
+
+  # Whether to enable extractor decomposition recycling
+  # Default: true
+  enableExtractorRecycling: true
+
+  # Percentage yield of extractor decomposition recycling outputs, 1.0 means 100%
+  # Default: 1.0f
+  extractorRecyclingYield: 1.0
+
 worldgen:
-  # Rubber Tree spawn chance (% per chunk)
+  # Rubber Tree spawn chance (decimal % per chunk)
   # Default: 0.5
   rubberTreeSpawnChance: 0.5
 
-  # Should all Stone Types drop unique Ore Item Blocks?
-  # Default: false (meaning only Stone, Netherrack, and Endstone)
-  allUniqueStoneTypes: false
-
   # Should Sand-like ores fall?
   # This includes gravel, sand, and red sand ores.
   # Default: false (no falling ores)
@@ -129,6 +157,10 @@ worldgen:
     # Default: false
     infiniteBedrockOresFluids: false
 
+    # Generate ores indicators above ore veins
+    # Default: true
+    oreIndicators: true
+
     # Sets the maximum number of chunks that may be cached for ore vein generation.
     # Higher values may improve world generation performance, but at the cost of more RAM usage.
     # If you substantially increase the ore vein grid size, random vein offset, or have very large (custom) veins, you may need to increase this value as well.
@@ -141,19 +173,13 @@ worldgen:
     oreIndicatorChunkCacheSize: 2048
 
 machines:
-  # Whether insufficient energy supply should reset Machine recipe progress to zero.
-  # If true, progress will reset.
-  # If false, progress will decrease to zero with 2x speed
-  # Default: false
-  recipeProgressLowEnergy: false
-
   # Whether to require a Wrench, Wirecutter, or other GregTech tools to break machines, casings, wires, and more.
-  # Default: false
+  # Default: true
   requireGTToolsForBlocks: false
 
   # Whether machines explode in rainy weather or when placed next to certain terrain, such as fire or lava
   # Default: false
-  doTerrainExplosion: false
+  shouldWeatherOrTerrainExplosion: false
 
   # Energy use multiplier for electric items.
   # Default: 100
@@ -172,14 +198,14 @@ machines:
   # Default: false
   harmlessActiveTransformers: false
 
-  # Divisor for Recipe Duration per Overclock.
-  # Default: 2.0
-  overclockDivisor: 2.0
-
   # Whether to play machine sounds while machines are active.
   # Default: true
   machineSounds: true
 
+  # Duration in ticks that batching will try to reach.
+  # Default: 100
+  batchDuration: 100
+
   # Whether Steam Multiblocks should use Steel instead of Bronze.
   # Default: false
   steelSteamMultiblocks: false
@@ -193,6 +219,10 @@ machines:
   # Default: false
   cleanMultiblocks: false
 
+  # Whether the miner should attempt to replace the block mined with a cobbled version of the ore
+  # Default: true
+  replaceWithCobbleVersion: true
+
   # Block to replace mined ores with in the miner and multiblock miner.
   # Default: minecraft:cobblestone
   replaceMinedBlocksWith: minecraft:cobblestone
@@ -205,6 +235,11 @@ machines:
   # Default: true
   enableMaintenance: true
 
+  # How often to check for maintenance, rolling a 1/6000 chance every X ticks (before secondary effects like Configurable Maintenance Hatch).
+  # In default settings, this equates to a 5% chance every hour of a machine running.
+  # Default: 1000 (ticks)
+  maintenanceCheckRate: 1000
+
   # Whether to enable World Accelerators, which accelerate ticks for surrounding Tile Entities, Crops, etc.
   # Default: true
   enableWorldAccelerators: true
@@ -222,7 +257,7 @@ machines:
   # Whether the machine's circuit slot need to be inserted a real circuit.
   ghostCircuit: true
 
-  # Wether to add a "Bedrock Ore Miner" (also enables bedrock ore generation)
+  # Whether to add a "Bedrock Ore Miner" (also enables bedrock ore generation)
   # Default: false
   doBedrockOres: false
 
@@ -230,10 +265,9 @@ machines:
   # Default: "raw"
   bedrockOreDropTagPrefix: raw
 
-  # WARNING: THIS IS NO LONGER SUPPORTED AND WILL BE REMOVED!
+  # The base amount of ticks per block for electric singleblock ore miners
-  # This option only exists to provide backwards compatibility until the Processing Array will be removed in 1.3.0
+  # Default: 320
-  # Default: false
+  minerSpeed: 320
-  doProcessingArray: true
 
   # Makes nearly every GCYM Multiblock require blocks which set their maximum voltages.
   # Default: false
@@ -247,6 +281,18 @@ machines:
   # Default: 50
   ldFluidPipeMinDistance: 50
 
+  # Whether ONLY owners can open a machine gui
+  # Default: false
+  onlyOwnerGUI: false
+
+  # Whether ONLY owners can break a machine
+  # Default: false
+  onlyOwnerBreak: false
+
+  # Minimum op level to bypass the ownership checks
+  # Default: 2
+  ownerOPBypass: 2
+
   # If High Tier (>UV-tier) GT content should be registered.
   # Items and Machines enabled with this config will have missing recipes by default.
   # This is intended for modpack developers only, and is not playable without custom tweaks or addons.
@@ -254,11 +300,96 @@ machines:
   # Default: false
   highTierContent: false
 
+  # Whether the Assembly Line should require the item inputs to be in order.
+  # Default: true
+  orderedAssemblyLineItems: true
+
+  # Whether the Assembly Line should require the fluid inputs to be in order.
+  # (Requires Ordered Assembly Line Item Inputs to be enabled.)
+  # Default: true
+  orderedAssemblyLineFluids: true
+
+  # Default maximum parallel of steam multiblocks
+  # Default: 8
+  steamMultiParallelAmount: 8
+
+  # Whether the Drums can input fluids from the output side (bottom).
+  allowDrumsInputFluidsFromOutputSide: false
+
+  # Small Steam Boiler Options
+  smallBoilers:
+    # The amount of steam a Steam Solid Boiler produces per second at max temperature.
+    # Default: 120
+    solidBoilerBaseOutput: 120
+
+    # The amount of steam a High Pressure Steam Solid Boiler produces per second at max temperature.
+    # Default: 300
+    hpSolidBoilerBaseOutput: 300
+
+    # The amount of steam a Steam Liquid Boiler produces per second at max temperature.
+    # Default: 240
+    liquidBoilerBaseOutput: 240
+
+    # The amount of steam a High Pressure Steam Liquid Boiler produces per second at max temperature.
+    # Default: 600
+    hpLiquidBoilerBaseOutput: 600
+
+    # The amount of steam a Steam Solar Boiler produces per second at max temperature.
+    # Default: 120
+    solarBoilerBaseOutput: 120
+
+    # The amount of steam a High Pressure Steam Solar Boiler produces per second at max temperature.
+    # Default: 360
+    hpSolarBoilerBaseOutput: 360
+
+  # Large Steam Boiler Options
+  largeBoilers:
+    # The conversion rate between water and steam in Large Boilers.
+    # Default: 160
+    steamPerWater: 160
+
+    # The max temperature of the Large Bronze Boiler.
+    # Default: 800
+    bronzeBoilerMaxTemperature: 800
+
+    # The heat speed of the Large Bronze Boiler.
+    # Default: 1
+    bronzeBoilerHeatSpeed: 1
+
+    # The max temperature of the Large Steel Boiler.
+    # Default: 1800
+    steelBoilerMaxTemperature: 1800
+
+    # The heat speed of the Large Steel Boiler.
+    # Default: 1
+    steelBoilerHeatSpeed: 1
+
+    # The max temperature of the Large Titanium Boiler.
+    # Default: 3200
+    titaniumBoilerMaxTemperature: 3200
+
+    # The heat speed of the Large Titanium Boiler.
+    # Default: 1
+    titaniumBoilerHeatSpeed: 1
+
+    # The max temperature of the Large Tungstensteel Boiler.
+    # Default: 6400
+    tungstensteelBoilerMaxTemperature: 6400
+
+    # The heat speed of the Large Tungstensteel Boiler.
+    # Default: 2
+    tungstensteelBoilerHeatSpeed: 2
+
 client:
   # Whether or not to enable Emissive Textures for GregTech Machines.
   # Default: true
   machinesEmissiveTextures: true
 
+  # Whether most machines will have block entity renderers, mainly used for rendering certain covers. (Restart required)
+  # Disable if experiencing performance issues.
+  # Default: true
+  machinesHaveBERsByDefault: true
+
   # Whether or not sounds should be played when using tools outside of crafting.
   # Default: true
   toolUseSounds: true
@@ -273,8 +404,8 @@ client:
   defaultPaintingColor: #FFFFFF
 
   # The default color to overlay onto Machine (and other) UIs.
-  # 16777215 (#FFFFFF) is no coloring (like GTCE) (default).
+  # #FFFFFF is no coloring (like GTCE) (default).
-  # 13819135 (#D2DCFF in decimal) is the classic blue from GT5.
+  # #D2DCFF is the classic blue from GT5.
   defaultUIColor: #FFFFFF
 
   # Use VBO cache for multiblock preview.
@@ -307,6 +438,30 @@ client:
     # Default: 0
     hudOffsetY: 0
 
+  renderer:
+    # Render fluids in multiblocks that support them?
+    # Default: true
+    renderFluids: true
+
+    # Render growing plants in multiblocks that support them?
+    # Default: true
+    renderGrowingPlants: true
+
+    # Whether or not to color tiered machine highlights in the tier color
+    # Default: true
+    coloredTieredMachineOutline: true
+
+    # Whether or not to color wire/cable highlights based on voltage tier
+    # Default: true
+    coloredWireOutline: true
+
+  tankItemFluidPreview:
+    # Set true to render the including fluid icons to GT Drums
+    drum: false
+
+    # Set true to render the including fluid icons to Super (Quantum) Tanks
+    quantumTank: false
+
 # Config options for Tools and Armor
 tools:
   # Random chance for electric tools to take actual damage
@@ -317,6 +472,10 @@ tools:
   # Default: 16
   sprayCanChainLength: 16
 
+  # Delay in ticks between each log being broken when tree felling
+  # Default: 2
+  treeFellingDelay: 2
+
   # NanoSaber Options
   nanoSaber:
     # The additional damage added when the NanoSaber is powered.
@@ -350,7 +509,7 @@ tools:
   voltageTierQuarkTech: 5
 
   # Advanced QuarkTech Suit Chestplate Voltage Tier.
-  # Default: 5 (LuV)
+  # Default: 6 (LuV)
   voltageTierAdvQuarkTech: 6
 
   # Electric Impeller Jetpack Voltage Tier.
@@ -373,40 +532,35 @@ gameplay:
   universalHazards: true
 
   # Whether environmental hazards like pollution or radiation are active
-  # Default: true
+  # Default: false
   environmentalHazards: false
 
   # How much environmental hazards decay per chunk, per tick.
   # Default: 0.001
   environmentalHazardDecayRate: 0.001
 
-  # Whether the GTCEu's ingame guidebook, 'Compass', be enabled.
-  # WARNING: INCOMPLETE
-  # Default: false
-  enableCompass: false
-
 # Config options for Mod Compatibility
 compat:
   # Config options regarding GTEU compatibility with other energy systems
   energy:
-    # Enable Native GTEU to Platform native Energy (RF and alike) on GT Cables and Wires.
+    # Enable Native GTEU to Forge Energy (RF and alike) on GT Cables and Wires.
     # This does not enable nor disable Converters.
     # Default: true
-    nativeEUToPlatformNative: true
+    nativeEUToFE: true
 
-    # Enable GTEU to Platform native (and vice versa) Converters.
+    # Enable GTEU to FE (and vice versa) Converters.
     # Default: false
-    enablePlatformConverters: false
+    enableFEConverters: false
 
-    # Platform native Energy to GTEU ratio for converting FE to EU.
+    # Forge Energy to GTEU ratio for converting FE to EU.
     # Only affects converters.
-    # Default: 4 FE/Energy == 1 EU
+    # Default: 4 FE == 1 EU
-    platformToEuRatio: 4
+    feToEuRatio: 4
 
-    # GTEU to Platform native Energy ratio for converting EU to FE.
+    # GTEU to Forge Energy ratio for converting EU to FE.
     # Affects native conversion and Converters.
-    # Default: 4 FE/Energy == 1 EU
+    # Default: 4 FE == 1 EU
-    euToPlatformRatio: 4
+    euToFeRatio: 4
 
   # Config options regarding GTCEu compatibility with AE2
   ae2:
@@ -416,16 +570,68 @@ compat:
     updateIntervals: 40
 
     # The energy consumption of ME Hatch/Bus.
-    # Default: 1.0AE/t
+    # Default: 4.0AE/t
-    meHatchEnergyUsage: 1.0
+    meHatchEnergyUsage: 4.0
+
+  # Config options regarding GTCEu compatibility with minimap mods
+  minimap:
+    # Toggle specific map mod integration on/off (need to restart for this to take effect)
+    toggle:
+      # FTB Chunks integration enabled
+      ftbChunksIntegration: false
+
+      # Journey Map integration enabled
+      journeyMapIntegration: true
+
+      # Xaerox's map integration enabled
+      xaerosMapIntegration: true
+
+    # The radius, in blocks, that picking up a surface rock will search for veins in.
+    # -1 to disable.
+    # Default: 24
+    surfaceRockProspectRange: 24
+
+    # The radius, in blocks, that clicking an ore block will search for veins in.
+    # -1 to disable
+    # Default: 24
+    oreBlockProspectRange: 24
+
+    # The map scale at which displayed ores will stop scaling.
+    oreScaleStop: 1.0
+
+    # The size, in pixels, of ore icons on the map
+    oreIconSize: 32
+
+    # The string prepending ore names in the ore vein tooltip
+    oreNamePrefix: -
+
+    # The color to draw a box around the ore icon with.
+    # Accepts either an ARGB hex color prefixed with # or the string 'material' to use the ore's material color
+    borderColor: #00000000
+
+    # Which part of the screen to anchor buttons to
+    # Default: "BOTTOM_LEFT"
+    buttonAnchor: BOTTOM_LEFT
+
+    # Which direction the buttons will go
+    # Default: "VERTICAL"
+    direction: VERTICAL
+
+    # How horizontally far away from the anchor to place the buttons
+    # Default: 20
+    xOffset: 20
+
+    # How vertically far away from the anchor to place the buttons
+    # Default: 0
+    yOffset: 0
 
   # Whether to hide facades of all blocks in JEI and creative search menu.
   # Default: true
-  hideFacadesInJEI: true
+  hideFacadesInRecipeViewer: true
 
   # Whether to hide filled cells in JEI and creative search menu.
   # Default: true
-  hideFilledCellsInJEI: true
+  hideFilledCellsInRecipeViewer: true
 
   # Whether to hide the ore processing diagrams in JEI
   # Default: false
@@ -435,6 +641,14 @@ compat:
   # Default: true
   removeSmeltingForEBFMetals: true
 
+  # Whether dimension markers should show the dimension tier value.
+  # Default: false
+  showDimensionTier: false
+
+  # Whether Create compatibility will be available.
+  # Default: true
+  createCompat: true
+
 dev:
   # Debug general events? (will print recipe conficts etc. to server's debug.log)
   # Default: false
@@ -444,6 +658,10 @@ dev:
   # Default: false (no placement printout in debug.log)
   debugWorldgen: false
 
+  # Generate ores in superflat worlds?
+  # Default: false
+  doSuperflatOres: false
+
   # Dump all registered GT recipes?
   # Default: false
   dumpRecipes: false

config/storagedrawers-common.toml

@@ -1,36 +0,0 @@
-
-[General]
-	#The number of item stacks held in a basic unit of storage.
-	#1x1 drawers hold 8 units, 1x2 drawers hold 4 units, 2x2 drawers hold 2 units.
-	#Half-depth drawers hold half those amounts.
-	baseStackStorage = 4
-	#Controller range defines how far away a drawer can be connected
-	#on X, Y, or Z planes.  The default value of 50 gives the controller a very
-	#large range, but not beyond the chunk load distance.
-	#Range: 1 ~ 75
-	controllerRange = 50
-	enableUI = true
-	enableSidedInput = true
-	enableSidedOutput = true
-	enableItemConversion = true
-	enableExtraCompactingRules = true
-	debugTrace = false
-	#List of rules in format "domain:item1, domain:item2, n".
-	#Creates a compacting drawer rule to convert 1 of item1 into n of item2.
-	compactingRules = ["minecraft:clay, minecraft:clay_ball, 4"]
-
-[StorageUpgrades]
-	#Storage upgrades multiply storage capacity by the given amount.
-	#When multiple storage upgrades are used together, their multipliers are added before being applied.
-	level1Mult = 2
-	level2Mult = 4
-	level3Mult = 8
-	level4Mult = 16
-	level5Mult = 32
-
-[Integration]
-	#When true, shows quantity as NxS + R (by stack size) rather than count
-	wailaStackRemainder = true
-	#When true, does not show current quantities unless quantify key was used
-	wailaRespectQuantifyKey = false
-

config/storagedrawers-common.v2.toml

@@ -0,0 +1,387 @@
+
+# General mod configuration
+[General]
+	# Enables excessive logging around certain parts of the mod.
+	# Can be ignored unless asked by the developer to enable.
+	debugTrace = false
+	# 
+	# Whether blocks with UI components are allowed to open them.
+	# Disabling UI will restrict some mod functionality.
+	enableUI = true
+	# 
+	# Whether to log actions such as adding rules or deny list entries.
+	# You may wish to disable this if you've added many such entries.
+	logStartupActivity = true
+	# 
+	# Internal use to record what version the config file was first written with.
+	configVersion = 2
+
+# Configuration around drawer storage blocks
+[Drawers]
+	# A base value multiplied against the storage size of all drawer slots.
+	# Change this to uniformly increase all storage amounts
+	baseStackStorage = 1
+
+	# Configuration for individual drawer configurations.
+	# Units are the number of stacks a slot holds before the base stack storage value is multiplied.
+	[Drawers.Blocks]
+
+		[Drawers.Blocks.FullStorage1x1]
+			unitsPerSlot = 32
+
+		[Drawers.Blocks.FullStorage1x2]
+			unitsPerSlot = 16
+
+		[Drawers.Blocks.FullStorage2x2]
+			unitsPerSlot = 8
+
+		[Drawers.Blocks.FullCompacting]
+			unitsPerSlot = 32
+
+		[Drawers.Blocks.HalfStorage1x1]
+			unitsPerSlot = 16
+
+		[Drawers.Blocks.HalfStorage1x2]
+			unitsPerSlot = 8
+
+		[Drawers.Blocks.HalfStorage2x2]
+			unitsPerSlot = 4
+
+		[Drawers.Blocks.HalfCompacting]
+			unitsPerSlot = 16
+
+	# Configuration around the auto compacting feature
+	[Drawers.Compacting]
+		# Whether compacting function is supported.  Disabling does not remove the block.
+		enabled = false
+		# 
+		# Enables additional rules for some Minecraft items, like quartz, brick, and clay.
+		# See logs for full set of rules that get added.
+		enableExtraCompactingRules = true
+		# 
+		# Compacting drawers require 2-way 2x2 or 3x3 recipes to associate items.
+		# Add additional rules here in the form: <big_item>, <small_item>, <amount>
+		compactingRules = ["minecraft:clay, minecraft:clay_ball, 4"]
+
+	# Configuration around detached drawers, which are individual drawer slots pulled from a drawer block.
+	[Drawers.Detached]
+		# Allows individual drawer slots to be pulled out from a drawer block.
+		enable = true
+		# 
+		# If enabled, carrying filled drawers in your inventory gives slowness debuff.
+		# Debuff can be mitigated with portability upgrade, if it's enabled.
+		heavyDrawers = false
+		# 
+		# Drawers track the capacity upgrades from the block they were taken from.
+		# When enabled, drawers can only be placed back into a block with the same or lower max capacity.
+		# Drawers can still only be inserted into a block with enough capacity for the items held.
+		forceMaxCapacityCheck = false
+		# 
+		# Allows detached drawers to be stored in containers like bundles and shulker boxes.
+		# Due to current limitation, this rule will also apply to storing empty drawers in those containers.
+		canStoreInContainers = false
+
+	# Configuration around dropped drawer blocks that still have items inside them.
+	[Drawers.Filled]
+		# If enabled, carrying filled drawers in your inventory gives slowness debuff.
+		# Debuff can be mitigated with portability upgrade, if it's enabled.
+		heavyDrawers = false
+		# 
+		# Allows filled drawers to be stored in other drawer blocks.
+		canStoreInDrawers = false
+		# 
+		# Allows filled drawers to be stored in containers like bundles and shulker boxes.
+		# Due to current limitation, this rule will also apply to storing empty drawers in those containers.
+		canStoreInContainers = false
+
+	# Configuration around framed drawers, which take their appearance from other blocks used as materials.
+	[Drawers.Framed]
+		# Allows crafting framed drawers.  Disabling does not remove existing framed drawers.
+		enable = true
+		# 
+		# Attempts to only allow solid, full-cube blocks to be used as materials.
+		# This check may still allow non-solid blocks if the blocks' properties indicate they should be solid but are not.
+		# Some non-solid blocks are also counted as non-opaque, and may be restricted by that setting as well.
+		enforceSolidMaterials = true
+		# 
+		# Attempts to only allow fully opaque blocks to be used as materials.
+		# This check may still allow non-opaque blocks if the blocks' properties indicate they should be opaque but are not.
+		enforceOpaqueMaterials = false
+		# 
+		# Each entry should be a namespace or fully namespaced block, e.g. minecraft:cobblestone
+		# Any items on the deny list are prevented from being used as any drawer material.
+		materialDenyList = []
+
+	# Configuration around storage of items.
+	[Drawers.Storage]
+		# 
+		# Each entry should be a namespace or fully namespaced item, e.g. minecraft:cobblestone
+		# Any items on the deny list are prevented from being stored in drawers
+		storeDenyList = ["storagedrawers:creative_vending_upgrade"]
+		# 
+		# What a drawer should do with its items when broken.  Acceptable values are:
+		# KEEP: Drawer retains all items in the dropped item, like shulker boxes.  This is the default behavior.
+		# DROP: Drawer drops items into the world, up to the dropStackLimit value.  Stored items over that limit are voided.
+		# VOID: Drawer voids all items when dropped.
+		#Allowed Values: KEEP, DROP, VOID
+		dropMode = "KEEP"
+		# 
+		# If dropMode is set to DROP, this is the maximum number of stacks that can be spilled into the world
+		# from the entire block.  By default, this is set to the amount a vanilla chest could drop.
+		dropStackLimit = 32
+
+# Configuration around the controller and drawer networks.
+[Controller]
+	# Controller range defines how far away a drawer can be connected on X, Y, or Z planes.
+	# The largest recommended range is around 75, or the expected chunk load distance.
+	# If setting this value higher, drawers will be unavailable if their chunks become unloaded.
+	controllerRange = 50
+
+# Configuration around upgrade items that can be inserted into drawer blocks.
+[Upgrades]
+
+	# Storage upgrades multiply storage capacity by the given amount.
+	# When multiple storage upgrades are used together, their multipliers are added before being applied.
+	[Upgrades.StorageTiers]
+
+		[Upgrades.StorageTiers.Obsidian]
+			enableUpgrade = true
+			storageMultiplier = 2
+
+		[Upgrades.StorageTiers.Copper]
+			enableUpgrade = true
+			storageMultiplier = 4
+
+		[Upgrades.StorageTiers.Iron]
+			enableUpgrade = true
+			storageMultiplier = 8
+
+		[Upgrades.StorageTiers.Gold]
+			enableUpgrade = true
+			storageMultiplier = 16
+
+		[Upgrades.StorageTiers.Emerald]
+			enableUpgrade = true
+			storageMultiplier = 64
+
+		[Upgrades.StorageTiers.Diamond]
+			enableUpgrade = true
+			storageMultiplier = 256
+
+		[Upgrades.StorageTiers.Netherite]
+			enableUpgrade = true
+			storageMultiplier = 2048
+
+	# Allows same-item slots to balance out their amounts when items are added or removed from a slot.
+	# Works across networks when acting through a controller.
+	[Upgrades.Balance]
+		enableUpgrade = true
+
+	# Allows the automatic conversion of same-type items based on configuration.
+	[Upgrades.Conversion]
+		enableUpgrade = false
+		# 
+		# Each type will be combined with each material to create a set of allow list entries.
+		# This is mainly a convenience for common ore-based materials.
+		oreTypeAllowList = ["forge:storage_blocks", "forge:ingots", "forge:nuggets"]
+		# 
+		# Each type will be combined with each material to create a set of allow list entries.
+		# This is mainly a convenience for common ore-based materials.
+		oreMaterialAllowList = ["aluminum", "constantan", "steel", "uranium", "invar", "tin", "lead", "silver", "platinum", "nickel", "osmium", "bronze", "electrum"]
+		# 
+		# Each allow list entry should be a fully namespaced tag, e.g. c:ingots/copper
+		tagAllowList = []
+		# 
+		# Each deny list entry should be a fully namespaced tag, e.g. c:ingots/copper.
+		# All items not on the allow list are denied implicitly.  This can be used to exclude
+		# specific entries created from the ore allow list set.
+		tagDenyList = []
+		# 
+		# Each entry is a semicolon-separated list of fully-namespaced items. All items within the
+		# same entry are considered equivalent and convertible/interchangeable.
+		# Example: ["thermal:nickel_ore;immersiveengineering:ore_nickel"]
+		itemEquivalenceGroups = []
+
+	# Allows storing ~2.1 billion (MAX_INT) items in each drawer slot.
+	[Upgrades.CreativeStorage]
+		enableUpgrade = true
+
+	# Allows vending infinite amounts of the items in each drawer slot.
+	[Upgrades.CreativeVending]
+		enableUpgrade = true
+
+	# Adds fill bars to the face of drawers.
+	[Upgrades.FillLevel]
+		enableUpgrade = true
+
+	# Renders drawer labels brighter than surrounding environment would allow.
+	[Upgrades.Illumination]
+		enableUpgrade = true
+		# 
+		# Renders labels at minimum light level between 0 - 15
+		#Range: 0 ~ 15
+		illuminationLevel = 13
+		# 
+		# Renders labels without upgrade at minimum light level between 0 - 15
+		#Range: 0 ~ 15
+		minIlluminationLevel = 1
+
+	# Collects matching items through its top like a vanilla hopper.
+	[Upgrades.Hopper]
+		enableUpgrade = true
+
+	# Collects nearby matching items by teleporting them instantly to the drawer
+	[Upgrades.Magnet]
+		# 
+		# When multiple magnet upgrades are used, their ranges are added together.
+		additiveRange = true
+		# 
+		# Range is blocks out from drawer as: [horizontal, up, down]
+		# If ranges from multiple upgrades are added, they are not allowed to exceed these values.
+		maxRange = [24, 8, 0]
+
+		[Upgrades.Magnet.Level1]
+			enableUpgrade = true
+			# 
+			# Range is blocks out from drawer as: [horizontal, up, down]
+			range = [1, 1, 0]
+			# 
+			# Ticks between active collection when this is the highest upgrade tier.
+			activeSpeed = 20
+			# 
+			# Ticks between collection checks when this is the highest upgrade tier.
+			# Collection is idle when items have not been collected within the last idleSpeed interval.
+			idleSpeed = 20
+
+		[Upgrades.Magnet.Level2]
+			enableUpgrade = true
+			# 
+			# Range is blocks out from drawer as: [horizontal, up, down]
+			range = [4, 2, 0]
+			# 
+			# Ticks between active collection when this is the highest upgrade tier.
+			activeSpeed = 10
+			# 
+			# Ticks between collection checks when this is the highest upgrade tier.
+			# Collection is idle when items have not been collected within the last idleSpeed interval.
+			idleSpeed = 20
+
+		[Upgrades.Magnet.Level3]
+			enableUpgrade = true
+			# 
+			# Range is blocks out from drawer as: [horizontal, up, down]
+			range = [8, 3, 0]
+			# 
+			# Ticks between active collection when this is the highest upgrade tier.
+			activeSpeed = 5
+			# 
+			# Ticks between collection checks when this is the highest upgrade tier.
+			# Collection is idle when items have not been collected within the last idleSpeed interval.
+			idleSpeed = 20
+
+	# Restricts capacity of drawer to one stack.
+	[Upgrades.OneStack]
+		enableUpgrade = true
+
+	# Allows drawers with contents to be freely carried when heavy drawers is enabled.
+	[Upgrades.Portability]
+		enableUpgrade = true
+
+	# Lets drawers emit redstone signals based on their fill level.
+	[Upgrades.Redstone]
+		enableUpgrade = true
+		# 
+		# Min redstone upgrades output the minimum signal of all drawers in block.
+		enableMinUpgrade = true
+		# 
+		# Max redstone upgrades output the maximum signal of all drawers in block.
+		enableMaxUpgrade = true
+		# 
+		# Whether redstone upgrades should emit an analog redstone signal,
+		# requiring the use of a comparator to read it.
+		analogOutput = true
+
+	# Lets drawers connect to a controller wirelessly.
+	[Upgrades.Remote]
+		enableUpgrade = true
+		# 
+		# Group variant connects all drawers connected to the upgraded block.
+		enableGroupUpgrade = true
+		# 
+		# Sets the max range of the single-variant remote upgrade.
+		# The range is capped by the controller range.  Set to 0 to match controller range.
+		maxRange = 0
+		# 
+		# Sets the max range of the group-variant remote upgrade.
+		# The range is capped by the controller range.  Set to 0 to match controller range.
+		maxGroupRange = 0
+
+	# Causes drawers to accept but void compatible items when they are filled to capacity.
+	[Upgrades.Void]
+		enableUpgrade = true
+
+# Configuration around tools, namely the various 'keys' that can be used on drawers.
+[Tools]
+
+	# Drawer keys are used to lock drawers to the items they already hold.
+	[Tools.DrawerKey]
+		enable = true
+
+	# Quantify keys are used to show or hide the count of items on the face of drawers.
+	[Tools.QuantifyKey]
+		enable = true
+		# 
+		# Show labels by default on newly placed drawers.
+		showDefault = false
+
+	# Concealment keys are used to show or hide the item labels on the face of drawers.
+	# The primary use of this key is for performance by disabling the more expensive dynamic rendering.
+	[Tools.ConcealmentKey]
+		enable = true
+
+	# Personal keys allow drawers to be locked to their owners, so only they can place or take items.
+	[Tools.PersonalKey]
+		enable = true
+
+	# Priority keys change the priority of drawers when finding a compatible slot to insert items into.
+	[Tools.PriorityKey]
+		enable = true
+
+	# Suspend keys stop external interaction, e.g. from hopper or magnet upgrades.
+	[Tools.PauseKey]
+		enable = true
+
+# Configuration around integration with third party mods.
+[Integration]
+
+	# Configuration around the CoFH Core mod.
+	# Adds support for a CoFH groups personal key.
+	[Integration.CoFHCore]
+		# Enables CoFH Core integration if mod is present.
+		enable = true
+
+	# Configuration around the FTB Chunks mod.
+	# Improves support for claimed chunks.
+	[Integration.FTBChunks]
+		# Enables FTB Chunks integration if mod is present.
+		enable = true
+
+	# Configuration around the FTB Teams mod.
+	# Adds support for a teams personal key.
+	[Integration.FTBTeams]
+		# Enables FTB Teams integration if mod is present.
+		enable = true
+		# 
+		# Enables recipe to obtain key from another supported personal key in crafting grid.
+		enableCycleRecipe = true
+
+	# Configuration around the WAILA/HWYLA/Jade family of block inspection mods.
+	[Integration.WAILA]
+		# Enables Jade integration if mod is present.
+		enable = true
+		# When true, shows quantity as NxS + R (by stack size) rather than count
+		stackRemainder = true
+		# 
+		# When true, does not show current quantities unless quantify key was used
+		respectQuantifyKey = false
+

config/xaerominimap.txt

@@ -8,7 +8,7 @@ debugEntityVariantIds:false
 radarHideInvisibleEntities:true
 allowInternetAccess:true
 #INGAME SETTINGS (DO NOT EDIT!)
-updateNotification:true
+updateNotification:false
 minimap:true
 caveMaps:2
 caveZoom:1

config/xaeroworldmap.txt

@@ -1,5 +1,5 @@
 ignoreUpdate:170
-updateNotification:true
+updateNotification:false
 allowInternetAccess:true
 differentiateByServerAddress:true
 caveMapsAllowed:true

index.toml

@@ -68,6 +68,10 @@ hash = "7fbf1a7a900a7294102ce0bb406470084d0054d57df53440de3607135fb6ccba"
 file = "config/emi.css"
 hash = "dba3e615aa3ff50e5f774b215586ce67de03fc4264cc7ad1e59fc5e7359a4357"
 
+[[files]]
+file = "config/enigmaticgraves-common.toml"
+hash = "7dc50adcc0c0772ae2059c99ce4049f243bbbe26bc374c91ac27f6f928772add"
+
 [[files]]
 file = "config/expatternprovider-common.toml"
 hash = "14ef0bbe6e5eeb3be38eb0cc02dcf7390343df816df23d01e032311298911464"
@@ -114,11 +118,11 @@ hash = "cc7b7524a1409711280d59e9af31b93d161cb654981abb0b2ea945111734fd3d"
 
 [[files]]
 file = "config/ftbquests/quests/chapters/ev__extreme_voltage.snbt"
-hash = "07fe5025de4ecd299a214260c8d6df1a9dd8094a7bf7a7362e59f4027270d3b0"
+hash = "53c659b33da3563178e89a9fa14020c6f76997207110389f5e16b79b9ed099a6"
 
 [[files]]
 file = "config/ftbquests/quests/chapters/gtceu.snbt"
-hash = "cecf5d83950dfd7d9943dfa54deac0545ced65b165b6819a405c02f13d40de80"
+hash = "bd24a9ab8ee710861a5c63dbed317c243e28d92d8c716a69e9eb4a1b3ef7348e"
 
 [[files]]
 file = "config/ftbquests/quests/chapters/heating_coils.snbt"
@@ -126,11 +130,11 @@ hash = "3de3b8987fbd6652079f9a6f8ff7f0d140753eb94563b31554648a09990d89e1"
 
 [[files]]
 file = "config/ftbquests/quests/chapters/hv__high_voltage.snbt"
-hash = "3e4ed0a11278da6cd1a4056b45370df93ed53c5525500a7b26743948bae3e5c7"
+hash = "5396e223fedd3d402a2a774a2aac4ba7e9f7a03e108c4aa2e05e63e077daab0d"
 
 [[files]]
 file = "config/ftbquests/quests/chapters/iv__insane_voltage.snbt"
-hash = "dd54590b939ae9dc5d053f794eac6d727d84b70bac05f90a3c8c4f2d2b7bae7a"
+hash = "3e8d67a0e489ad0c423fa452dc7cc5c7f7b2033e737cd9a841d79964856c28af"
 
 [[files]]
 file = "config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt"
@@ -138,7 +142,7 @@ hash = "b68e2e3c85c5f70f5f1938e31ec228684cc08e823bca4e4170fb92e9339b2670"
 
 [[files]]
 file = "config/ftbquests/quests/chapters/lv__low_voltage.snbt"
-hash = "2b7d8c6d348728a194348d6ec35da2c8775ec23776688e6b90e72a36c2a48fb5"
+hash = "f3c1fddd173769681ab70af459a53398775ddd7ae006f2a2a5588d91eb0a9c50"
 
 [[files]]
 file = "config/ftbquests/quests/chapters/multiblock_dilemma.snbt"
@@ -146,7 +150,7 @@ hash = "c597f716bb540288bd909925586087298edabb66bf5b65b8f353631f05e295ce"
 
 [[files]]
 file = "config/ftbquests/quests/chapters/mv__medium_voltage.snbt"
-hash = "56d08f85e2c7177533adda8d0a42c200cc92a581b7105e02dcc16016bef743a7"
+hash = "533e80c3d683bf6b1e1a03747962c763091afa65b5f3ac000c62504e82fe5036"
 
 [[files]]
 file = "config/ftbquests/quests/chapters/ore_generation.snbt"
@@ -166,15 +170,15 @@ hash = "070e4c59640dc3014745eb4f2b83f918342a92c7dbec9a44c7e003500de90904"
 
 [[files]]
 file = "config/ftbquests/quests/chapters/steam_age.snbt"
-hash = "7dfdebf57e389951e58ece3928f1e3826e1ded6e3e51da86edbd865d96994e26"
+hash = "77232cec33203139fb43919eccdb092da49d10875094453644d41ccadb7a932a"
 
 [[files]]
 file = "config/ftbquests/quests/chapters/tips_and_tricks_2.snbt"
-hash = "171dd9f3683bd2a82752e7cba96c8a4e44f5370e7ba1a819838eb5be7a652e0a"
+hash = "60cea2a6709ee8d78d6a6625393f1a6d823f29b51df9f1518a67b99fba24b817"
 
 [[files]]
 file = "config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt"
-hash = "9cc17a62f1d3504f9b0c2b923ef0130981a258900c52b743ac64b14c43e64162"
+hash = "29cbbea672860c7c190eecdcfe8d9b183017a1c68b517b84c02675c0f8380f30"
 
 [[files]]
 file = "config/ftbquests/quests/chapters/zpm__zero_point_module.snbt"
@@ -182,7 +186,7 @@ hash = "7fb0ab7a9aadbad7563ecfac1cedf3204a70761abb5b93df84f77f3a7504ceba"
 
 [[files]]
 file = "config/ftbquests/quests/data.snbt"
-hash = "3ebade5d68b4aea34338bdf09499e52a7f70e96261cd78247790ba479a8f511b"
+hash = "f09e044050912b32b625c79a70916c35497aa989cdf852d08b847110a4c23ed7"
 
 [[files]]
 file = "config/ftbquests/quests/reward_tables/bronze_age.snbt"
@@ -222,7 +226,7 @@ hash = "9abe2c7f784810cac3ca71c74d02aacd5fe6861d744cb143d077a525a2b42e76"
 
 [[files]]
 file = "config/gtceu.yaml"
-hash = "646d17fc54fb5506302f1669e80055eda4207650c0c7ac418cba6c298949bc15"
+hash = "5533b9de9259ba09d1d0a201897fbd272f03790bf05c082f0616069450cd2d6a"
 
 [[files]]
 file = "config/hangglider-client.toml"
@@ -357,8 +361,8 @@ file = "config/storagedrawers-client.toml"
 hash = "327bfd458ff2b57c072af1f192bd8f828f5e91cd6d3551345ef13d1f599e2f78"
 
 [[files]]
-file = "config/storagedrawers-common.toml"
+file = "config/storagedrawers-common.v2.toml"
-hash = "fe186891b497287dd2e784a3e0a735d6c0755b01c3b317912ad9417b34fffd95"
+hash = "3cdf5d0ed3194267ef373fda7e63bb9bcc231b0ef4028c9466ae4ded2b0bf630"
 
 [[files]]
 file = "config/toastcontrol-common.toml"
@@ -390,7 +394,7 @@ hash = "1dcee38470c2939f7265891203775b7631c81822bf2506a451727fcaaf2cc4a2"
 
 [[files]]
 file = "config/xaerominimap.txt"
-hash = "59e679328251ff4aa7f0520a83e1d2d324e6119ce865fcb5146af03666fb9216"
+hash = "633cb4a20c7ac18b6cbab3010650c7b100f20f92b20469e223815fd5ca82310e"
 
 [[files]]
 file = "config/xaerominimap_entities.json"
@@ -406,7 +410,7 @@ hash = "103979a8e59e396f99fb8646c4f8a690c2d743ca3744a2eb8f663b3102b7498c"
 
 [[files]]
 file = "config/xaeroworldmap.txt"
-hash = "5f5bdca3065e80bb07e21c346365c5b05fb999a938d4bee8cd3f227184f73afb"
+hash = "0032589daad191eafe1a1da6476f1e3cd4c4f8381a306227e5247837cb466dc8"
 
 [[files]]
 file = "defaultconfigs/ftbchunks/client-config.snbt"
@@ -432,6 +436,14 @@ hash = "16064257078b72734d0d52c8c85333f06d9f017bbaf6646c366f3803a510962d"
 file = "kubejs/assets/emi/category/properties/categories.json"
 hash = "1fec36a6d21f1141d244bb229e94879a34c648b49deb0d6458cb77f64078dc2b"
 
+[[files]]
+file = "kubejs/assets/enigmaticgraves/textures/grave.png"
+hash = "e43299af2db5392e277be11f077f9df7029a6cd14055c87e3a599a94fe92e748"
+
+[[files]]
+file = "kubejs/assets/enigmaticgraves/textures/item/grave_finder.png"
+hash = "adf9dfd51a3960daa2966c1c83e6880d83cd138b84fabcb6c3a59e9fce4572c0"
+
 [[files]]
 file = "kubejs/assets/expatternprovider/lang/en_us.json"
 hash = "ab10d53412e964000cd42d01639530f2266b83a0e0192d8d6f7c15aaf328790c"
@@ -518,11 +530,11 @@ hash = "00d52fe8c1f206d103984a8f632f712748a7bef18648e02e9be2739a440dfd3f"
 
 [[files]]
 file = "kubejs/client_scripts/jei/hidden_items.js"
-hash = "2951d1ff9ee74a378ddd65660f8dac889824c2dc29c40480c749260f8871e842"
+hash = "da1d071fe0d02f05ec5a94726a6b5f5014aff441acea105e28939f2ffb227014"
 
 [[files]]
 file = "kubejs/client_scripts/tooltips.js"
-hash = "f6b3c13d27565e7e379d5db6872465c7a76451cf39baf9feb5649ea9258b9318"
+hash = "4cd0855fa47e70ad05638740a8cccfd560221277e6bfd98950b2d48689aa45c6"
 
 [[files]]
 file = "kubejs/config/client.properties"
@@ -566,7 +578,7 @@ hash = "e68a97b24aa63aa8290b9891b02af7499ccd7f9a1dc2ef2cc3d183d660c48177"
 
 [[files]]
 file = "kubejs/server_scripts/appliedenergistics2/extendedae2.js"
-hash = "bee90f3cad28ab6d5c15a80b6ed1400a1969a0088b045c72ee2d923f794668f3"
+hash = "17e494a87f0b9d1b242a90f75fa3ae8903db2c76a87ab1a9152394ec3798f766"
 
 [[files]]
 file = "kubejs/server_scripts/appliedenergistics2/inscriber.js"
@@ -602,7 +614,7 @@ hash = "a184a4372a849553c142772f0f3a434fb59d0fa242c317deb2556451bd9880a5"
 
 [[files]]
 file = "kubejs/server_scripts/appliedenergistics2/terminals.js"
-hash = "7588ffcb734f4ba3caecea9259dff93d4b66b4e7ebc1fe254645a6fb3fa3fa89"
+hash = "65044811e34e7b2d2d2728ed0bd025f4994369ae8b97b6711209a0469cafa96c"
 
 [[files]]
 file = "kubejs/server_scripts/building/architects_palette.js"
@@ -622,7 +634,7 @@ hash = "8b7f2f0a99a9e45d6d4997a99e984f0a8502916fd26b11ec3fca87df398d4d19"
 
 [[files]]
 file = "kubejs/server_scripts/ender_storage.js"
-hash = "fff340eaab79c1b5054c16d7d0ef4fd2b6d977cceecb4e33f7f2a4a85f229b3e"
+hash = "0684e9dcf9c752c3c7218ec71fdd37f64897aa1236de18d02b8920b908781d5f"
 
 [[files]]
 file = "kubejs/server_scripts/gregtech/components.js"
@@ -640,9 +652,13 @@ hash = "e533b6ba1ecf4b040a381378904cbaa71ca1071de3c7f000991c7cf08e91f71c"
 file = "kubejs/server_scripts/gregtech/temporary_fixes.js"
 hash = "c1b8d11d702ecc9bb6950c5efd39fbc395dc9a4bdb87f8233acde31cf8887506"
 
+[[files]]
+file = "kubejs/server_scripts/gregtech/void_air.js"
+hash = "95e582854cad11a56825a4f5adce8f1944c247e41c6265b3acc69ab21b9d53f3"
+
 [[files]]
 file = "kubejs/server_scripts/gregtech/wood_unification.js"
-hash = "3ef4090c877d7eae7e7b0426bd25d05e2abf3c1afa1eca49891ca83eb0cdd842"
+hash = "4b4b92765b4150ace7c1aad90b3f718e2ebbce41d6b64dc59cb37d4c5adeddb0"
 
 [[files]]
 file = "kubejs/server_scripts/miscellaneous.js"
@@ -670,11 +686,11 @@ hash = "a5f8f6e63d636dad1485f889a887c89ea690c245e804ba1b50ad0018d9847150"
 
 [[files]]
 file = "kubejs/server_scripts/storage_drawers/drawers.js"
-hash = "1daec77e466c14ca5a8afd469959cafd35361edbad6738fe30112c190698385b"
+hash = "84fbb6dab6e29e70cbc9af1badb2d749e5be3b940d38bec3c3b364977c357037"
 
 [[files]]
 file = "kubejs/server_scripts/storage_drawers/upgrades.js"
-hash = "bd13a7b35349d3003e0f33d71223e22f74beae731b5a5805b4e556c59ac8c3f4"
+hash = "62c275c960ecbd5e615af89a2147d46c9db3fb84224ec33678047e0fcc195276"
 
 [[files]]
 file = "kubejs/server_scripts/tags/ae2.js"
@@ -690,7 +706,7 @@ hash = "e586325a5342247db88d21d5f040540c26134ac9dd0c1f55bf0d79b2c8ae1585"
 
 [[files]]
 file = "kubejs/server_scripts/tags/items.js"
-hash = "c3d121f2c0a775cf83d6f22ec519def5e680df80e1b9584fe6b4daee53a6ca63"
+hash = "a2d421c36c4f23ca9c86683abd6b1d19cf730eaae7af9bd4cef1be9947bfc2bb"
 
 [[files]]
 file = "kubejs/server_scripts/torchmaster.js"
@@ -708,6 +724,10 @@ hash = "bdbe3251b4b39173618be5ff3450ab6abd3dc7a73db591b61d86a010eb8faabb"
 file = "kubejs/startup_scripts/components/hsla-steel.js"
 hash = "2df8bceaa0bcb871203b094c657461eb9b78cc4fc20d63d95388d2e1d0f95a2e"
 
+[[files]]
+file = "kubejs/startup_scripts/dimension_markers.js"
+hash = "6a452906c16e9321766192f5236fa984ee832e7764dd9a687daa5bdfe69051fb"
+
 [[files]]
 file = "kubejs/startup_scripts/icons.js"
 hash = "509f876d9767bf536a5452021bef3dff8cf1d10345f2b4aba8d2df529763edbe"
@@ -857,6 +877,11 @@ file = "mods/ender-storage-1-8.pw.toml"
 hash = "638f7c447dbe7dc2e85e4bf89d70fb41632db940a57de498094f2be57fa6c18d"
 metafile = true
 
+[[files]]
+file = "mods/enigmatic-graves-fork.pw.toml"
+hash = "4a362c02618c1661f08f0aedad55ae43cfbb9fb00862a347c27007031899a1a1"
+metafile = true
+
 [[files]]
 file = "mods/ex-pattern-provider.pw.toml"
 hash = "5dd87764b5c75976d171c15bb044c133164e6221573391a1118009e0f8bf649d"
@@ -944,12 +969,12 @@ metafile = true
 
 [[files]]
 file = "mods/gregtech-storage-drawers.pw.toml"
-hash = "a71e50b12d6ad878ef5b81a27e78277951acdf9a22964f0be8bd786356a61444"
+hash = "385a5b3d937405c0fbf9bac790ea268138bbede0ce1da07a0ce562edca16c5a6"
 metafile = true
 
 [[files]]
 file = "mods/gregtechceu-modern.pw.toml"
-hash = "1746557e541c429e1b33a3253950b445f79e4c57502cd5bbec1b3184206609c0"
+hash = "095d95ed8aa22628bf45e18aa2782cb7a0064d2f815261edb00dc8bc559bea38"
 metafile = true
 
 [[files]]
@@ -994,7 +1019,7 @@ metafile = true
 
 [[files]]
 file = "mods/jei.pw.toml"
-hash = "5f7c3cf35124bf96e880cc8562fc44ac15990a89b07db299aed9a88ce3752cb1"
+hash = "94a0ed0630ad6e53af1e317e86a195672f4627552fde677396ac94eefce6ffc6"
 metafile = true
 
 [[files]]
@@ -1049,7 +1074,7 @@ metafile = true
 
 [[files]]
 file = "mods/openblocks-elevator.pw.toml"
-hash = "9d66478fde6c978312f93734d481bcb9ae9c49b74cb4538fce58c65ef15d593c"
+hash = "51bf17db22eee5fb80da0b2efe87b846f1165bafc67a789782c5fd976c406ffa"
 metafile = true
 
 [[files]]
@@ -1099,7 +1124,7 @@ metafile = true
 
 [[files]]
 file = "mods/storage-drawers.pw.toml"
-hash = "b5280a819e67fcc922f041ec277823ff8574565472c8afd9a36afbe716f9542c"
+hash = "371b68e257eaca322ca4e95f4aa8d95441d84110b69243dda818f743a0111ba5"
 metafile = true
 
 [[files]]

kubejs/client_scripts/jei/hidden_items.js

@@ -3,6 +3,11 @@ JEIEvents.hideItems(event => {
   // Hide AE2 facades
   event.hide('ae2:facade')
 
+  // Hide the useless storage drawers stuff
+  event.hide('storagedrawers:personal_key_cofh')
+  event.hide('storagedrawers:portability_upgrade')
+  event.hide('storagedrawers:conversion_upgrade')
+
   // Hide all irrelevant stonetype ores
   event.hide('#forge:ores_in_ground/sand')
   event.hide('#forge:ores_in_ground/red_sand')

kubejs/client_scripts/tooltips.js

@@ -7,9 +7,11 @@ ItemEvents.tooltip((event) => {
       "storagedrawers:redstone_upgrade",
       "storagedrawers:min_redstone_upgrade",
       "storagedrawers:max_redstone_upgrade",
+      "storagedrawers:compacting_drawers_2",
       "storagedrawers:compacting_drawers_3",
+      "storagedrawers:compacting_half_drawers_2",
+      "storagedrawers:compacting_half_drawers_3",
       "storagedrawers:fill_level_upgrade",
-      "storagedrawers:illumination_upgrade",
 
       "expatternprovider:caner",
       "ae2:inscriber",
@@ -32,4 +34,10 @@ ItemEvents.tooltip((event) => {
   event.add("ae2:controller", Text.gray("Channels are §cdisabled§7."));
 
   event.add("expatternprovider:fishbig", Text.gray("Congratulations! You won Minecraft."));
+
+  event.add(["enderstorage:ender_chest", "enderstorage:ender_tank", "enderstorage:ender_pouch"],
+    Text.red("WARNING: These are deprcated and will be removed in a future update.\nPlease convert them into the GT covers in a crafting table.")
+  );
+
+  event.add("storagedrawers:personal_key_ftb", Text.gray("Craft me with a regular personal key in a crafting grid."));
 });

kubejs/server_scripts/appliedenergistics2/ae2.js

@@ -121,6 +121,15 @@ ServerEvents.recipes((event) => {
     H: "#gtceu:circuits/hv",
   });
 
+  // Controller
+  event.remove({ id: "ae2:network/blocks/controller"});
+  event.shaped("ae2:controller", ["PFP", "CMC", "PFP"], {
+    P: "#forge:plates/aluminium",
+    F: "#forge:plates/fluix",
+    M: "#gtceu:circuits/mv",
+    C: "#ae2:glass_cable",
+  });
+
   // Energy Acceptor
   event.remove({ id: "ae2:network/blocks/energy_energy_acceptor" });
   event.shaped("ae2:energy_acceptor", ["PFP", "FVF", "PFP"], {
@@ -366,13 +375,19 @@ ServerEvents.recipes((event) => {
     .duration(100)
     .EUt(24);
 
-
+  // Fluix Plate
   greg
-    .lathe("fluix_lathing")
+    .compressor("gtceu:fluix_plate_to_dust")
-    .itemInputs("ae2:fluix_crystal")
+    .itemInputs("#forge:dusts/fluix")
-    .itemOutputs("gtceu:fluix_rod")
+    .itemOutputs(ChemicalHelper.get(TagPrefix.plate, GTMaterialRegistry.getMaterial("fluix"), 1))
-    .duration(200)
+    .duration(400)
-    .EUt(8);
+    .EUt(2);
+  greg
+    .cutter("gtceu:fluix_block_to_plate")
+    .itemInputs("ae2:fluix_block")
+    .itemOutputs(ChemicalHelper.get(TagPrefix.plate, GTMaterialRegistry.getMaterial("fluix"), 4))
+    .duration(400)
+    .EUt(GTValues.VA[GTValues.LV]);
 
   // Logic Processor
   event.remove({ id: "ae2:inscriber/logic_processor" });

kubejs/server_scripts/appliedenergistics2/extendedae2.js

@@ -10,6 +10,7 @@ ServerEvents.recipes((event) => {
       "gtceu:soc",
       "#gtceu:circuits/hv"
     )
+    .circuit(1)
     .itemOutputs("expatternprovider:ex_pattern_provider")
     .duration(200)
     .EUt(50);
@@ -22,11 +23,12 @@ ServerEvents.recipes((event) => {
       "gtceu:soc",
       "#gtceu:circuits/hv"
     )
+    .circuit(1)
     .itemOutputs("expatternprovider:ex_interface")
     .duration(200)
     .EUt(50);
 
-  // extended thermal upgrade shit
+  // extended upgrades (like thermal)
   event.remove({ id: "expatternprovider:epp_upgrade" });
   greg
     .assembler("extended_pattern_provider_upgrade")
@@ -35,6 +37,7 @@ ServerEvents.recipes((event) => {
       "gtceu:soc",
       "#gtceu:circuits/hv"
     )
+    .circuit(2)
     .itemOutputs("expatternprovider:pattern_provider_upgrade")
     .duration(180)
     .EUt(50);
@@ -42,6 +45,7 @@ ServerEvents.recipes((event) => {
   greg
     .assembler("extended_interface_upgrade")
     .itemInputs("4x ae2:logic_processor", "gtceu:soc", "#gtceu:circuits/hv")
+    .circuit(2)
     .itemOutputs("expatternprovider:interface_upgrade")
     .duration(180)
     .EUt(50);

kubejs/server_scripts/appliedenergistics2/inter_providers.js

@@ -2,8 +2,8 @@ ServerEvents.recipes((event) => {
   const patpros = [
     ["lv", "steel", 1],
     ["mv", "aluminium", 2],
-    ["hv", "stainless_steel", 3],
+    ["hv", "stainless_steel", 4],
-    ["ev", "titanium", 4],
+    ["ev", "titanium", 8],
   ];
   patpros.forEach((tier) => {
     let interProv = (materialType, blockType) => {

kubejs/server_scripts/appliedenergistics2/terminals.js

@@ -113,4 +113,11 @@ ServerEvents.recipes((event) => {
     E: "ae2:engineering_processor",
     C: "ae2:fluix_glass_cable",
   });
+
+  // Stonecut p2p tunnels, attunement sucks
+  // Written by MatthiasMann
+  const p2p = ["redstone", "item", "fluid", "fe", "light"]
+  p2p.forEach(type => {
+    event.stonecutting("ae2:" + type + "_p2p_tunnel", "ae2:me_p2p_tunnel")
+  });
 });

kubejs/server_scripts/ender_storage.js

@@ -1,21 +1,13 @@
 ServerEvents.recipes((event) => {
   // Ender Tank
   event.remove({ id: "enderstorage:ender_tank" });
-  event.shaped(`enderstorage:ender_tank`, ["PEP", "STM", "PEP"], {
+  event.shapeless(`gtceu:ender_fluid_link_cover`, [
-    P: "#forge:plates/stainless_steel",
+    "enderstorage:ender_tank"
-    E: "#forge:plates/ender_pearl",
+  ]);
-    S: "gtceu:hv_sensor",
-    T: "gtceu:mv_super_tank",
-    M: "gtceu:hv_emitter"
-  })
   // Ender Chest
   event.remove({ id: "enderstorage:ender_chest" });
-  event.shaped(`enderstorage:ender_chest`, ["PEP", "MTS", "PEP"], {
+  event.shapeless(`gtceu:ender_item_link_cover`, [
-    P: "#forge:plates/stainless_steel",
+    "enderstorage:ender_chest"
-    E: "#forge:plates/ender_pearl",
+  ]);
-    S: "gtceu:hv_sensor",
-    T: "gtceu:mv_super_chest",
-    M: "gtceu:hv_emitter"
-  })
   event.remove({ id: "enderstorage:ender_pouch" });
 })

kubejs/server_scripts/gregtech/void_air.js

@@ -0,0 +1,8 @@
+ServerEvents.recipes(event => {
+  const greg = event.recipes.gtceu;
+  greg.gas_collector("void_air")
+    .circuit(4)
+    .outputFluids(Fluid.of("gtceu:air", 10000))
+    .dimension("javd:void")
+    .duration(200).EUt(16);
+});

kubejs/server_scripts/gregtech/wood_unification.js

@@ -2,15 +2,15 @@ ServerEvents.recipes((event) => {
   function woodUnification(woodType) {
     event.recipes.gtceu
       .assembler(`${woodType}_fence`)
-      .itemInputs(`${woodType}_planks`, "stick")
+      .itemInputs(`${woodType}_planks`)
       .itemOutputs(`${woodType}_fence`)
-      .circuit(1)
+      .circuit(13)
       .duration(100)
       .EUt(4);
 
     event.recipes.gtceu
       .assembler(`${woodType}_fence_gate`)
-      .itemInputs(`2x ${woodType}_planks`, "2x stick")
+      .itemInputs(`2x ${woodType}_planks`, "2x #forge:rods/wooden")
       .itemOutputs(`${woodType}_fence_gate`)
       .circuit(2)
       .duration(100)
@@ -18,11 +18,11 @@ ServerEvents.recipes((event) => {
 
     event.recipes.gtceu
       .assembler(`${woodType}_stairs`)
-      .itemInputs(`6x ${woodType}_planks`)
+      .itemInputs(`3x ${woodType}_planks`)
       .itemOutputs(`4x ${woodType}_stairs`)
-      .circuit(1)
+      .circuit(7)
       .duration(100)
-      .EUt(1);
+      .EUt(4);
   }
 
   woodUnification("warped");

kubejs/server_scripts/storage_drawers/drawers.js

@@ -1,6 +1,5 @@
 ServerEvents.recipes((event) => {
   const greg = event.recipes.gtceu;
-  event.remove({ mod: "storagedrawers" });
   const woodTypes = [
     "oak",
     "spruce",
@@ -10,123 +9,139 @@ ServerEvents.recipes((event) => {
     "dark_oak",
     "warped",
     "crimson",
+    "bamboo",
+    "cherry",
+    ["gtstoragedrawers", "gtceu_rubber", "gtceu:rubber"],
+    ["gtstoragedrawers", "gtceu_treated", "gtceu:treated_wood"]
   ];
-  woodTypes.forEach((woodType) => {
+  woodTypes.forEach((input) => {
+    let woodType = "";
+    let modName = "storagedrawers";
+    let baseWoodType = "";
+    if (typeof(input) === "object") {
+      woodType = input[1];
+      modName = input[0];
+      baseWoodType = input[2];
+    } else {
+      woodType = input;
+      baseWoodType = `minecraft:${woodType}`
+    }
+
     // Type 1
     event.shaped(
-      `storagedrawers:${woodType}_full_drawers_1`,
+      `${modName}:${woodType}_full_drawers_1`,
       ["PPP", "sCr", "PPP"],
       {
-        P: `${woodType}_planks`,
+        P: `${baseWoodType}_planks`,
         s: "#forge:tools/saws",
         C: "#forge:chests/wooden",
         r: "#forge:tools/mallets",
       }
     ).noMirror();
     greg
-      .assembler(`storagedrawers:${woodType}_full_drawers_1`)
+      .assembler(`${modName}:${woodType}_full_drawers_1`)
-      .itemInputs(`6x minecraft:${woodType}_planks`, "#forge:chests/wooden")
+      .itemInputs(`6x ${baseWoodType}_planks`, "#forge:chests/wooden")
-      .itemOutputs(`storagedrawers:${woodType}_full_drawers_1`)
+      .itemOutputs(`${modName}:${woodType}_full_drawers_1`)
       .circuit(9)
       .duration(100)
       .EUt(16);
     // Type 2
     event.shaped(
-      `storagedrawers:${woodType}_full_drawers_2`,
+      `${modName}:${woodType}_full_drawers_2`,
       ["PPP", "rCs", "PPP"],
       {
-        P: `${woodType}_planks`,
+        P: `${baseWoodType}_planks`,
         s: "#forge:tools/saws",
         C: "#forge:chests/wooden",
         r: "#forge:tools/mallets",
       }
     ).noMirror();
     greg
-      .assembler(`storagedrawers:${woodType}_full_drawers_2`)
+      .assembler(`${modName}:${woodType}_full_drawers_2`)
-      .itemInputs(`6x minecraft:${woodType}_planks`, "#forge:chests/wooden")
+      .itemInputs(`6x ${baseWoodType}_planks`, "#forge:chests/wooden")
-      .itemOutputs(`storagedrawers:${woodType}_full_drawers_2`)
+      .itemOutputs(`${modName}:${woodType}_full_drawers_2`)
       .circuit(10)
       .duration(100)
       .EUt(16);
     // Type 4
     event.shaped(
-      `storagedrawers:${woodType}_full_drawers_4`,
+      `${modName}:${woodType}_full_drawers_4`,
       ["PsP", "PCP", "PrP"],
       {
-        P: `${woodType}_planks`,
+        P: `${baseWoodType}_planks`,
         s: "#forge:tools/saws",
         C: "#forge:chests/wooden",
         r: "#forge:tools/mallets",
       }
     );
     greg
-      .assembler(`storagedrawers:${woodType}_full_drawers_4`)
+      .assembler(`${modName}:${woodType}_full_drawers_4`)
-      .itemInputs(`6x minecraft:${woodType}_planks`, "#forge:chests/wooden")
+      .itemInputs(`6x ${baseWoodType}_planks`, "#forge:chests/wooden")
-      .itemOutputs(`storagedrawers:${woodType}_full_drawers_4`)
+      .itemOutputs(`${modName}:${woodType}_full_drawers_4`)
       .circuit(11)
       .duration(100)
       .EUt(16);
 
     // Half 1
     event.shaped(
-      `storagedrawers:${woodType}_half_drawers_1`,
+      `${modName}:${woodType}_half_drawers_1`,
       ["PPP", "sCr", "PPP"],
       {
-        P: `${woodType}_slab`,
+        P: `${baseWoodType}_slab`,
         s: "#forge:tools/saws",
         C: "#forge:chests/wooden",
         r: "#forge:tools/mallets",
       }
     ).noMirror();
     greg
-      .assembler(`storagedrawers:${woodType}_half_drawers_1`)
+      .assembler(`${modName}:${woodType}_half_drawers_1`)
-      .itemInputs(`6x minecraft:${woodType}_slab`, "#forge:chests/wooden")
+      .itemInputs(`6x ${baseWoodType}_slab`, "#forge:chests/wooden")
-      .itemOutputs(`storagedrawers:${woodType}_half_drawers_1`)
+      .itemOutputs(`${modName}:${woodType}_half_drawers_1`)
       .circuit(9)
       .duration(100)
       .EUt(16);
     // Half 2
     event.shaped(
-      `storagedrawers:${woodType}_half_drawers_2`,
+      `${modName}:${woodType}_half_drawers_2`,
       ["PPP", "rCs", "PPP"],
       {
-        P: `${woodType}_slab`,
+        P: `${baseWoodType}_slab`,
         s: "#forge:tools/saws",
         C: "#forge:chests/wooden",
         r: "#forge:tools/mallets",
       }
     ).noMirror();
     greg
-      .assembler(`storagedrawers:${woodType}_half_drawers_2`)
+      .assembler(`${modName}:${woodType}_half_drawers_2`)
-      .itemInputs(`6x minecraft:${woodType}_slab`, "#forge:chests/wooden")
+      .itemInputs(`6x ${baseWoodType}_slab`, "#forge:chests/wooden")
-      .itemOutputs(`storagedrawers:${woodType}_half_drawers_2`)
+      .itemOutputs(`${modName}:${woodType}_half_drawers_2`)
       .circuit(10)
       .duration(100)
       .EUt(16);
     // Half 4
     event.shaped(
-      `storagedrawers:${woodType}_half_drawers_4`,
+      `${modName}:${woodType}_half_drawers_4`,
       ["PsP", "PCP", "PrP"],
       {
-        P: `${woodType}_slab`,
+        P: `${baseWoodType}_slab`,
         s: "#forge:tools/saws",
         C: "#forge:chests/wooden",
         r: "#forge:tools/mallets",
       }
     );
     greg
-      .assembler(`storagedrawers:${woodType}_half_drawers_4`)
+      .assembler(`${modName}:${woodType}_half_drawers_4`)
-      .itemInputs(`6x minecraft:${woodType}_slab`, "#forge:chests/wooden")
+      .itemInputs(`6x ${baseWoodType}_slab`, "#forge:chests/wooden")
-      .itemOutputs(`storagedrawers:${woodType}_half_drawers_4`)
+      .itemOutputs(`${modName}:${woodType}_half_drawers_4`)
       .circuit(11)
       .duration(100)
       .EUt(16);
     // Trim
     event.shaped(
-      `storagedrawers:${woodType}_trim`,
+      `${modName}:${woodType}_trim`,
       ["PPP", "PsP", "PPP"],
       {
-        P: `${woodType}_slab`,
+        P: `${baseWoodType}_slab`,
         s: "#forge:tools/saws"
       }
     )

kubejs/server_scripts/storage_drawers/upgrades.js

@@ -1,4 +1,20 @@
 ServerEvents.recipes((event) => {
+  event.remove({
+    not: [
+      { id: "storagedrawers:personal_key" },
+      { id: "storagedrawers:personal_key_cycle" },
+      { id: "storagedrawers:priority_key" },
+      { id: "storagedrawers:quantify_key" },
+      { id: "storagedrawers:suspend_key" },
+      { id: "storagedrawers:shroud_key" },
+      { id: "storagedrawers:keybutton_conscealment" },
+      { id: "storagedrawers:keybutton_drawer" },
+      { id: "storagedrawers:keybutton_quantify" }
+    ], 
+    mod: "storagedrawers" 
+  });
+
+  event.remove({ mod: "gtstoragedrawers" });
   // Upgrade Template
   event.shaped("storagedrawers:upgrade_template", ["SPS", "SWS", " d "], {
     S: "#forge:screws/iron",
@@ -17,58 +33,32 @@ ServerEvents.recipes((event) => {
     .duration(60)
     .EUt(24);
 
-  // Upgrade 1
+  // Storage Upgrade lvl 1
   event.shaped("storagedrawers:obsidian_storage_upgrade", ["PTP"], {
     P: "#forge:plates/obsidian",
     T: "storagedrawers:upgrade_template",
   });
 
-  // Upgrade 2
+  // Storage Upgrades lvl 2+
-  event.shaped("storagedrawers:iron_storage_upgrade", ["S S", "PTP", "S S"], {
+  // rod material, plate material, upgrade name
-    S: "#forge:rods/iron",
+  const upgrades = [
-    P: "#forge:plates/iron",
+    {rod_mat: "bronze", plate_mat: "copper", upgrade: "copper"},
+    {rod_mat: "steel", plate_mat: "wrought_iron", upgrade: "iron"},
+    {rod_mat: "gold", plate_mat: "rose_gold", upgrade: "gold"},
+    {rod_mat: "aluminium", plate_mat: "emerald", upgrade: "emerald"},
+    {rod_mat: "aluminium", plate_mat: "olivine", upgrade: "emerald"},
+    {rod_mat: "stainless_steel", plate_mat: "diamond", upgrade: "diamond"},
+    {rod_mat: "titanium", plate_mat: "black_steel", upgrade: "netherite"},
+  ];
+
+  upgrades.forEach((e) => {
+    event.shaped(`storagedrawers:${e.upgrade}_storage_upgrade`, ["S S", "PTP", "S S"], {
+      S: `#forge:rods/${e.rod_mat}`,
+      P: `#forge:plates/${e.plate_mat}`,
       T: "storagedrawers:upgrade_template",
     });
-
-  // Upgrade 3
-  event.shaped("storagedrawers:gold_storage_upgrade", ["S S", "PTP", "S S"], {
-    S: "#forge:rods/gold",
-    P: "#forge:plates/rose_gold",
-    T: "storagedrawers:upgrade_template",
   });
 
-  // Upgrade 4
-  event.shaped(
-    "storagedrawers:diamond_storage_upgrade",
-    ["S S", "PTP", "S S"],
-    {
-      S: "#forge:rods/stainless_steel",
-      P: "#forge:plates/diamond",
-      T: "storagedrawers:upgrade_template",
-    }
-  );
-
-  // Upgrade 5
-  event.shaped(
-    "storagedrawers:emerald_storage_upgrade",
-    ["S S", "PTP", "S S"],
-    {
-      S: "#forge:rods/titanium",
-      P: "#forge:plates/emerald",
-      T: "storagedrawers:upgrade_template",
-    }
-  );
-  // Upgrade 5 2
-  event.shaped(
-    "storagedrawers:emerald_storage_upgrade",
-    ["S S", "PTP", "S S"],
-    {
-      S: "#forge:rods/titanium",
-      P: "#forge:plates/olivine",
-      T: "storagedrawers:upgrade_template",
-    }
-  );
-
   // Storage Downgrade
   event.shaped("storagedrawers:one_stack_upgrade", ["PTP"], {
     P: "flint",
@@ -81,6 +71,58 @@ ServerEvents.recipes((event) => {
     T: "storagedrawers:upgrade_template",
   });
 
+  // Illumination Upgrade
+  event.shaped("storagedrawers:illumination_upgrade", ["GTG"], {
+    G: "minecraft:glowstone",
+    T: "storagedrawers:upgrade_template"
+  });
+
+  // Balance Upgrade
+  event.shaped("storagedrawers:balance_fill_upgrade", ["P P", "CTC"], {
+    P: "gtceu:tin_small_item_pipe",
+    C: "gtceu:lv_conveyor_module",
+    T: "storagedrawers:upgrade_template"
+  });
+  
+  // Hopper Upgrade
+  event.shaped("storagedrawers:hopper_upgrade", ["P", "C", "T"], {
+    P: "gtceu:tin_large_item_pipe",
+    C: "gtceu:lv_conveyor_module",
+    T: "storagedrawers:upgrade_template",
+  });
+
+  // Magnet Upgrades
+  for (let i = 1; i <= 3; i++) {
+    let sd_tier = "";
+    if (i > 1) {
+      sd_tier = `_${i}`;
+    }
+    let gt_tier = GTValues.VN[i].toLowerCase();
+    event.shaped(`storagedrawers:magnet_upgrade${sd_tier}`, ["RCR", "RTR"], {
+      R: "#forge:rods/steel",
+      C: `gtceu:${gt_tier}_item_collector`,
+      T: "storagedrawers:upgrade_template",
+    });
+  }
+
+  // Remote Upgrade
+  event.shaped("storagedrawers:remote_upgrade", [" C ", "ETE"], {
+    C: "#gtceu:circuits/lv",
+    E: "gtceu:lv_emitter",
+    T: "storagedrawers:upgrade_template",
+  });
+
+  // Remote Group Upgrade
+  event.shaped("storagedrawers:remote_group_upgrade", [" E", "CT", " E"], {
+    C: "#gtceu:circuits/lv",
+    E: "gtceu:lv_emitter",
+    T: "storagedrawers:upgrade_template",
+  });
+
+  // Conversion recipes
+  event.shapeless("storagedrawers:remote_group_upgrade", ["storagedrawers:remote_upgrade"]);
+  event.shapeless("storagedrawers:remote_upgrade", ["storagedrawers:remote_group_upgrade"]);
+
   // Drawer Key
   event.shaped("storagedrawers:drawer_key", [" BP", "TPP", "Gs "], {
     B: "#forge:bolts/gold",
@@ -89,4 +131,22 @@ ServerEvents.recipes((event) => {
     G: "#forge:plates/gold",
     s: "#forge:tools/saws",
   });
+
+  // Keyring
+  event.shaped("storagedrawers:keyring", ["HR"], {
+    H: "#forge:tools/hammers",
+    R: "#forge:rings/iron"
+  });
+
+  // Drawer Puller
+  event.shaped("storagedrawers:drawer_puller", ["RH"], {
+    H: "#forge:tools/hammers",
+    R: "#forge:rods/long/iron"
+  });
+
+  // Framing Table
+  event.shaped("storagedrawers:framing_table", ["FFF", "FSF"], {
+    F: "#storagedrawers:trim",
+    S: "#forge:tools/saws"
+  });
 });

kubejs/server_scripts/tags/blocks.js

@@ -1,3 +1,5 @@
 ServerEvents.tags("block", (event) => {
   event.add("forge:mineable/wrench", "travelanchors:travel_anchor");
+  event.add("gtceu:cleanroom_doors", "framedblocks:framed_door");
+  event.add("gtceu:cleanroom_doors", "framedblocks:framed_iron_door");
 });

kubejs/server_scripts/tags/items.js

@@ -9,4 +9,7 @@ ServerEvents.tags("item", (event) => {
   event.add("forge:meat", "minecraft:cooked_mutton");
   event.add("forge:meat", "minecraft:rabbit");
   event.add("forge:meat", "minecraft:cooked_rabbit");
+
+  event.add("forge:enchanting_fuels", "gtceu:lazurite_gem");
+  event.add("forge:enchanting_fuels", "gtceu:sodalite_gem");
 });

kubejs/startup_scripts/dimension_markers.js

@@ -0,0 +1,6 @@
+GTCEuStartupEvents.registry("gtceu:dimension_marker", event => {
+    event.create("javd:void")
+    .iconSupplier(() => Item.of("javd:portal_block").getItem())
+    .tier(0)
+    .overrideName("Void Dimension");
+});

kubejs/startup_scripts/material_testing/material.js

@@ -1,7 +1,7 @@
 GTCEuStartupEvents.registry("gtceu:material", (event) => {
   event
     .create("fluix")
-    .dust()
+    .gem()
     .components("1x nether_quartz", "1x certus_quartz", "1x redstone")
     .color(0x8f5ccb)
     .iconSet(GTMaterialIconSet.DULL)

kubejs/startup_scripts/material_testing/modification.js

@@ -0,0 +1,10 @@
+const $AEItems = Java.loadClass("appeng.core.definitions.AEItems");
+const $AEBlocks = Java.loadClass("appeng.core.definitions.AEBlocks");
+
+GTCEuStartupEvents.materialModification(event => {
+    TagPrefix.gem.setIgnored(GTMaterialRegistry.getMaterial("fluix"), $AEItems.FLUIX_CRYSTAL);
+    TagPrefix.gemFlawless.setIgnored(GTMaterialRegistry.getMaterial("fluix"));
+    TagPrefix.gemExquisite.setIgnored(GTMaterialRegistry.getMaterial("fluix"));
+    TagPrefix.block.modifyMaterialAmount(GTMaterials.get("fluix"), 4);
+    TagPrefix.block.setIgnored(GTMaterials.get("fluix"), $AEBlocks.FLUIX_BLOCK.asItem());
+});

mods/enigmatic-graves-fork.pw.toml

@@ -0,0 +1,13 @@
+name = "Enigmatic Graves Fork"
+filename = "enigmaticgraves-1.20.1-1.8.0.jar"
+side = "both"
+
+[download]
+hash-format = "sha1"
+hash = "6b673125e3da20eda16c66991d2c0d2e4a824d09"
+mode = "metadata:curseforge"
+
+[update]
+[update.curseforge]
+file-id = 5528485
+project-id = 1048696

mods/gregtech-storage-drawers.pw.toml

@@ -1,13 +1,13 @@
 name = "GregTech Storage Drawers"
-filename = "gtstoragedrawers-1.20.1-1.0.1.jar"
+filename = "gtstoragedrawers-1.20.1-1.0.2.jar"
 side = "both"
 
 [download]
 hash-format = "sha1"
-hash = "ef1856f6aa8ca5e4f41e86153e9160def3f66880"
+hash = "f0fd877857f5d1e2cae6421c1b63a085cbe2f452"
 mode = "metadata:curseforge"
 
 [update]
 [update.curseforge]
-file-id = 6805649
+file-id = 7036004
 project-id = 1310132

mods/gregtechceu-modern.pw.toml

@@ -1,13 +1,13 @@
 name = "GregTech CEu Modern"
-filename = "gtceu-1.20.1-7.0.2.jar"
+filename = "gtceu-1.20.1-7.4.0.jar"
 side = "both"
 
 [download]
 hash-format = "sha1"
-hash = "602e4690cf99ddd49146a26f0629ac53bd6813db"
+hash = "19c638cb4913b0581da1e518771f41965f96932f"
 mode = "metadata:curseforge"
 
 [update]
 [update.curseforge]
-file-id = 6792524
+file-id = 7262157
 project-id = 890405

mods/jei.pw.toml

@@ -1,13 +1,13 @@
 name = "Just Enough Items (JEI)"
-filename = "jei-1.20.1-forge-15.20.0.112.jar"
+filename = "jei-1.20.1-forge-15.20.0.127.jar"
 side = "both"
 
 [download]
 hash-format = "sha1"
-hash = "f12b3781af6337794ae6e010420a97585360ea2f"
+hash = "6c7684a0e9356f6d60d7b12a14caf6c644ee11ef"
 mode = "metadata:curseforge"
 
 [update]
 [update.curseforge]
-file-id = 6600311
+file-id = 7270446
 project-id = 238222

mods/openblocks-elevator.pw.toml

@@ -1,13 +1,13 @@
 name = "OpenBlocks Elevator"
-filename = "elevatorid-1.20.1-lex-1.9.jar"
+filename = "elevatorid-1.20.1-1.9.1-forge.jar"
 side = "both"
 
 [download]
 hash-format = "sha1"
-hash = "04f3ee97d8881f4dd6b4e2c8c5ba4e1785e2f2c7"
+hash = "9117fbb20ce0b3b9abd25e19b3d5987a53be30c9"
 mode = "metadata:curseforge"
 
 [update]
 [update.curseforge]
-file-id = 4837768
+file-id = 6602224
 project-id = 250832

mods/storage-drawers.pw.toml

@@ -1,13 +1,13 @@
 name = "Storage Drawers"
-filename = "StorageDrawers-1.20.1-12.9.14.jar"
+filename = "StorageDrawers-forge-1.20.1-12.14.3.jar"
 side = "both"
 
 [download]
 hash-format = "sha1"
-hash = "0f96a4f409515d660ed7fb206edb2fd998bfbf29"
+hash = "afca74c6e18883632e74e15a549004bfca245a90"
 mode = "metadata:curseforge"
 
 [update]
 [update.curseforge]
-file-id = 6549483
+file-id = 6994481
 project-id = 223852

pack.toml

@@ -1,13 +1,13 @@
 name = "GregTech CEu Modern Community Pack"
 author = "ursamina"
-version = "1.14.0"
+version = "1.14.2"
 pack-format = "packwiz:1.1.0"
 
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "4e74535750ab82ef47a188ce60e7d66c0cd4344f6d23936bbad14a9521fd8860"
+hash = "679050f097e1c6eea213074aea6e0ecdef4a53ad9e828c98cf86d5fc11ee06ef"
 
 [versions]
-forge = "47.3.6"
+forge = "47.4.10"
 minecraft = "1.20.1"

serverpack/start.ps1

@@ -1,8 +1,8 @@
 $GAME_VERSION = "1.20.1"
-$FORGE_VERSION = "1.20.1-47.3.6"
+$FORGE_VERSION = "1.20.1-47.4.10"
 $FINDME_VERSION = "1.20.1-3.2.1d"
 
-$PACK_TAG = "v1.14.0-server"
+$PACK_TAG = "v1.14.2"
 $PACK_URI = "https://raw.githubusercontent.com/GregTechCEu/GregTech-Modern-Community-Pack/refs/tags/$PACK_TAG/pack.toml"
 
 # Ensure java is installed

serverpack/start.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-FORGE_VERSION="1.20.1-47.3.6"
+FORGE_VERSION="1.20.1-47.4.10"
-PACK_TAG="v1.14.0-server"
+PACK_TAG="v1.14.2"
 
 # Ensure java is installed
 if ! command -v java >/dev/null 2>&1; then