Merge pull request #1075 from TheBedrockMaster/Quests

Quest Fixes and a few French quest Titles

config/ftbquests/quests/chapters/bounty_board.snbt

@@ -540,12 +540,6 @@
 					}
 					type: "item"
 				}
-				{
-					exclude_from_claim_all: true
-					id: "66C49399D8CCD721"
-					table_id: 487623848494439020L
-					type: "random"
-				}
 				{
 					id: "2052F84B9D14A141"
 					type: "xp"
@@ -1208,11 +1202,10 @@
 		{
 			icon: {
 				components: {
-					"ftbquests:icon": "ftbchunks:textures/faces/minecraft/warden.png"
+					"ftbquests:icon": "minecraft:textures/entity_icon/warden/warden.png"
 				}
 				id: "ftbquests:custom_icon"
 			}
-			icon_scale: 1.25d
 			id: "0E20A9B79D1C6637"
 			rewards: [
 				{

config/ftbquests/quests/chapters/productive_bees.snbt

@@ -2171,14 +2171,9 @@
 				xp: 100
 			}]
 			tasks: [{
-				icon: {
-					components: {
-						"productivebees:bee_type": "productivebees:nickel"
-					}
-					id: "productivebees:configurable_honeycomb"
-				}
-				id: "05E237133AC3F46B"
-				item: { components: { "ftbfiltersystem:filter": "component(fuzzy:{\"productivebees:bee_type\":\"productivebees:nickel\"})" }, count: 1, id: "ftbfiltersystem:smart_filter" }
+				id: "1E37FD73461EFA29"
+				item: { components: { "productivebees:bee_type": "productivebees:nickel" }, count: 1, id: "productivebees:configurable_honeycomb" }
+				match_components: "fuzzy"
 				type: "item"
 			}]
 			x: -1.0d

config/ftbquests/quests/chapters/steam_age.snbt

@@ -342,18 +342,11 @@
 					xp: 25
 				}
 			]
-			tasks: [
-				{
-					id: "198CAAA315816D0F"
-					item: { components: { "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(c:dusts/bronze)" }, count: 1, id: "ftbfiltersystem:smart_filter" }
-					type: "item"
-				}
-				{
-					id: "065FC2FF2CE5C297"
-					item: { components: { "ftbfiltersystem:filter": "ftbfiltersystem:item_tag(c:ingots/bronze)" }, count: 1, id: "ftbfiltersystem:smart_filter" }
-					type: "item"
-				}
-			]
+			tasks: [{
+				id: "60664FB240C4C7EF"
+				item: { count: 1, id: "alltheores:bronze_ingot" }
+				type: "item"
+			}]
 			x: -16.5d
 			y: -6.5d
 		}

config/ftbquests/quests/lang/en_us.snbt

@@ -378,7 +378,6 @@
 		"&cRemember:&r Chanced outputs increase with the tier of the machine"
 	]
 	quest.03B5D467E76C5B8A.quest_subtitle: "More like futile dust"
-	quest.03B6A49B6E475AD3.title: "Machines and You"
 	quest.03B842E4A2A6B2C9.quest_subtitle: "Good for manganese"
 	quest.03B842E4A2A6B2C9.title: "Grossular Vein"
 	quest.03C40D6A5D722543.quest_desc: ["Variable Cards are necessary for starting Interactions like Importing Items. You will put them in one of the slots of the Importer to add them. \\n\\nFrom there you can edit everything via the + Button. You can change how much is Importer, which Item Slot, which Channel, practically everything with just that Card. \\n\\nIf you're like me just wanting to move items, nothing too fancy just put it in and maybe change the Limit for how much is moved."]
@@ -1292,7 +1291,6 @@
 	quest.0E057B7F76401421.title: "&6Copper Backpack"
 	quest.0E0CAA31480EC0A1.quest_desc: ["Allows the Backpack to pick up items."]
 	quest.0E0CAA31480EC0A1.quest_subtitle: "Allows the backpack to pick up items."
-	quest.0E0CAA31480EC0A1.title: "Pickup Upgrade"
 	quest.0E20A9B79D1C6637.title: "Kill The Warden"
 	quest.0E25CDB09FE88A63.title: "Saltpeter Seeds"
 	quest.0E2AD156E5EF263A.quest_desc: ["Used to inscribe spells on with the Scribe's Table."]
@@ -1444,13 +1442,7 @@
 	quest.0F49E9167B5E97C9.quest_desc: ["Any damage you take when falling (ignoring armor) will also be dealt to nearby mobs."]
 	quest.0F49E9167B5E97C9.quest_subtitle: "Max: 1"
 	quest.0F5549B02D1B383B.quest_desc: ["Kill 16 Cave Spiders. \\n\\nDon't worry there is plenty of things from &6&lBumblezone&r to help with Poison."]
