Merge pull request #2016 from alessiorapisarda/main

Backport more quests from ATM10
AllTheMods · Nov 4, 2024 · eef1f2b · eef1f2b
2 parents 1607acc + 3a5f784
commit eef1f2b
Show file tree

Hide file tree

Showing 38 changed files with 5,747 additions and 4 deletions.
diff --git a/config/ftbquests/quests/chapters/artifacts.snbt b/config/ftbquests/quests/chapters/artifacts.snbt
diff --git a/config/ftbquests/quests/chapters/productive_trees.snbt b/config/ftbquests/quests/chapters/productive_trees.snbt
diff --git a/config/ftbquests/quests/chapters/theurgy.snbt b/config/ftbquests/quests/chapters/theurgy.snbt
diff --git a/config/ftbquests/quests/reward_tables/7609CF2A167B45C8.snbt b/config/ftbquests/quests/reward_tables/7609CF2A167B45C8.snbt
@@ -0,0 +1,12 @@
+{
+	id: "7609CF2A167B45C8"
+	loot_size: 1
+	order_index: 26
+	rewards: [
+		{ count: 5, item: { count: 1, id: "theurgy:alchemical_salt_strata" } }
+		{ count: 4, item: { count: 1, id: "theurgy:alchemical_salt_mineral" } }
+		{ count: 3, item: { count: 1, id: "theurgy:alchemical_salt_plant" } }
+		{ count: 2, item: { count: 1, id: "theurgy:alchemical_salt_creature" } }
+	]
+	use_title: true
+}
diff --git a/kubejs/assets/kubejs/lang/en_us.json b/kubejs/assets/kubejs/lang/en_us.json
diff --git a/packmenu/resources/assets/atm/textures/questpics/artifacts/artifacts_belt.png b/packmenu/resources/assets/atm/textures/questpics/artifacts/artifacts_belt.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/artifacts/artifacts_cowboy.png b/packmenu/resources/assets/atm/textures/questpics/artifacts/artifacts_cowboy.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/artifacts/artifacts_feet.png b/packmenu/resources/assets/atm/textures/questpics/artifacts/artifacts_feet.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/artifacts/artifacts_flameon.png b/packmenu/resources/assets/atm/textures/questpics/artifacts/artifacts_flameon.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/artifacts/artifacts_hands.png b/packmenu/resources/assets/atm/textures/questpics/artifacts/artifacts_hands.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/artifacts/artifacts_head.png b/packmenu/resources/assets/atm/textures/questpics/artifacts/artifacts_head.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/artifacts/artifacts_hungry.png b/packmenu/resources/assets/atm/textures/questpics/artifacts/artifacts_hungry.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/artifacts/artifacts_lucky.png b/packmenu/resources/assets/atm/textures/questpics/artifacts/artifacts_lucky.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/artifacts/artifacts_necklace.png b/packmenu/resources/assets/atm/textures/questpics/artifacts/artifacts_necklace.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/artifacts/artifacts_pool.png b/packmenu/resources/assets/atm/textures/questpics/artifacts/artifacts_pool.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/artifacts/artifacts_title.png b/packmenu/resources/assets/atm/textures/questpics/artifacts/artifacts_title.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/artifacts/feet_olyfans.png b/packmenu/resources/assets/atm/textures/questpics/artifacts/feet_olyfans.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy.png b/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_brazier.png b/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_brazier.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_digest.png b/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_digest.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_distiller.png b/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_distiller.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_ferment.png b/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_ferment.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_fluid.png b/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_fluid.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_incubator.png b/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_incubator.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_item.png b/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_item.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_lique.png b/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_lique.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_mercuryflux.png b/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_mercuryflux.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_oven.png b/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_oven.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_reform_1.png b/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_reform_1.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_reform_2.png b/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_reform_2.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_reform_3.png b/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_reform_3.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_reform_full.png b/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_reform_full.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_reform_setup.png b/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_reform_setup.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_sal_front.png b/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_sal_front.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_sal_side.png b/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_sal_side.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_vessel_1.png b/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_vessel_1.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_vessel_2.png b/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_vessel_2.png
diff --git a/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_vessel_3.png b/packmenu/resources/assets/atm/textures/questpics/theurgy/theurgy_vessel_3.png