Move Staging to Master

season_6/config/ftbquests/quests/chapters/2_precise_engineering.snbt

@@ -149,44 +149,15 @@
 			x: -6.0d
 			y: 0.0d
 		}
-		{
-			id: "477DA67DA242BCBC"
-			tasks: [
-				{
-					count: 3L
-					icon: "create:mechanical_saw"
-					id: "103056E34BEC068C"
-					item: "create:mechanical_saw"
-					type: "item"
-				}
-				{
-					id: "0F2B27A0794D4CF8"
-					item: "create:mechanical_bearing"
-					type: "item"
-				}
-				{
-					count: 2L
-					icon: "create:portable_storage_interface"
-					id: "1F1AE99DC9363101"
-					item: "create:portable_storage_interface"
-					type: "item"
-				}
-				{
-					count: 3L
-					id: "77EF5886C6BE9837"
-					item: "create:deployer"
-					type: "item"
-				}
-			]
-			title: "First Farm"
-			x: -4.0d
-			y: -7.5d
-		}
 		{
 			dependencies: [
 				"2B377B8CA8562B78"
 				"48151A301D641F9C"
 			]
+			description: [
+				"Silicon Templates are the base of all specialised mechanisms, so getting a decent amount of them is recommended. "
+				"Their automation is not mandatory for progression, though it highly depends on the progression path you choose."
+			]
 			hide_details_until_startable: true
 			hide_until_deps_visible: true
 			id: "301A901C93EF849F"
@@ -201,80 +172,39 @@
 			y: -4.0d
 		}
 		{
-			dependencies: [
-				"1A2CF1ED4B51544B"
-				"1D95AE1918967AA2"
-				"0A71B477740D764C"
+			dependencies: ["5C75853B51176C1E"]
+			description: [
+				"Silicon compound is a special blend of Silicone ingredients, which make it more suitable for mechanical apllications than silicon."
+				"Silicon compound is made from Clay, Sand and Certus Quartz Dust, all of which can be obtained by processing Sand."
 			]
 			id: "2B377B8CA8562B78"
 			tasks: [{
 				id: "08007B91F41FF59E"
 				item: "kubejs:silicon_compound"
 				type: "item"
 			}]
-			x: 11.5d
+			x: 10.5d
 			y: -2.0d
 		}
 		{
-			dependencies: ["1A2CF1ED4B51544B"]
-			id: "1D95AE1918967AA2"
-			tasks: [{
-				id: "424A7A6DFE9988E5"
-				item: "minecraft:clay_ball"
-				type: "item"
-			}]
-			x: 12.0d
-			y: -0.5d
-		}
-		{
-			dependencies: [
-				"1C48A4C8FBD47B22"
-				"48151A301D641F9C"
+			dependencies: ["48151A301D641F9C"]
+			description: ["You will need a decent amount of Sand at this point in the pack, which is made from cobblestone - you should get some by either splitting some off from your existing cobblestone generator or by making a new, more efficient one (which is recommended)."]
+			id: "5C75853B51176C1E"
+			tasks: [
+				{
+					id: "51050199BB631E04"
+					item: "minecraft:cobblestone"
+					type: "item"
+				}
+				{
+					id: "7F2D194B2C2EE4A8"
+					item: "minecraft:sand"
+					type: "item"
+				}
 			]
-			hide_details_until_startable: true
-			hide_until_deps_visible: true
-			id: "1A2CF1ED4B51544B"
-			tasks: [{
-				id: "309B0A5C4EFE77FA"
-				item: "minecraft:sand"
-				type: "item"
-			}]
-			x: 8.5d
-			y: 0.5d
-		}
-		{
-			dependencies: ["1A2CF1ED4B51544B"]
-			id: "0A71B477740D764C"
-			tasks: [{
-				id: "430839E70AF0D7ED"
-				item: "ae2:certus_quartz_dust"
-				type: "item"
-			}]
+			title: "Cobblestone Generator Mk.2"
 			x: 9.0d
-			y: -2.0d
-		}
-		{
-			description: ["Most recipes start with Cobblestone, so you should get some by either splitting some off from your existing cobblestone generator or by making a new, more efficient one (which is recommended)."]
-			id: "5C75853B51176C1E"
-			tasks: [{
-				id: "51050199BB631E04"
-				item: "minecraft:cobblestone"
-				type: "item"
-			}]
-			x: 4.5d
-			y: 3.0d
-		}
-		{
-			dependencies: ["5C75853B51176C1E"]
-			description: ["Millstones can also convert Cobblestone into Gravel (and then convert Gravel into Sand), however they only do so one item at a time, which means that setting up a large array of them for balancing output rates with you cobblestone generator is recommended."]
-			id: "1C48A4C8FBD47B22"
-			tasks: [{
-				id: "7F484050989DFFF6"
-				item: "create:millstone"
-				type: "item"
-			}]
-			x: 7.0d
-			y: 2.0d
+			y: 0.0d
 		}
 		{
 			dependencies: [
@@ -524,6 +454,10 @@
 				"0F7663F4130781E0"
 				"48151A301D641F9C"
 			]
+			description: [
+				"Graphite can be made by pressing Graphite Dust (made by crushing Charcoal) with a large enough force - a Mechanical Press will do the trick, though it needs several hits to achieve results."
+				"Graphite is the main custom material added in this pack and is therefore used in most late-game recipes. Getting a decent automation line set up is recommended."
+			]
 			hide_until_deps_visible: true
 			id: "53280184F9F00B17"
 			tasks: [{
@@ -536,12 +470,23 @@
 		}
 		{
 			dependencies: ["53280184F9F00B17"]
+			description: [
+				"Graphite Electrodes form the base of Electron Tubes, which you will need quite a few of."
+				"Up until this point, you have been collecting Electron Tubes in dungeon chests or from other players - by crafting Graphite Electrodes you get the ability to create these on your own, however, since your technology is still pretty rudimentary, you will have to make these by hand and with varying success rates - because of this, finding Electron Tubes in chests will most likely still remain your main source of them."
+			]
 			id: "72EF47B79A42BC40"
-			tasks: [{
-				id: "6932D0976FF3C3CC"
-				item: "kubejs:graphite_electrode"
-				type: "item"
-			}]
+			tasks: [
+				{
+					id: "6932D0976FF3C3CC"
+					item: "kubejs:graphite_electrode"
+					type: "item"
+				}
+				{
+					id: "6C7C114D3AAABC83"
+					item: "create:electron_tube"
+					type: "item"
+				}
+			]
 			x: 10.0d
 			y: -6.0d
 		}

season_6/config/ftbquests/quests/chapters/applied_energistics_2.snbt

@@ -480,6 +480,7 @@
 			]
 			icon: "numismatics:cog"
 			id: "4005F378A3279ACC"
+			invisible: true
 			tasks: [{
 				id: "09896878DEEA2360"
 				title: "[note] 1"
@@ -522,6 +523,7 @@
 			]
 			icon: "numismatics:cog"
 			id: "7A5915C9644DB371"
+			invisible: true
 			tasks: [{
 				id: "2C174DEA9DF98360"
 				title: "[note] 2"
@@ -570,6 +572,7 @@
 			]
 			icon: "numismatics:cog"
 			id: "5ADC68416EF3F991"
+			invisible: true
 			tasks: [{
 				id: "5EA108610A8BA0FB"
 				title: "[note] 3"
@@ -579,5 +582,5 @@
 			y: 4.0d
 		}
 	]
-	title: "Applied Energistics 2"
+	title: "The Archivist"
 }

season_6/config/ftbquests/quests/chapters/pneumaticcraft.snbt

@@ -157,6 +157,7 @@
 				"refined radiance has to be supplied by a storage person, or bought from an admin shop"
 			]
 			id: "1F8B852AF4B8B2AA"
+			invisible: true
 			tasks: [{
 				id: "6858AF713E4979CB"
 				title: "[note]"
@@ -308,6 +309,7 @@
 		{
 			description: ["the compressed mechanism is a VERY expensive item used as an ingredient  for late game equipment such as the pneumatic armor and aerial interfaces. one is required for each piece of pneumatic armor, and one is required for an assembly controller (but not required for other assembly line components)"]
 			id: "53EA16D7C978EAB8"
+			invisible: true
 			tasks: [{
 				id: "2DCC248A71F154DD"
 				title: "[note]"
@@ -468,5 +470,5 @@
 			y: -3.5d
 		}
 	]
-	title: "Pneumaticcraft"
+	title: "The Airsmith"
 }

season_6/config/ftbquests/quests/chapters/quest_lines.snbt

@@ -56,10 +56,10 @@
 		{
 			dependencies: ["20CF0E1AEE75EF62"]
 			description: [
-				"While the Distributor might not have all the new fancy tools and armor, it is a vital part of the community. Other professions (mainly the Archivist and the Airsmith) need large quantities of items only you have the ability to automate, however it is your choice whether you team up with them, or if you set up shops to sell such items."
+				"While the Prospector might not have all the new fancy tools and armor, it is a vital part of the community. Other professions (mainly the Archivist and the Airsmith) need large quantities of items only you have the ability to automate, however it is your choice whether you team up with them, or if you set up shops to sell such items."
 				""
-				"The main advantage of the Distributor is the ability to pump and refine Crude Oil, as well as to create oil product powered engines."
-				"When combined with the capabilities of a Airsmith, both you and the Airsmith can seriously upgrade your factories production - it is therefore recommended that at least one player in a faction is a Distributor. "
+				"The main advantage of the Prospector is the ability to pump and refine Crude Oil, as well as to create oil product powered engines."
+				"When combined with the capabilities of a Airsmith, both you and the Airsmith can seriously upgrade your factories production - it is therefore recommended that at least one player in a faction is a Prospector. "
 			]
 			icon: "createdieselgenerators:diesel_engine"
 			id: "69718654F7D474FE"
@@ -69,7 +69,7 @@
 				item: "kubejs:mod_token"
 				type: "item"
 			}]
-			title: "The Merchant"
+			title: "The Prospector"
 			x: 0.0d
 			y: -3.0d
 		}
@@ -102,8 +102,11 @@
 			y: 0.0d
 		}
 		{
+			dependencies: ["32F7D6ED714F5C42"]
+			description: ["Trackwork is an addon for Clockwork, which allows you to also build ground based vehicles - it adds several types of tank tracks and wheels."]
 			id: "71630F85C0C662CB"
 			tasks: [{
+				consume_items: false
 				count: 64L
 				id: "031FAF9A8C57D560"
 				item: "create:belt_connector"
@@ -114,6 +117,10 @@
 			y: 4.0d
 		}
 		{
+			description: [
+				"Clockwork allows you to add even more movement to your builds - literally. This mod adds most create's mechanical components but with a catch - they are all affected by physics. To top it all of, clockwork also adds a physics assembler, which allows you to have any build become a physical object."
+				"Realistic Airplane anyone?"
+			]
 			icon: "vs_clockwork:physics_infuser"
 			id: "32F7D6ED714F5C42"
 			tasks: [{
@@ -126,6 +133,7 @@
 			y: 2.0d
 		}
 		{
+			description: ["Ender Drawers function similarly to Ender Chests, except they can be used by machines and not just players (a Linking tool is required for proper function)."]
 			icon: "functionalstorage:ender_drawer"
 			id: "09ADFCCF30378F40"
 			tasks: [{

season_6/config/ftbquests/quests/chapters/the_distributor.snbt

@@ -3,7 +3,7 @@
 	default_quest_shape: ""
 	filename: "the_distributor"
 	group: ""
-	icon: "createdieselgenerators:diesel_engine"
+	icon: "create:schematic"
 	id: "5254536DCB34C5CB"
 	order_index: 6
 	quest_links: [ ]
@@ -310,5 +310,5 @@
 			y: 1.5d
 		}
 	]
-	title: "The Merchant"
+	title: "The Prospector"
 }

season_6/config/ftbquests/quests/chapters/the_mechanic.snbt

@@ -208,7 +208,7 @@
 			y: 5.0d
 		}
 		{
-			description: ["Since Airmsiths do not have the required technology, they are incapable of creating &bLight Bulb Bases&r, but they are able of creating finished &bLight Bulbs&r which they &lneed large amounts of&r - It is recommended to split of some of your &bLight Bulb Base&r production to be sold to Airsmiths."]
+			description: ["Since Airmsiths do not have the required technology, they are incapable of creating &bLight Bulb Bases&r, but they are capable of creating finished &bLight Bulbs&r which they &lneed large amounts of&r - It is recommended to split of some of your &bLight Bulb Base&r production to be sold to Airsmiths."]
 			id: "77824917C06F5FC7"
 			tasks: [{
 				id: "543F999C1C1B4A0D"

season_6/config/ftbquests/quests/chapters/the_nuclear_engineer.snbt

@@ -3,7 +3,7 @@
 	default_quest_shape: ""
 	filename: "the_nuclear_engineer"
 	group: ""
-	icon: "create_new_age:nuclear_fuel"
+	icon: "cogutilities:waste_barrel"
 	id: "697A849EB442A08A"
 	order_index: 8
 	quest_links: [ ]