More QoL

changelogs/CHANGELOG.md

@@ -9,11 +9,18 @@
 -   [Expert] Massively buff Aura Infusion rewards [\#940](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/940)
 -   Add several new brewable potions, including higher tiers of some existing potions [\#943](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/943)
 -   [Expert] Remove dependencies on iron from a lot of decorative blocks [\#950](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/950)
+-   Aura will no longer cause wild grass growth on byg grass blocks [\#961](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/961)
+-   Added a bunch of conversion options for mossy variants [\#961](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/961)
+-   Added crafting recipes for many stone variants [\#961](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/961)
+-   [Expert] Motes now craft 1:1 with their potion to avoid leftovers [\#961](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/961)
+-   [Expert] Several Iron using recipes have been tweaked to adjust their gating [\#961](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/961)
 
 ### 🐛 Fixed Bugs
 
 -   [Expert] Add recipe for Ash Bricks [\#950](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/950)
 -   [Expert] Disable a coal gen that was missed [\#952](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/952)
+-   [Expert] Fixed typo in Storage Actuator quest in chapter 2 [\#961](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/961)
+-   Removed reference to step height bonus on Skyseeker's armor [\#961](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/961)
 
 ### Enigmatica 9 v1.21.0
 

config/configswapper/expert/config/naturesaura-common.toml

@@ -26,6 +26,8 @@
 		]
 	#The amount of blocks that can be between two Aura Field Creators for them to be connectable and work together
 	fieldCreatorRange = 24
+	#Blocks that are exept from being fertilized by the plant boost effect. Each entry needs to be formatted as modid:block, and entries follow standard TOML array formatting (https://toml.io/en/v1.0.0#array).
+	plantBoostExceptions = ["byg:lush_grass_block", "byg:overgrown_dacite", "byg:overgrown_stone", "byg:overgrown_netherrack"]
 	#The Aura to RF ratio used by the RF converter, read as aura*ratio = rf
 	auraToRFRatio = 0.025
 	#The maximum amount of animals that can be around the powder of fertility before it stops working

config/configswapper/normal/config/naturesaura-common.toml

@@ -16,6 +16,8 @@
 	additionalProjectiles = []
 	#The amount of blocks that can be between two Aura Field Creators for them to be connectable and work together
 	fieldCreatorRange = 24
+	#Blocks that are exept from being fertilized by the plant boost effect. Each entry needs to be formatted as modid:block, and entries follow standard TOML array formatting (https://toml.io/en/v1.0.0#array).
+	plantBoostExceptions = ["byg:lush_grass_block", "byg:overgrown_dacite", "byg:overgrown_stone", "byg:overgrown_netherrack"]
 	#The Aura to RF ratio used by the RF converter, read as aura*ratio = rf
 	auraToRFRatio = 0.05
 	#The maximum amount of animals that can be around the powder of fertility before it stops working

config/ftbquests/quests/chapters/chapter_one.snbt

@@ -1952,7 +1952,7 @@
 			description: [
 				"There’s far more to magic than just the showy bits of wiggling one’s fingers and making sparkly lights. Indeed, a great deal can be done through the arcane arts with the right materials and processes. "
 				""
-				"Long ago, specialists in transmutation and conjuration discovered ways of creating vast networks of crystalline conduits capable of wonderous feats. They kept hordes of materials stored away in dimensional arrays and could use them to create nearly anything on a whim. "
+				"Long ago, specialists in transmutation and conjuration discovered ways of creating vast networks of crystalline conduits capable of wondrous feats. They kept hordes of materials stored away in dimensional arrays and could use them to create nearly anything on a whim. "
 				""
 				"That all seems rather far out of reach for now, but simple transport seems viable at least."
 				""

config/ftbquests/quests/chapters/chapter_two.snbt

@@ -667,7 +667,7 @@
 		}
 		{
 			dependencies: ["00B21E64DEFACB40"]
-			description: ["The beating heart of a magical energy network, the elementals bound into the ME Controller direct the flow of magical energies between the various components of the network, enabling a witch to perform the most wonderous of feats imaginable. "]
+			description: ["The beating heart of a magical energy network, the elementals bound into the ME Controller direct the flow of magical energies between the various components of the network, enabling a witch to perform the most wondrous of feats imaginable. "]
 			icon: "ae2:controller"
 			id: "330C200F0F0243FC"
 			rewards: [
@@ -981,7 +981,7 @@
 		{
 			dependencies: ["7001144C71F0E0BC"]
 			description: [
-				"As suspected, with even a minimal amount of stabilization, the Matrix can store a wonderous quantity of items. "
+				"As suspected, with even a minimal amount of stabilization, the Matrix can store a wondrous quantity of items. "
 				""
 				"More experimentation with planar stabilizers is certainly warranted. "
 			]

config/ftbquests/quests/chapters/natures_aura.snbt

@@ -1305,7 +1305,7 @@
 				""
 				"● Skyseeker’s Blade: Inflicts Levitation on its target."
 				""
-				"● Skyseeker’s Armor: When wearing a full set, grants a speed bonus and the ability to step up one block."
+				"● Skyseeker’s Armor: When wearing a full set, grants a speed bonus."
 			]
 			icon: {
 				Count: 1b

config/ftbquests/quests/chapters/natures_aura_expert.snbt

@@ -1261,7 +1261,7 @@
 				""
 				"● Skyseeker’s Blade: Inflicts Levitation on its target."
 				""
-				"● Skyseeker’s Armor: When wearing a full set, grants a speed bonus and the ability to step up one block."
+				"● Skyseeker’s Armor: When wearing a full set, grants a speed bonus and the ability to glide as if wearing Elytra."
 			]
 			icon: {
 				Count: 1b

kubejs/assets/create/lang/en_us.json

@@ -30,5 +30,7 @@
 	"advancement.create.brass": "Real Alloys",
 	"advancement.create.brass.desc": "Create Brass Ingots by alloying Copper and Zinc Ingots in your Blaze-heated Mechanical Mixer",
 	"block.create.industrial_iron_block": "Block of Industrial Iron",
-	"block.create.andesite_door": "Andesite Door"
+	"block.create.andesite_door": "Andesite Door",
+	"block.create.ornate_iron_window": "Ornate Iron Window",
+	"block.create.ornate_iron_window_pane": "Ornate Iron Window Pane"
 }

kubejs/assets/engineersdecor/lang/en_us.json

@@ -0,0 +1,17 @@
+{
+	"block.engineersdecor.iron_bulb_light": "Iron Bulb Light",
+	"block.engineersdecor.thin_steel_pole": "Straight Thin Steel Pole",
+	"block.engineersdecor.thick_steel_pole": "Straight Thick Steel Pole",
+	"block.engineersdecor.thin_steel_pole_head": "Straight Thin Steel Pole Head/Foot",
+	"block.engineersdecor.thick_steel_pole_head": "Straight Thick Steel Pole Head/Foot",
+	"block.engineersdecor.steel_double_t_support": "Steel Double T Support",
+	"block.engineersdecor.steel_mesh_fence": "Steel Mesh Fence",
+	"block.engineersdecor.steel_mesh_fence_gate": "Steel Mesh Fence Gate",
+	"block.engineersdecor.steel_catwalk": "Steel Catwalk",
+	"block.engineersdecor.steel_catwalk_ta": "Raised Steel Catwalk",
+	"block.engineersdecor.steel_catwalk_stairs": "Steel Catwalk Stairs",
+	"block.engineersdecor.steel_railing": "Steel Railing",
+	"block.engineersdecor.steel_table": "Steel Table",
+	"block.engineersdecor.steel_framed_window": "Steel Framed Window",
+	"block.engineersdecor.steel_floor_grating": "Steel Floor Grating"
+}

kubejs/assets/manyideas_core/lang/en_us.json

@@ -1,3 +1,5 @@
 {
-	"item.manyideas_core.plate_iron": "Iron Plate"
+	"item.manyideas_core.plate_iron": "Iron Plate",
+	"item.manyideas_core.saw_iron": "Iron Saw",
+	"block.manyideas_core.table_saw_iron": "Iron Table Saw"
 }

kubejs/assets/manyideas_doors/lang/en_us.json

@@ -0,0 +1,12 @@
+{
+	"block.manyideas_doors.door_iron_fantasy": "Iron Fantasy Door",
+	"block.manyideas_doors.door_iron_glass": "Iron Glass Door",
+	"block.manyideas_doors.door_iron_laboratory": "Iron Laboratory Door",
+	"block.manyideas_doors.door_iron_rusted": "Iron Rusted Door",
+	"block.manyideas_doors.door_iron_safe": "Iron Safe Door",
+	"block.manyideas_doors.door_iron_ship": "Iron Ship Door",
+	"block.manyideas_doors.door_iron_space": "Iron Space Door",
+	"block.manyideas_doors.door_iron_stone_brick": "Iron Stone Brick Door",
+	"block.manyideas_doors.door_iron_bookshelf": "Iron Bookshelf Door",
+	"block.manyideas_doors.door_iron_dwarf": "Iron Dwarf Door"
+}

kubejs/assets/v_slab_compat/lang/en_us.json

@@ -0,0 +1,6 @@
+{
+	"block.v_slab_compat.immersiveengineering/steel_scaffolding_standard_vertical_slab": "Reinforced Scaffolding Standard Vertical Slab",
+	"block.v_slab_compat.immersiveengineering/steel_scaffolding_grate_top_vertical_slab": "Reinforced Scaffolding Grate Top Vertical Slab",
+	"block.v_slab_compat.immersiveengineering.steel_scaffolding_standard_vertical_slab": "Steel Scaffolding Standard Vertical Slab",
+	"block.v_slab_compat.immersiveengineering.steel_scaffolding_grate_top_vertical_slab": "Steel Scaffolding Grate Top Vertical Slab"
+}

kubejs/client_scripts/lang_modifications.js

@@ -1373,6 +1373,92 @@ const entries = {
                 normal: `Iron Plate`,
                 expert: `Heavy Plate`
             }
+        },
+        {
+            key: 'item.manyideas_core.saw_iron',
+            value: {
+                normal: `Iron Saw`,
+                expert: `Tough Saw`
+            }
+        },
+        {
+            key: 'block.manyideas_core.table_saw_iron',
+            value: {
+                normal: `Iron Table Saw`,
+                expert: `Tough Table Saw`
+            }
+        }
+    ],
+    manyideas_doors: [
+        {
+            key: 'block.manyideas_doors.door_iron_fantasy',
+            value: {
+                normal: `Iron Fantasy Door`,
+                expert: `Reinforced Fantasy Door`
+            }
+        },
+        {
+            key: 'block.manyideas_doors.door_iron_glass',
+            value: {
+                normal: `Iron Glass Door`,
+                expert: `Reinforced Glass Door`
+            }
+        },
+        {
+            key: 'block.manyideas_doors.door_iron_laboratory',
+            value: {
+                normal: `Iron Laboratory Door`,
+                expert: `Reinforced Laboratory Door`
+            }
+        },
+        {
+            key: 'block.manyideas_doors.door_iron_rusted',
+            value: {
+                normal: `Iron Rusted Door`,
+                expert: `Reinforced Rusted Door`
+            }
+        },
+        {
+            key: 'block.manyideas_doors.door_iron_safe',
+            value: {
+                normal: `Iron Safe Door`,
+                expert: `Reinforced Safe Door`
+            }
+        },
+        {
+            key: 'block.manyideas_doors.door_iron_ship',
+            value: {
+                normal: `Iron Ship Door`,
+                expert: `Reinforced Ship Door`
+            }
+        },
+        {
+            key: 'block.manyideas_doors.door_iron_space',
+            value: {
+                normal: `Iron Space Door`,
+                expert: `Reinforced Space Door`
+            }
+        },
+        {
+            key: 'block.manyideas_doors.door_iron_stone_brick',
+            value: {
+                normal: `Iron Stone Brick Door`,
+                expert: `Reinforced Stone Brick Door`
+            }
+        },
+        {
+            key: 'block.manyideas_doors.door_iron_bookshelf',
+            value: {
+                normal: `Iron Bookshelf Door`,
+                expert: `Reinforced Bookshelf Door`
+            }
+        },
+        {
+            key: 'block.manyideas_doors.door_iron_dwarf',
+            value: {
+                normal: `Iron Dwarf Door`,
+                expert: `Reinforced Dwarf Door`
+            }
         }
     ],
     apotheosis: [
@@ -1666,6 +1752,129 @@ const entries = {
                 expert: `Spellbound Air Blower`
             }
         }
+    ],
+    engineersdecor: [
+        {
+            key: 'block.engineersdecor.iron_bulb_light',
+            value: {
+                normal: `Iron Bulb Light`,
+                expert: `Caged Bulb Light`
+            }
+        },
+        {
+            key: 'block.engineersdecor.thin_steel_pole',
+            value: {
+                normal: `Straight Thin Steel Pole`,
+                expert: `Straight Thin Reinforced Pole`
+            }
+        },
+        {
+            key: 'block.engineersdecor.thick_steel_pole',
+            value: {
+                normal: `Straight Thick Steel Pole`,
+                expert: `Straight Thick Reinforced Pole`
+            }
+        },
+        {
+            key: 'block.engineersdecor.thin_steel_pole_head',
+            value: {
+                normal: `Straight Thin Steel Pole Head/Foot`,
+                expert: `Straight Thin Reinforced Pole Head/Foot`
+            }
+        },
+        {
+            key: 'block.engineersdecor.thick_steel_pole_head',
+            value: {
+                normal: `Straight Thick Steel Pole Head/Foot`,
+                expert: `Straight Thick Reinforced Pole Head/Foot`
+            }
+        },
+        {
+            key: 'block.engineersdecor.steel_double_t_support',
+            value: {
+                normal: `Steel Double T Support`,
+                expert: `Reinforced Double T Support`
+            }
+        },
+        {
+            key: 'block.engineersdecor.steel_mesh_fence',
+            value: {
+                normal: `Steel Mesh Fence`,
+                expert: `Reinforced Mesh Fence`
+            }
+        },
+        {
+            key: 'block.engineersdecor.steel_mesh_fence_gate',
+            value: {
+                normal: `Steel Mesh Fence Gate`,
+                expert: `Reinforced Mesh Fence Gate`
+            }
+        },
+        {
+            key: 'block.engineersdecor.steel_catwalk',
+            value: {
+                normal: `Steel Catwalk`,
+                expert: `Reinforced Catwalk`
+            }
+        },
+        {
+            key: 'block.engineersdecor.steel_catwalk_ta',
+            value: {
+                normal: `Raised Steel Catwalk`,
+                expert: `Raised Reinforced Catwalk`
+            }
+        },
+        {
+            key: 'block.engineersdecor.steel_catwalk_stairs',
+            value: {
+                normal: `Steel Catwalk Stairs`,
+                expert: `Reinforced Catwalk Stairs`
+            }
+        },
+        {
+            key: 'block.engineersdecor.steel_railing',
+            value: {
+                normal: `Steel Railing`,
+                expert: `Reinforced Railing`
+            }
+        },
+        {
+            key: 'block.engineersdecor.steel_table',
+            value: {
+                normal: `Steel Table`,
+                expert: `Reinforced Table`
+            }
+        },
+        {
+            key: 'block.engineersdecor.steel_framed_window',
+            value: {
+                normal: `Steel Framed Window`,
+                expert: `Reinforced Framed Window`
+            }
+        },
+        {
+            key: 'block.engineersdecor.steel_floor_grating',
+            value: {
+                normal: `Steel Floor Grating`,
+                expert: `Reinforced Floor Grating`
+            }
+        }
+    ],
+    v_slab_compat: [
+        {
+            key: 'block.v_slab_compat.immersiveengineering.steel_scaffolding_standard_vertical_slab',
+            value: {
+                normal: `Steel Scaffolding Standard Vertical Slab`,
+                expert: `Reinforced Scaffolding Standard Vertical Slab`
+            }
+        },
+        {
+            key: 'block.v_slab_compat.immersiveengineering.steel_scaffolding_grate_top_vertical_slab',
+            value: {
+                normal: `Steel Scaffolding Grate Top Vertical Slab`,
+                expert: `Reinforced Scaffolding Grate Top Vertical Slab`
+            }
+        }
     ]
 };
 

kubejs/server_scripts/base/recipes/byg/shaped.js

@@ -49,6 +49,30 @@ ServerEvents.recipes((event) => {
         });
     });
 
+    const stone_conversions = [
+        'byg:rocky_stone',
+        'byg:dacite',
+        'byg:travertine',
+        'byg:soapstone',
+        'byg:scoria_stone',
+        'byg:red_rock'
+    ];
+
+    stone_conversions.forEach((stone, index) => {
+        let input = stone;
+        let output = index + 1 >= stone_conversions.length ? stone_conversions[0] : stone_conversions[index + 1];
+
+        recipes.push({
+            output: `8x ${output}`,
+            pattern: ['AAA', 'ABA', 'AAA'],
+            key: {
+                A: input,
+                B: '#forge:essences/manipulation'
+            },
+            id: `${id_prefix}${input.replace(':', '_')}_from_${output.replace(':', '_')}`
+        });
+    });
+
     recipes.forEach((recipe) => {
         event.shaped(recipe.output, recipe.pattern, recipe.key).id(recipe.id);
     });