Merge pull request #880 from MaxNeedsSnacks/minor-fixes

Minor fixes and stuff
EnigmaticaModpacks · Feb 21, 2019 · 256bf8b · 256bf8b
2 parents f8969a6 + fef101e
commit 256bf8b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/scripts/ImmersiveEngineering.zs b/scripts/ImmersiveEngineering.zs
@@ -23,6 +23,10 @@ print("--- loading ImmersiveEngineering.zs ---");
 	mods.thermalexpansion.RedstoneFurnace.addPyrolysisRecipe(<immersiveengineering:stone_decoration:3>, 
 	<minecraft:coal_block>, 2400, 2500);
 
+# Sulfur Unification
+  mods.immersiveengineering.Crusher.removeRecipe(<minecraft:blaze_powder>);
+  mods.immersiveengineering.Crusher.addRecipe(<minecraft:blaze_powder> * 4, <ore:itemBlazeRod>, 2048, <thermalfoundation:material:771>, 0.5);
+
 # Aluminum Scaffolding
 	recipes.remove(<immersiveengineering:metal_decoration2:8>);
 	recipes.addShapedMirrored("Aluminum Scaffolding", 
@@ -207,4 +211,4 @@ print("--- loading ImmersiveEngineering.zs ---");
 	#OutputFluid
 	#mods.immersiveengineering.Squeezer.removeFluidRecipe(<liquid:plantoil>);
 
-		print("--- ImmersiveEngineering.zs initialized ---");
+		print("--- ImmersiveEngineering.zs initialized ---");
diff --git a/scripts/IndustrialForegoing.zs b/scripts/IndustrialForegoing.zs
@@ -7,10 +7,20 @@ print("--- loading IndustrialForegoing.zs ---");
 
 # FluidDictionary Recipes
 	FluidDictionary.add("seed.oil", "seed_oil", 1);
+	FluidDictionary.add("seed_oil", "seed.oil", 1);
+
 	FluidDictionary.add("sulfuric_acid", "sulfuricacid", 1);
+	FluidDictionary.add("sulfuricacid", "sulfuric_acid", 1);
+
+	FluidDictionary.add("ic2hydrogen", "hydrogen", 1);
 	FluidDictionary.add("hydrogen", "ic2hydrogen", 1);
+
 	FluidDictionary.add("hydrogen", "liquidhydrogen", 1);
+	FluidDictionary.add("liquidhydrogen", "hydrogen", 1);
+
 	FluidDictionary.add("liquidhydrogen", "ic2hydrogen", 1);
+	FluidDictionary.add("ic2hydrogen", "liquidhydrogen", 1);
+
 
 # Protein Reactor, additional entires
 	for item in <ore:listAllmeatraw>.items {
@@ -124,4 +134,4 @@ print("--- loading IndustrialForegoing.zs ---");
 	[<ore:plateDenseGold>, <thermalexpansion:frame>, <ore:plateDenseGold>], 
 	[<ore:gearDiamond>, <ore:blockOsmiridium>, <ore:gearDiamond>]]);
 
-	print("--- IndustrialForegoing.zs initialized ---");
+	print("--- IndustrialForegoing.zs initialized ---");
diff --git a/scripts/MiscRecipes.zs b/scripts/MiscRecipes.zs
@@ -168,6 +168,10 @@ recipes.addShapedMirrored("Eclipsed Clock",
 	[[null, <ore:paper>, <ore:cropFlax>],
 	[<ore:paper>, <ore:dyeBlack>, <ore:paper>], 
 	[<ore:paper>, <ore:paper>, null]]);
+
+# Remove extraneous (and OP) Paper recipes
+  recipes.removeByRecipeName("minecraft:paper"); # Removed because EnderCore adds a shapeless one
+  recipes.removeByRecipeName("mekanism:paper"); # Removed because CHEATS
 
 # Elytra
 	recipes.addShaped("Elytra", 
@@ -340,4 +344,4 @@ recipes.addShapedMirrored("Eclipsed Clock",
 	rh(<extendedcrafting:material:128>);
 	rh(<extendedcrafting:material:129>);
 	
-print("--- MiscRecipes.zs initialized ---");
+print("--- MiscRecipes.zs initialized ---");