Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/NillerMedDild/Enigmatica6
Browse files Browse the repository at this point in the history
…into develop
  • Loading branch information
NielsPilgaard committed Mar 26, 2021
2 parents 7bac692 + ed40975 commit d313445
Show file tree
Hide file tree
Showing 17 changed files with 60 additions and 60 deletions.
14 changes: 7 additions & 7 deletions config/ftbquests/quests/chapters/ars_nouveau.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
icon: "ars_nouveau:marvelous_clay",
x: -4.5d,
y: -2.0d,
description: ["Marvelous Clay unlocks the creation of Tier 2 spells. These also require an Apprentice's Spellbok to cast. "],
description: ["Marvelous Clay unlocks the creation of Tier 2 spells. These also require an Apprentice's Spellbook to cast. "],
dependencies: ["00000000000003BE"],
id: "00000000000003C2",
tasks: [
Expand All @@ -158,7 +158,7 @@
icon: "ars_nouveau:mythical_clay",
x: -3.5d,
y: -2.5d,
description: ["Mythical Clay unlocks the creation of Tier 3 spells. These also require an Archmage's Spellbok to cast. "],
description: ["Mythical Clay unlocks the creation of Tier 3 spells. These also require an Archmage's Spellbook to cast. "],
dependencies: ["00000000000003C2"],
id: "00000000000003C4",
tasks: [
Expand Down Expand Up @@ -216,13 +216,13 @@
description: [
"Spell Crafting is performed within the spell book and each book can hold up to ten unique spells. Hold your spell book and press Sneak + C (default) to begin.",
"",
"By now, you'll know a few different Forms and Effects. Place a form first, followed by an effect, give it a name, then press Create. Mutliple Effects can be chained.",
"By now, you'll know a few different Forms and Effects. Place a form first, followed by an effect, give it a name, then press Create. Multiple Effects can be chained.",
"",
"For example, a simple early form of flight can be crafted using the following spell:",
"",
"● Self > Leap > Slowfall ",
"",
"Casting this propels the user in the direction they're facing, while also providing some cushoning for the eventual landing. It can make a great way to traverse rough terrain or escape a pesky mob."
"Casting this propels the user in the direction they're facing, while also providing some cushioning for the eventual landing. It can make a great way to traverse rough terrain or escape a pesky mob."
],
dependencies: ["00000000000003BE"],
min_width: 300,
Expand Down Expand Up @@ -309,7 +309,7 @@
description: [
"The Mana Bloom sits at the border between the mundane and the magical. It grows as any other plant, but its roots reach through the veil, soaking in more of the mana that infuses the earth.",
"",
"Growing these will serve two purposes to a budding practicioner. First, they produce more mana than any mundane plants when grown. Second, they can be woven into a fabric that intertwines itself with wearer's mana, expanding the practioner's reserves. "
"Growing these will serve two purposes to a budding practitioner. First, they produce more mana than any mundane plants when grown. Second, they can be woven into a fabric that intertwines itself with wearer's mana, expanding the practitioner's reserves. "
],
dependencies: ["00000000000003D7"],
id: "00000000000003D5",
Expand Down Expand Up @@ -374,7 +374,7 @@
x: -1.5d,
y: -5.5d,
description: [
"Mana is a fickle thing, and keeping it in one place long enough to use can be challenging at best. Aspring practitioners may find themselves struggling to channel mana for very long. Besides magical accoutrements woven from Mana Fibers, certain other materials can be molded into useful trinkets to serve as an extension of one's own reserves.",
"Mana is a fickle thing, and keeping it in one place long enough to use can be challenging at best. Aspiring practitioners may find themselves struggling to channel mana for very long. Besides magical accoutrements woven from Mana Fibers, certain other materials can be molded into useful trinkets to serve as an extension of one's own reserves.",
"",
"Refer to the Worn Notebook's section on Magical Equipment for recipes and to discover more useful curios."
],
Expand Down Expand Up @@ -660,7 +660,7 @@
description: [
"Considering the Turret needs a redstone signal to work, some form of clock is in order. There are many designs that will work, but perhaps something more thematic is in order?",
"",
"A simple redstone clock can be made with two turrets containg the following spell:",
"A simple redstone clock can be made with two turrets containing the following spell:",
"",
"● Projectile > Redstone Signal"
],
Expand Down
2 changes: 1 addition & 1 deletion config/ftbquests/quests/chapters/astral_sorcery_wip.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
y: -10.5d,
shape: "gear",
description: [
"Remnants of an ancienct civilization dot the land, though they give little clue as to what became of them. The villagers who remain share legends of them in hushed “Hrms”, though they avoid the structures in fear.",
"Remnants of an ancient civilization dot the land, though they give little clue as to what became of them. The villagers who remain share legends of them in hushed “Hrms”, though they avoid the structures in fear.",
"",
"Pillagers, fierce as they may be, seem to share in this superstition... What secrets await discovery?",
"",
Expand Down
8 changes: 4 additions & 4 deletions config/ftbquests/quests/chapters/blood_magic_wip.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
y: 3.0d,
subtitle: "The Void Stares Back",
description: [
"Despite the name of the mod, simply going out and slaughtering wontonly is exactly the wrong way to go about gathering LP. This is a process that requires finesse... precision. Your vict... Donor might need to be held down.",
"Despite the name of the mod, simply going out and slaughtering wantonly is exactly the wrong way to go about gathering LP. This is a process that requires finesse... precision. Your vict... Donor might need to be held down.",
"",
"Throw Soul Snares at mobs until potion particles appear around them, then proceed with the kill. With the target snared, Demonic Will may be extracted as the creature's life force passes.",
"",
Expand Down Expand Up @@ -99,7 +99,7 @@
"",
"It also serves as the basis for fueling your Soul Network, an ethereal web of souls that may be tapped into from anywhere.",
"",
"More fundamentally, the Altar will serve as a recepticle for transmuting objects with stored LP. To begin filling it, use the provided knife near it to drain some of your own blood into the Altar. ",
"More fundamentally, the Altar will serve as a receptacle for transmuting objects with stored LP. To begin filling it, use the provided knife near it to drain some of your own blood into the Altar. ",
"",
"Once it is full, right click an item into the Altar to begin the transmutation process. Red particles mean the craft is proceeding normally, whereas grey particles mean there's not enough LP and the craft is losing progress. ",
"",
Expand Down Expand Up @@ -359,7 +359,7 @@
description: [
"With a few slates to craft into Blank Runes, the Altar can be augmented, increasing its capacity, transmutational abilities, and even allowing for specializations. ",
"",
"To upgrade to a Tier 2 Altar, 8 Runes of any type are required. The Sanguine Scietiem shows the exact structure required. Use the provided Speed runes to fill out the structure and give it a little kick. ",
"To upgrade to a Tier 2 Altar, 8 Runes of any type are required. The Sanguine Scientiem shows the exact structure required. Use the provided Speed runes to fill out the structure and give it a little kick. ",
"",
"Be sure to upgrade your Blood Orb as well. "
],
Expand Down Expand Up @@ -864,7 +864,7 @@
description: [
"The Incense Altar serves to help calm and center a Sanguimancer prior to using the Sacrificial Knife for self-sacrifice. Standing near the altar will cause the knife to glow. It may then be used to draw a larger portion of health instantly, filling the Blood Alter with an equivalent amount of LP. ",
"",
"Refer to the Sanguine Scientem for more information on expanding the Incense Altar, increasing its effect. "
"Refer to the Sanguine Scientiem for more information on expanding the Incense Altar, increasing its effect. "
],
dependencies: ["000000000000089F"],
id: "000000000000090E",
Expand Down
4 changes: 2 additions & 2 deletions config/ftbquests/quests/chapters/botania.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
"",
"The denizens of Alfheim are a secretive people, but they are willing to share some of their knowledge in fair exchange. Perhaps some bread?",
"",
"Refer to the Lexica Botania for instructions on building the portal. The Lexica should be one of the first things sent through the portal to unlock further knowleedge"
"Refer to the Lexica Botania for instructions on building the portal. The Lexica should be one of the first things sent through the portal to unlock further knowledge"
],
dependencies: ["0000000000000517"],
id: "0000000000000515",
Expand Down Expand Up @@ -918,7 +918,7 @@
y: 3.5d,
subtitle: "Forbidden Jello",
description: [
"One could be excused for thinking Slimes are somehow alive, but upon closer inspection they appear to be nothing more than the congealed remnants left behind when somehting truly alive dies. Sufficient damage will release the same impure globules that could be converted to mana, but a great deal is lost in this way. ",
"One could be excused for thinking Slimes are somehow alive, but upon closer inspection they appear to be nothing more than the congealed remnants left behind when something truly alive dies. Sufficient damage will release the same impure globules that could be converted to mana, but a great deal is lost in this way. ",
"",
"The Narslimmus will absorb and process the entire Slime instead, breaking down its integral structure and releasing far more mana than could be obtained through more primitive methods."
],
Expand Down
2 changes: 1 addition & 1 deletion config/ftbquests/quests/chapters/gates_wip.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"- Niller",
"",
"",
'Please note that mods are rarely "strictly" gated - Some of their items will be obtaintable prior to the Gate being unlocked, and not all things will be immediately obtainable once the Gate is unlocked.',
'Please note that mods are rarely "strictly" gated - Some of their items will be obtainable prior to the Gate being unlocked, and not all things will be immediately obtainable once the Gate is unlocked.',
""
],
id: "0000000000000B6C"
Expand Down
2 changes: 1 addition & 1 deletion config/ftbquests/quests/chapters/industrial_foregoing.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -1106,7 +1106,7 @@
{
x: 11.0d,
y: -4.0d,
description: ["This block will store up to 16 black hole units or tanks and will make their contents accesible externally."],
description: ["This block will store up to 16 black hole units or tanks and will make their contents accessible externally."],
hide_dependency_lines: true,
dependencies: ["0000000000000EDC"],
id: "0000000000000F24",
Expand Down
2 changes: 1 addition & 1 deletion config/ftbquests/quests/chapters/integrated_dynamics.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@
x: -2.0d,
y: 1.0d,
subtitle: "Botania is a Tech mod now?",
description: ["This block can extract specific NBT Data from NBT acquirred from a Block Reader. This can be used to find the amount of Mana in a Mana Pool."],
description: ["This block can extract specific NBT Data from NBT acquired from a Block Reader. This can be used to find the amount of Mana in a Mana Pool."],
dependencies: ["7E516ACCF6DA5588"],
id: "11A8433289EFF772",
tasks: [{
Expand Down
Loading

0 comments on commit d313445

Please sign in to comment.