Merge branch 'develop' of https://github.com/EnigmaticaModpacks/Enigm…

…atica9 into develop
EnigmaticaModpacks · Jul 22, 2023 · 833a7a3 · 833a7a3
2 parents f061d10 + e66036e
commit 833a7a3
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 9 deletions.
diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md
@@ -18,6 +18,7 @@
 -   Add many items to Mekanism's Painting system [\#494](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/494) ([MuteTiefling](https://github.com/MuteTiefling))
 -   Apotheosis bosses largely reverted to new defaults. Remaining bosses brought more in line with the new balancing. [\#495](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/495) ([MuteTiefling](https://github.com/MuteTiefling))
 -   Apotheosis gems that were previously modified have been rebalanced to closer match the new defaults. [\#496](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/496) ([MuteTiefling](https://github.com/MuteTiefling))
+-   Source Gem Blocks may now be stonecut between types. [\#519](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/519) ([MuteTiefling](https://github.com/MuteTiefling))
 
 ### 🐛 Fixed Bugs
 
@@ -32,6 +33,8 @@
 -   Expert Armor Sets no longer affect Normal mode. [\#505](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/505) ([MuteTiefling](https://github.com/MuteTiefling))
 -   Inhalation Purification no longer removes certain effects that aren't meant to be removed. [\#505](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/505) ([MuteTiefling](https://github.com/MuteTiefling))
 -   Fix IE Mineral Deposits. [\#506](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/506) ([MuteTiefling](https://github.com/MuteTiefling))
+-   Enchanters Shield now accepts any source gem. [\#522](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/522) ([MuteTiefling](https://github.com/MuteTiefling))
+-   Occultism Machine Operator quest is now completable. [\#523](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/523) ([MuteTiefling](https://github.com/MuteTiefling))
 
 ---
 

diff --git a/config/ftbquests/quests/chapters/occultism.snbt b/config/ftbquests/quests/chapters/occultism.snbt
@@ -1264,9 +1264,10 @@
 			}]
 			subtitle: "I Better Be Gettin' Overtime For This..."
 			tasks: [{
-				id: "238EBFECAEB660D2"
-				item: "occultism:ritual_dummy/summon_djinni_manage_machine"
-				type: "item"
+				advancement: "occultism:occultism/summon_djinni_manage_machine"
+				criterion: ""
+				id: "4FDCE30BF1570E18"
+				type: "advancement"
 			}]
 			title: "Summon Djinni Machine Operator"
 			x: 9.0d

diff --git a/config/ftbquests/quests/chapters/occultism_expert.snbt b/config/ftbquests/quests/chapters/occultism_expert.snbt
@@ -938,9 +938,10 @@
 			}]
 			subtitle: "I Better Be Gettin' Overtime For This..."
 			tasks: [{
-				id: "0B788095ADC13FC0"
-				item: "occultism:ritual_dummy/summon_djinni_manage_machine"
-				type: "item"
+				advancement: "occultism:occultism/summon_djinni_manage_machine"
+				criterion: ""
+				id: "037CEDAB050E3E9E"
+				type: "advancement"
 			}]
 			title: "Summon Djinni Machine Operator"
 			x: 9.5d

diff --git a/config/ftbbackups2.json → defaultconfigs/ftbbackups2.json b/config/ftbbackups2.json → defaultconfigs/ftbbackups2.json
diff --git a/kubejs/assets/railways/lang/en_us.json b/kubejs/assets/railways/lang/en_us.json
@@ -1,4 +1,4 @@
 {
-	"block.railways.track_switch_brass": "Enchanted Track Switch",
-	"block.railways.track_switch_andesite": "Compressed Stone Track Switch"
+	"block.railways.track_switch_brass": "Brass Track Switch",
+	"block.railways.track_switch_andesite": "Andesite Track Switch"
 }
diff --git a/kubejs/server_scripts/base/recipes/minecraft/stonecutting.js b/kubejs/server_scripts/base/recipes/minecraft/stonecutting.js
@@ -16,6 +16,16 @@ ServerEvents.recipes((event) => {
             output: 'quark:limestone',
             input: 'create:limestone',
             id: `${id_prefix}create_to_quark_limestone`
+        },
+        {
+            output: 'emendatusenigmatica:source_block',
+            input: 'ars_nouveau:source_gem_block',
+            id: `${id_prefix}ars_nouveau_to_emendatusenigmatica_source_gem_block`
+        },
+        {
+            output: 'ars_nouveau:source_gem_block',
+            input: 'emendatusenigmatica:source_block',
+            id: `${id_prefix}emendatusenigmatica_to_ars_nouveau_source_gem_block`
         }
     ];
 

diff --git a/kubejs/server_scripts/expert/tags/enchantment/crystalline_flower.js b/kubejs/server_scripts/expert/tags/enchantment/crystalline_flower.js
@@ -3,5 +3,7 @@ ServerEvents.tags('enchantment', (event) => {
         return;
     }
 
-    // event.get('the_bumblezone:crystalline_flower/disallowed_enchantments').add(['minecraft:respiration']);
+    event
+        .get('the_bumblezone:crystalline_flower/disallowed_enchantments')
+        .add(['minecraft:respiration', 'minecraft:mending']);
 });
diff --git a/kubejs/server_scripts/normal/recipes/superiorshields/shaped.js b/kubejs/server_scripts/normal/recipes/superiorshields/shaped.js
@@ -0,0 +1,22 @@
+ServerEvents.recipes((event) => {
+    if (global.isNormalMode == false) {
+        return;
+    }
+    const id_prefix = 'enigmatica:normal/superiorshields/shaped/';
+
+    const recipes = [
+        {
+            output: 'superiorshields:enchanter_shield',
+            pattern: [' A ', 'ABA', ' A '],
+            key: {
+                A: '#forge:ingots/gold',
+                B: '#forge:gems/source'
+            },
+            id: 'superiorshields:enchanter_shield'
+        }
+    ];
+
+    recipes.forEach((recipe) => {
+        event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id);
+    });
+});