Merge pull request EnigmaticaModpacks#972 from MuteTiefling/all-the-f…

…ixins All the fixins
MuteTiefling · May 11, 2024 · 6498d97 · 6498d97
2 parents 1bf5ddc + 85cdf81
commit 6498d97
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 37 deletions.
diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md
@@ -16,6 +16,7 @@
 -   [Expert] Several Iron using recipes have been tweaked to adjust their gating [\#961](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/961)
 -   [Expert] Add a recipe for the new chunkloader upgrade for PNC drones [\#966](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/966)
 -   [Expert] Processing Metal Shards now has an extra step involving the creation and use of Lacunar Acid [\#968](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/968)
+-   Add Aloe to the Market [\#972](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/972)
 
 ### 🐛 Fixed Bugs
 
@@ -27,6 +28,8 @@
 -   Crafting tables may now be converted to variants with the stonecutter. Variant shaped crafting recipes are removed. [\#966](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/966)
 -   Remove conflicting furnace recipe. Furnaces are now only crafted with cobblestone [\#966](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/966)
 -   Remove conflicting chest recipe. Vanilla chest may be crafted by converting any other chest. [\#966](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/966)
+-   [Normal] Correct Thermal's quests regarding Fluxducts [\#972](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/972)
+-   Fixed missing Apotheosis bosses [\#972](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/972)
 
 ### Enigmatica 9 v1.21.0
 

diff --git a/config/ftbquests/quests/chapters/thermal_series.snbt b/config/ftbquests/quests/chapters/thermal_series.snbt
@@ -649,11 +649,7 @@
 		}
 		{
 			dependencies: ["4630066EE7196046"]
-			description: [
-				"Expandable, upgradable, portable. Perfect for a quick charge just about anywhere."
-				""
-				"Thermal Series offers no form of power cable currently. While piping Flux Capacitors or Flux Cells around certainly works, consider using some Universal Cables from Mekanism instead. "
-			]
+			description: ["Expandable, upgradable, portable. Perfect for a quick charge just about anywhere."]
 			hide_dependency_lines: true
 			id: "0000000000000F85"
 			rewards: [
@@ -673,9 +669,9 @@
 					type: "item"
 				}
 				{
-					count: 8
+					count: 16
 					id: "7A2EEDADE9E418F2"
-					item: "mekanism:basic_universal_cable"
+					item: "thermal:energy_duct"
 					type: "item"
 				}
 				{

diff --git a/kubejs/data/farmingforblockheads/farmingforblockheads_compat/seeds_for_emerald.json b/kubejs/data/farmingforblockheads/farmingforblockheads_compat/seeds_for_emerald.json
@@ -10,6 +10,7 @@
         { "output": "byg:blueberries" },
         { "output": "byg:crimson_berries" },
         { "output": "byg:nightshade_berries" },
+        { "output": "byg:aloe_vera" },
         { "output": "farmersdelight:cabbage_seeds" },
         { "output": "farmersdelight:onion" },
         { "output": "minecraft:sweet_berries" },

diff --git a/kubejs/server_scripts/expert/recipes/apotheosis/bosses/overworld.js b/kubejs/server_scripts/expert/recipes/apotheosis/bosses/overworld.js
@@ -27,9 +27,9 @@ ServerEvents.highPriorityData((event) => {
                     enchant_chance: 1,
                     enchantment_levels: [36, 30, 100, 85],
                     effects: [
-                        { effect: 'ars_nouveau:shielding', amplifier: { min: 2, max: 3 }, chance: 1 },
-                        { effect: 'ars_nouveau:spell_damage', amplifier: { min: 2, max: 7 }, chance: 1 },
-                        { effect: 'ars_nouveau:mana_regen', amplifier: { min: 2, max: 7 }, chance: 1 }
+                        { effect: 'ars_nouveau:shielding', amplifier: { min: 2, steps: 3, step: 1 }, chance: 1 },
+                        { effect: 'ars_nouveau:spell_damage', amplifier: { min: 2, steps: 7, step: 1 }, chance: 1 },
+                        { effect: 'ars_nouveau:mana_regen', amplifier: { min: 2, steps: 7, step: 1 }, chance: 1 }
                     ],
                     attribute_modifiers: [
                         {

diff --git a/kubejs/server_scripts/expert/recipes/apotheosis/bosses/the_bumblezone.js b/kubejs/server_scripts/expert/recipes/apotheosis/bosses/the_bumblezone.js
@@ -149,9 +149,9 @@ ServerEvents.highPriorityData((event) => {
                     enchant_chance: 1,
                     enchantment_levels: [36, 30, 100, 85],
                     effects: [
-                        { effect: 'ars_nouveau:shielding', amplifier: { min: 2, max: 3 }, chance: 1 },
-                        { effect: 'ars_nouveau:spell_damage', amplifier: { min: 2, max: 7 }, chance: 1 },
-                        { effect: 'ars_nouveau:mana_regen', amplifier: { min: 2, max: 7 }, chance: 1 }
+                        { effect: 'ars_nouveau:shielding', amplifier: { min: 2, step: 1, steps: 3 }, chance: 1 },
+                        { effect: 'ars_nouveau:spell_damage', amplifier: { min: 2, step: 1, steps: 7 }, chance: 1 },
+                        { effect: 'ars_nouveau:mana_regen', amplifier: { min: 2, step: 1, steps: 7 }, chance: 1 }
                     ],
                     attribute_modifiers: [
                         {

diff --git a/kubejs/server_scripts/expert/recipes/apotheosis/bosses/the_end.js b/kubejs/server_scripts/expert/recipes/apotheosis/bosses/the_end.js
@@ -27,9 +27,9 @@ ServerEvents.highPriorityData((event) => {
                     enchant_chance: 1,
                     enchantment_levels: [36, 30, 100, 85],
                     effects: [
-                        { effect: 'ars_nouveau:shielding', amplifier: { min: 2, max: 3 }, chance: 1 },
-                        { effect: 'ars_nouveau:spell_damage', amplifier: { min: 2, max: 7 }, chance: 1 },
-                        { effect: 'ars_nouveau:mana_regen', amplifier: { min: 2, max: 7 }, chance: 1 }
+                        { effect: 'ars_nouveau:shielding', amplifier: { min: 2, step: 1, steps: 3 }, chance: 1 },
+                        { effect: 'ars_nouveau:spell_damage', amplifier: { min: 2, step: 1, steps: 7 }, chance: 1 },
+                        { effect: 'ars_nouveau:mana_regen', amplifier: { min: 2, step: 1, steps: 7 }, chance: 1 }
                     ],
                     attribute_modifiers: [
                         {

diff --git a/kubejs/server_scripts/expert/recipes/apotheosis/bosses/the_nether.js b/kubejs/server_scripts/expert/recipes/apotheosis/bosses/the_nether.js
@@ -28,9 +28,9 @@ ServerEvents.highPriorityData((event) => {
                     enchantment_levels: [36, 30, 100, 85],
                     effects: [
                         { effect: 'minecraft:fire_resistance', chance: 1 },
-                        { effect: 'ars_nouveau:shielding', amplifier: { min: 2, max: 3 }, chance: 1 },
-                        { effect: 'ars_nouveau:spell_damage', amplifier: { min: 2, max: 7 }, chance: 1 },
-                        { effect: 'ars_nouveau:mana_regen', amplifier: { min: 2, max: 7 }, chance: 1 }
+                        { effect: 'ars_nouveau:shielding', amplifier: { min: 2, step: 1, steps: 3 }, chance: 1 },
+                        { effect: 'ars_nouveau:spell_damage', amplifier: { min: 2, step: 1, steps: 7 }, chance: 1 },
+                        { effect: 'ars_nouveau:mana_regen', amplifier: { min: 2, step: 1, steps: 7 }, chance: 1 }
                     ],
                     attribute_modifiers: [
                         {

diff --git a/kubejs/server_scripts/expert/recipes/apotheosis/bosses/twilight_forest.js b/kubejs/server_scripts/expert/recipes/apotheosis/bosses/twilight_forest.js
@@ -27,9 +27,9 @@ ServerEvents.highPriorityData((event) => {
                     enchant_chance: 1,
                     enchantment_levels: [36, 30, 100, 85],
                     effects: [
-                        { effect: 'ars_nouveau:shielding', amplifier: { min: 2, max: 3 }, chance: 1 },
-                        { effect: 'ars_nouveau:spell_damage', amplifier: { min: 2, max: 7 }, chance: 1 },
-                        { effect: 'ars_nouveau:mana_regen', amplifier: { min: 2, max: 7 }, chance: 1 }
+                        { effect: 'ars_nouveau:shielding', amplifier: { min: 2, step: 1, steps: 3 }, chance: 1 },
+                        { effect: 'ars_nouveau:spell_damage', amplifier: { min: 2, step: 1, steps: 7 }, chance: 1 },
+                        { effect: 'ars_nouveau:mana_regen', amplifier: { min: 2, step: 1, steps: 7 }, chance: 1 }
                     ],
                     attribute_modifiers: [
                         {

diff --git a/kubejs/server_scripts/normal/recipes/apotheosis/bosses/overworld.js b/kubejs/server_scripts/normal/recipes/apotheosis/bosses/overworld.js
@@ -357,9 +357,9 @@ ServerEvents.highPriorityData((event) => {
                     enchant_chance: 1,
                     enchantment_levels: [36, 30, 100, 85],
                     effects: [
-                        { effect: 'ars_nouveau:shielding', amplifier: { min: 2, max: 3 }, chance: 1 },
-                        { effect: 'ars_nouveau:spell_damage', amplifier: { min: 2, max: 7 }, chance: 1 },
-                        { effect: 'ars_nouveau:mana_regen', amplifier: { min: 2, max: 7 }, chance: 1 }
+                        { effect: 'ars_nouveau:shielding', amplifier: { min: 2, steps: 3, step: 1 }, chance: 1 },
+                        { effect: 'ars_nouveau:spell_damage', amplifier: { min: 2, steps: 7, step: 1 }, chance: 1 },
+                        { effect: 'ars_nouveau:mana_regen', amplifier: { min: 2, steps: 7, step: 1 }, chance: 1 }
                     ],
                     attribute_modifiers: [
                         {

diff --git a/kubejs/server_scripts/normal/recipes/apotheosis/bosses/the_bumblezone.js b/kubejs/server_scripts/normal/recipes/apotheosis/bosses/the_bumblezone.js
@@ -149,9 +149,9 @@ ServerEvents.highPriorityData((event) => {
                     enchant_chance: 1,
                     enchantment_levels: [36, 30, 100, 85],
                     effects: [
-                        { effect: 'ars_nouveau:shielding', amplifier: { min: 2, max: 3 }, chance: 1 },
-                        { effect: 'ars_nouveau:spell_damage', amplifier: { min: 2, max: 7 }, chance: 1 },
-                        { effect: 'ars_nouveau:mana_regen', amplifier: { min: 2, max: 7 }, chance: 1 }
+                        { effect: 'ars_nouveau:shielding', amplifier: { min: 2, step: 1, steps: 3 }, chance: 1 },
+                        { effect: 'ars_nouveau:spell_damage', amplifier: { min: 2, step: 1, steps: 7 }, chance: 1 },
+                        { effect: 'ars_nouveau:mana_regen', amplifier: { min: 2, step: 1, steps: 7 }, chance: 1 }
                     ],
                     attribute_modifiers: [
                         {

diff --git a/kubejs/server_scripts/normal/recipes/apotheosis/bosses/the_end.js b/kubejs/server_scripts/normal/recipes/apotheosis/bosses/the_end.js
@@ -27,9 +27,9 @@ ServerEvents.highPriorityData((event) => {
                     enchant_chance: 1,
                     enchantment_levels: [36, 30, 100, 85],
                     effects: [
-                        { effect: 'ars_nouveau:shielding', amplifier: { min: 2, max: 3 }, chance: 1 },
-                        { effect: 'ars_nouveau:spell_damage', amplifier: { min: 2, max: 7 }, chance: 1 },
-                        { effect: 'ars_nouveau:mana_regen', amplifier: { min: 2, max: 7 }, chance: 1 }
+                        { effect: 'ars_nouveau:shielding', amplifier: { min: 2, step: 1, steps: 3 }, chance: 1 },
+                        { effect: 'ars_nouveau:spell_damage', amplifier: { min: 2, step: 1, steps: 7 }, chance: 1 },
+                        { effect: 'ars_nouveau:mana_regen', amplifier: { min: 2, step: 1, steps: 7 }, chance: 1 }
                     ],
                     attribute_modifiers: [
                         {

diff --git a/kubejs/server_scripts/normal/recipes/apotheosis/bosses/the_nether.js b/kubejs/server_scripts/normal/recipes/apotheosis/bosses/the_nether.js
@@ -28,9 +28,9 @@ ServerEvents.highPriorityData((event) => {
                     enchantment_levels: [36, 30, 100, 85],
                     effects: [
                         { effect: 'minecraft:fire_resistance', chance: 1 },
-                        { effect: 'ars_nouveau:shielding', amplifier: { min: 2, max: 3 }, chance: 1 },
-                        { effect: 'ars_nouveau:spell_damage', amplifier: { min: 2, max: 7 }, chance: 1 },
-                        { effect: 'ars_nouveau:mana_regen', amplifier: { min: 2, max: 7 }, chance: 1 }
+                        { effect: 'ars_nouveau:shielding', amplifier: { min: 2, step: 1, steps: 3 }, chance: 1 },
+                        { effect: 'ars_nouveau:spell_damage', amplifier: { min: 2, step: 1, steps: 7 }, chance: 1 },
+                        { effect: 'ars_nouveau:mana_regen', amplifier: { min: 2, step: 1, steps: 7 }, chance: 1 }
                     ],
                     attribute_modifiers: [
                         {

diff --git a/kubejs/server_scripts/normal/recipes/apotheosis/bosses/twilight_forest.js b/kubejs/server_scripts/normal/recipes/apotheosis/bosses/twilight_forest.js
@@ -28,9 +28,9 @@ ServerEvents.highPriorityData((event) => {
                     enchant_chance: 1,
                     enchantment_levels: [36, 30, 100, 85],
                     effects: [
-                        { effect: 'ars_nouveau:shielding', amplifier: { min: 2, max: 3 }, chance: 1 },
-                        { effect: 'ars_nouveau:spell_damage', amplifier: { min: 2, max: 7 }, chance: 1 },
-                        { effect: 'ars_nouveau:mana_regen', amplifier: { min: 2, max: 7 }, chance: 1 }
+                        { effect: 'ars_nouveau:shielding', amplifier: { min: 2, step: 1, steps: 3 }, chance: 1 },
+                        { effect: 'ars_nouveau:spell_damage', amplifier: { min: 2, step: 1, steps: 7 }, chance: 1 },
+                        { effect: 'ars_nouveau:mana_regen', amplifier: { min: 2, step: 1, steps: 7 }, chance: 1 }
                     ],
                     attribute_modifiers: [
                         {