Merge pull request #742 from NillerMedDild/develop

Update 0.3.4 Hotfix
EnigmaticaModpacks · Jan 4, 2021 · 6cf6832 · 6cf6832
2 parents 33c44bf + c83c56d
commit 6cf6832
Show file tree

Hide file tree

Showing 7 changed files with 1,757 additions and 1,727 deletions.
diff --git a/config/ars_nouveau-common.toml b/config/ars_nouveau-common.toml
@@ -105,7 +105,7 @@
 	launch = true
 	#Dispel enabled?
 	dispel = true
-	#Haste enabled?
+	#Speed enabled?
 	haste = true
 	#Access Ender Inventory enabled?
 	ender_inventory = true
@@ -166,7 +166,7 @@
 
 #Spell Cost
 [spell_cost]
-	#Haste cost
+	#Speed cost
 	#Range: > -2147483648
 	haste_cost = 30
 	#Summon Vex cost

diff --git a/config/jaopca/materials/arcane_gold.toml b/config/jaopca/materials/arcane_gold.toml
@@ -0,0 +1,13 @@
+
+[general]
+	#The alternative names of this material.
+	alternativeNames = []
+	#The byproducts of this material.
+	extras = []
+	#The module blacklist of this material.
+	moduleBlacklist = []
+	#Should items of this material have the enchanted glow.
+	hasEffect = false
+	#The model type of the material.
+	modelType = "metallic"
+
diff --git a/config/jaopca/materials/pewter.toml b/config/jaopca/materials/pewter.toml
@@ -0,0 +1,13 @@
+
+[general]
+	#The alternative names of this material.
+	alternativeNames = []
+	#The byproducts of this material.
+	extras = []
+	#The module blacklist of this material.
+	moduleBlacklist = []
+	#Should items of this material have the enchanted glow.
+	hasEffect = false
+	#The model type of the material.
+	modelType = "metallic"
+
diff --git a/config/jei/ingredient-list-mod-sort-order.ini b/config/jei/ingredient-list-mod-sort-order.ini
@@ -133,7 +133,8 @@ Alex's Mobs
 KubeJS
 Create
 Immersive Petroleum
-Portable Stonecutter
 Eidolon
 Occultism
 Paraglider
+JAOPCA
+Portable Stone Cutter
diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipes/replace_input.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipes/replace_input.js
@@ -35,7 +35,9 @@ events.listen('recipes', function (event) {
         ]);
 
         var wool = 'minecraft:' + colors[i] + '_wool';
-        event.remove({ id: 'minecraft:' + colors[i] + '_carpet_from_white_carpet' });
+        event.remove({
+            id: 'minecraft:' + colors[i] + '_carpet_from_white_carpet'
+        });
         event.shaped({ item: 'minecraft:' + colors[i] + '_carpet', count: 3 }, ['WW'], {
             W: wool
         });
@@ -62,7 +64,7 @@ events.listen('recipes', function (event) {
 
     event.replaceInput({}, 'refinedstorage:silicon', '#forge:silicon');
 
-    event.replaceInput({}, 'astralsorcery:marble_raw', '#forge:stones/marble');
+    event.replaceInput({ mod: 'astralsorcery' }, 'astralsorcery:marble_raw', '#forge:stones/marble');
 
     event.replaceInput({}, 'thermal:cinnabar', '#forge:gems/cinnabar');
     event.replaceInput({}, 'thermal:sulfur', '#forge:gems/sulfur');

diff --git a/.../server_scripts/enigmatica/kubejs/base/recipetypes/industrialforegoing/laser_drill_ore.js b/.../server_scripts/enigmatica/kubejs/base/recipetypes/industrialforegoing/laser_drill_ore.js
@@ -41,6 +41,8 @@ events.listen('recipes', function (event) {
         'biomesoplenty:withered_abyss'
     ];
 
+    //var nether_end_biomes = end_biomes.concat(nether_biomes);
+
     event.remove({ id: 'industrialforegoing:laser_drill_ore/sapphire' });
     event.remove({ id: 'industrialforegoing:laser_drill_ore/ruby' });
     event.remove({ id: 'industrialforegoing:laser_drill_ore/niter' });
@@ -761,11 +763,11 @@ events.listen('recipes', function (event) {
         },
         rarity: [
             {
-                whitelist: {
+                whitelist: {},
+                blacklist: {
                     type: 'minecraft:worldgen/biome',
-                    values: nether_biomes
+                    values: end_biomes
                 },
-                blacklist: {},
                 depth_min: 5,
                 depth_max: 29,
                 weight: 5