Merge pull request #1405 from AllTheMods/Staging

Staging 0.4.27
AllTheMods · Aug 22, 2022 · 47df04f · 47df04f
2 parents 6248a83 + cad192f
commit 47df04f
Show file tree

Hide file tree

Showing 21 changed files with 780 additions and 478 deletions.
diff --git a/config/ftbquests/quests/chapters/allthemodium.snbt b/config/ftbquests/quests/chapters/allthemodium.snbt
@@ -861,9 +861,9 @@
 			dependencies: ["5130BBAD5C542EDB"]
 			id: "1A5E414C9D25703A"
 			tasks: [{
-				id: "2212DFCF11CE8D69"
-				type: "dimension"
-				dimension: "allthemodium:the_other"
+				id: "001D21A77391485F"
+				type: "item"
+				item: "allthemodium:ancient_stone"
 			}]
 		}
 		{

diff --git a/config/ftbquests/quests/chapters/basic_power_generation.snbt b/config/ftbquests/quests/chapters/basic_power_generation.snbt
@@ -367,20 +367,33 @@
 				"This is the first Jetpack we'll make. It doesn't hold a charge for very long though."
 				""
 				"Make sure to upgrade it quickly!"
+				""
+				"Note: Because of NBT issues, you'll need to look the recipe up in JEI rather than clicking the item. "
 			]
 			dependencies: ["19FBD3C65A96B311"]
 			id: "201143A8D039A543"
 			tasks: [{
-				id: "4A5D85046D46C7A6"
+				id: "11CB32BF85D7AE51"
 				type: "item"
-				item: {
+				title: "Wood Jetpack"
+				icon: {
 					id: "ironjetpacks:jetpack"
 					Count: 1b
 					tag: {
 						Id: "ironjetpacks:wood"
 						Throttle: 1.0d
 					}
 				}
+				item: {
+					id: "itemfilters:strong_nbt"
+					Count: 1b
+					tag: {
+						value: {
+							Id: "ironjetpacks:wood"
+							Throttle: 1.0d
+						}
+					}
+				}
 			}]
 			rewards: [
 				{
@@ -1060,15 +1073,25 @@
 			dependencies: ["424202C5D36CC1C2"]
 			id: "339FCC2A29AF2383"
 			tasks: [{
-				id: "7D280336B99F6A2D"
+				id: "1CA7ECF061E9E18B"
 				type: "item"
-				item: {
+				title: "DiamondSight Potions"
+				icon: {
 					id: "minecraft:potion"
 					Count: 1b
 					tag: {
 						Potion: "potionsmaster:diamond_sight"
 					}
 				}
+				item: {
+					id: "itemfilters:strong_nbt"
+					Count: 1b
+					tag: {
+						value: {
+							Potion: "potionsmaster:diamond_sight"
+						}
+					}
+				}
 				count: 3L
 			}]
 			rewards: [
@@ -1872,16 +1895,27 @@
 			dependencies: ["201143A8D039A543"]
 			id: "36BF9C4CB26090CA"
 			tasks: [{
-				id: "2DDAC9CCB14302B9"
+				id: "7FCCE503589CFB82"
 				type: "item"
-				item: {
+				title: "Stone Jetpack"
+				icon: {
 					id: "ironjetpacks:jetpack"
 					Count: 1b
 					tag: {
 						Id: "ironjetpacks:stone"
 						Throttle: 1.0d
 					}
 				}
+				item: {
+					id: "itemfilters:strong_nbt"
+					Count: 1b
+					tag: {
+						value: {
+							Id: "ironjetpacks:stone"
+							Throttle: 1.0d
+						}
+					}
+				}
 			}]
 			rewards: [
 				{

diff --git a/config/ftbquests/quests/chapters/forbidden_and_arcanus.snbt b/config/ftbquests/quests/chapters/forbidden_and_arcanus.snbt
@@ -24,7 +24,7 @@
 			tasks: [{
 				id: "76E8B288C37363E6"
 				type: "checkmark"
-				title: "Welcome to Forbidden & Arcanus!"
+				title: "Welcome to Forbidden \\&\\ Arcanus!"
 			}]
 			rewards: [
 				{