-	quest.0F55D0B4D5094EDB.quest_desc: [
-		"While making a lot of the questlines for ATM7, the Trader Villager thought it'd be funny to constantly push me around in the quest screen."
-		""
-		"\"Take them out. All of them.\""
-		""
-		"- AlfredGG"
-	]
+	quest.0F55D0B4D5094EDB.quest_desc: ["While making a lot of the questlines for ATM7, the Trader Villager thought it'd be funny to constantly push me around in the quest screen.\\n\\n\"Take them out. All of them.\"\\n\\n- AlfredGG"]
 	quest.0F55D0B4D5094EDB.quest_subtitle: "\"This is Personal\" - AlfredGG"
 	quest.0F55D0B4D5094EDB.title: "Kill The Trader Villager and His Annoying Llamas"
 	quest.0F6FB959B352121D.quest_desc: [
@@ -9232,7 +9224,7 @@
 		"Turns Lava into Obsidian."
 	]
 	quest.6581D4AF1A6DE230.quest_desc: ["Demons like Candles. I think.\\n\\nFor almost every Ritual to summon our friends, you'll need some Candles. You can create the &aButcher Knife&r and kill some pigs, cows, sheep, horses, or even the Trader Llamas to get some &aTallow&r to make them. Matter of fact, you should definitely find the Trader Llamas. I hear they make good candles. &mI totally didn't just make that up&r.\\n\\nOtherwise, Vanilla Candles can also work!\\n\\n&9Spirit Attuned Crystals&r are also used in several Rituals, so might as well make some now!"]
-	quest.6581D4AF1A6DE230.title: "Preparing for a Ritual: &aCandles&r"
+	quest.6581D4AF1A6DE230.title: "Preparing for a Ritual: &aCandles"
 	quest.659531F14E62EBEB.quest_desc: ["One Scroll you'll need applied to get Replica is the Scroll of Damage Exchange. To get it do the Ritual of Damage Exchange with 1 Powdered Iron and 2 Powdered Emeralds."]
 	quest.659531F14E62EBEB.title: "Scroll of Damage Exchange"
 	quest.659A903F97F93BE2.quest_subtitle: "Quick and Simple"
@@ -11653,7 +11645,7 @@
 	quest.7E9CD5C38BF5970F.quest_subtitle: "3 ZPM components now"
 	quest.7E9CD5C38BF5970F.title: "Onward to ZPM Machines"
 	quest.7E9E03274A88347D.quest_desc: ["Increases stack size in the Backpack by 2."]
-	quest.7E9E03274A88347D.title: "Stack Upgrade Tier 1"
+	quest.7E9E03274A88347D.title: "&fStack Upgrade Tier 1"
 	quest.7EA6B942D1294ED6.quest_desc: ["This machine can mine for you!\\n\\nIt is completely configurable, and can even replace mined blocks with cobblestone, or whatever block you provide it with!"]
 	quest.7EA6B942D1294ED6.quest_subtitle: "A bigger robot friend."
 	quest.7EAFF64FFE8B5378.quest_subtitle: "Iron + Sweat"
@@ -11685,7 +11677,6 @@
 	quest.7EFBAF3E281D2EBE.quest_subtitle: "The spare chest"
 	quest.7EFBFF5D0DA018E7.quest_desc: ["Adds a filter for items you want to auto-delete in the Backpack."]
 	quest.7EFBFF5D0DA018E7.quest_subtitle: "Adds a filter for items you want to auto-delete in the backpack."
-	quest.7EFBFF5D0DA018E7.title: "Void Upgrade"
 	quest.7F042DED357DEF3C.quest_desc: ["Bookshelves are your starting point, but definitely not your end point. Atleast not normal bookshelves. With only normal bookshelves you can only get &aEterna&r up and to a max of 15. (I will explain the Enchantment Levels soon but just know you need them up)"]
 	quest.7F042DED357DEF3C.title: "Vanilla Max is just the start"
 	quest.7F076FC4F2187692.quest_subtitle: "&f8 &cAttack Damage"
@@ -11835,9 +11826,9 @@
 	task.05072073E048223B.title: "Quests By AllTheMods"
 	task.05256FE880D981D5.title: "Vibranium Tools"
 	task.05A215BE7EE2F35D.title: "Observe Uranium Hexafluoride in a Machine"
-	task.05E237133AC3F46B.title: "Nickel Comb"
 	task.064B1841F9288CC3.title: "Blocks"
 	task.065E5450AC87F1D5.title: "Ancient Comb"
+	task.06D8E0295DAE3C50.title: "Machines and You"
 	task.06F2EC3901908BF1.title: "Plastic Construction Bricks"
 	task.073D1C45B3018BBA.title: "Chests"
 	task.0740BC10E4D2568F.title: "Regions Unexplored Stones"
@@ -12098,6 +12089,7 @@
 	task.3B219688DA1CF9C8.title: "AllRightsReserved"
 	task.3B35F86B42989063.title: "Crimson Shroombee Comb"
 	task.3B3B58C438FD4397.title: "Tier 4 Ore Processing Factory Summary"
+	task.3B6E674F4C958EA6.title: "Hammers"
 	task.3BEA6C6A41D5ABEA.title: "Furnace Augments"
 	task.3C16167530BEC231.title: "AllRightsReserved"
 	task.3C18AB7133946682.title: "Paxels"

config/ftbquests/quests/lang/es_es.snbt

@@ -10435,7 +10435,6 @@
 	task.04CFF2F4E5B3813B.title: "Observed a Completed Large Chemical Bath"
 	task.04E3568175E66B6D.title: "Observe completed Cracker"
 	task.05A215BE7EE2F35D.title: "Observe Uranium Hexafluoride in a Machine"
-	task.05E237133AC3F46B.title: "Nickel Comb"
 	task.065E5450AC87F1D5.title: "Ancient Comb"
 	task.07896B715ED0E04F.title: "Any Brass Ingot"
 	task.083086610639994F.title: "To &9Everbright&r!"