Merge branch 'master' into master

EnigmaticaModpacks · May 17, 2023 · c6f40bb · c6f40bb
2 parents 83b48b6 + 0d7af00
commit c6f40bb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/config/exnihilocreatio/OreRegistry.json b/config/exnihilocreatio/OreRegistry.json
@@ -44,7 +44,7 @@
     }
   },
   {
-    "name": "aluminium",
+    "name": "aluminum",
     "color": {
       "r": 0.7490196,
       "g": 0.7490196,

diff --git a/config/exnihilocreatio/SieveRegistry.json b/config/exnihilocreatio/SieveRegistry.json
@@ -396,23 +396,23 @@
     },
     {
       "drop": {
-        "name": "exnihilocreatio:item_ore_aluminium",
+        "name": "exnihilocreatio:item_ore_aluminum",
         "meta": 0
       },
       "chance": 0.2,
       "meshLevel": 2
     },
     {
       "drop": {
-        "name": "exnihilocreatio:item_ore_aluminium",
+        "name": "exnihilocreatio:item_ore_aluminum",
         "meta": 0
       },
       "chance": 0.2,
       "meshLevel": 3
     },
     {
       "drop": {
-        "name": "exnihilocreatio:item_ore_aluminium",
+        "name": "exnihilocreatio:item_ore_aluminum",
         "meta": 0
       },
       "chance": 0.1,
@@ -930,23 +930,23 @@
     },
     {
       "drop": {
-        "name": "exnihilocreatio:item_ore_aluminium",
+        "name": "exnihilocreatio:item_ore_aluminum",
         "meta": 0
       },
       "chance": 0.2,
       "meshLevel": 2
     },
     {
       "drop": {
-        "name": "exnihilocreatio:item_ore_aluminium",
+        "name": "exnihilocreatio:item_ore_aluminum",
         "meta": 0
       },
       "chance": 0.2,
       "meshLevel": 3
     },
     {
       "drop": {
-        "name": "exnihilocreatio:item_ore_aluminium",
+        "name": "exnihilocreatio:item_ore_aluminum",
         "meta": 0
       },
       "chance": 0.1,
@@ -1148,23 +1148,23 @@
     },
     {
       "drop": {
-        "name": "exnihilocreatio:item_ore_aluminium",
+        "name": "exnihilocreatio:item_ore_aluminum",
         "meta": 0
       },
       "chance": 0.2,
       "meshLevel": 2
     },
     {
       "drop": {
-        "name": "exnihilocreatio:item_ore_aluminium",
+        "name": "exnihilocreatio:item_ore_aluminum",
         "meta": 0
       },
       "chance": 0.2,
       "meshLevel": 3
     },
     {
       "drop": {
-        "name": "exnihilocreatio:item_ore_aluminium",
+        "name": "exnihilocreatio:item_ore_aluminum",
         "meta": 0
       },
       "chance": 0.1,

diff --git a/config/jaopca/materials/Aluminium.toml b/config/jaopca/materials/Aluminium.toml
@@ -8,7 +8,7 @@
 	#Is the storage block of this material small (2x2).
 	isSmallStorageBlock = false
 	#The module blacklist of this material.
-	moduleBlacklist = []
+	moduleBlacklist = ["*"]
 	#Should items of this material have the enchanted glow.
 	hasEffect = false
 	#The model type of the material.

diff --git a/scripts/ThermalExpansion.zs b/scripts/ThermalExpansion.zs
@@ -279,4 +279,4 @@ mods.thermalexpansion.Compactor.addGearRecipe(<thermalfoundation:material:23>, <
 # Remove AE2 Seeds from Phytogenic Insolator
 mods.thermalexpansion.Insolator.removeRecipe(<appliedenergistics2:crystal_seed:0>, <minecraft:glowstone_dust>);
 mods.thermalexpansion.Insolator.removeRecipe(<appliedenergistics2:crystal_seed:600>, <minecraft:glowstone_dust>);
-mods.thermalexpansion.Insolator.removeRecipe(<appliedenergistics2:crystal_seed:1200>, <minecraft:glowstone_dust>);
+mods.thermalexpansion.Insolator.removeRecipe(<appliedenergistics2:crystal_seed:1200>, <minecraft:glowstone_dust>);