Merge pull request #1634 from ToshibaEC0Microwave/questtest

Forbidden & Arcanus First half
AllTheMods · Jan 1, 2025 · 67b3695 · 67b3695
2 parents b34e9a5 + 58f019b
commit 67b3695
Show file tree

Hide file tree

Showing 28 changed files with 1,688 additions and 11 deletions.
diff --git a/config/ftbquests/quests/chapters/forbidden__arcanus.snbt b/config/ftbquests/quests/chapters/forbidden__arcanus.snbt
diff --git a/config/ftbquests/quests/chapters/mahou_tsukai.snbt b/config/ftbquests/quests/chapters/mahou_tsukai.snbt
@@ -3,6 +3,18 @@
 	default_quest_shape: "diamond"
 	filename: "mahou_tsukai"
 	group: "15E5B587D291A4AA"
+	icon: {
+		components: {
+			"mahoutsukai:colors_mahou": {
+				colors: [ ]
+			}
+			"mahoutsukai:sword_mahou": {
+				attackDamage: 3.0f
+				innateCap: 60.0d
+			}
+		}
+		id: "mahoutsukai:morgan"
+	}
 	id: "43BB00A7A7E1042C"
 	images: [
 		{
@@ -571,9 +583,8 @@
 			]
 			size: 1.2d
 			tasks: [{
-				count: 26L
-				id: "2BF1BB45FFC6AC2E"
-				item: { count: 26, id: "irons_spellbooks:ender_upgrade_orb" }
+				id: "6DC9B5F714C6FE8C"
+				item: { count: 1, id: "minecraft:nether_star" }
 				type: "item"
 			}]
 			x: 7.5d

diff --git a/config/ftbquests/quests/lang/en_us.snbt b/config/ftbquests/quests/lang/en_us.snbt
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_aureal.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_aureal.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_blackhole.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_blackhole.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_blood.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_blood.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_clibano1.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_clibano1.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_clibano2.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_clibano2.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_clibano3.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_clibano3.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_clibano4.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_clibano4.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_experience.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_experience.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_forge1.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_forge1.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_forge2.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_forge2.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_gui.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_gui.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_souls.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_souls.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_tier1.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_tier1.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_tier2.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_tier2.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_tier3.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_tier3.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_tier4.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_tier4.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_tier5.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_tier5.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_title.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_title.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_title_clibano.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_title_clibano.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_title_relics.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_title_relics.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_title_tier1.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_title_tier1.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_title_tier2.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_title_tier2.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_title_tier3.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_title_tier3.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_title_tier4.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_title_tier4.png
diff --git a/kubejs/assets/atm/textures/questpics/forbidden/forbidden_title_tier5.png b/kubejs/assets/atm/textures/questpics/forbidden/forbidden_title_tier5.png