+ Added Spice of Life support.

+ Added new Food Crate.
$ Fixed bug in Fish Catcher, where side by side traps didn't count properly as water.
$ Fixed bug in Air Intake Hatch.

4 files changed, 15 insertions, 4 deletions

diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
index cd25fdb1c3..9a1b551d30 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
@@ -16,6 +16,7 @@ import gtPlusPlus.xmod.ob.HANDLER_OpenBlocks;
 import gtPlusPlus.xmod.railcraft.HANDLER_Railcraft;
 import gtPlusPlus.xmod.reliquary.HANDLER_Reliquary;
 import gtPlusPlus.xmod.sc2.HANDLER_SC2;
+import gtPlusPlus.xmod.sol.HANDLER_SpiceOfLife;
 import gtPlusPlus.xmod.thaumcraft.HANDLER_Thaumcraft;
 import gtPlusPlus.xmod.thermalfoundation.HANDLER_TF;
 import gtPlusPlus.xmod.tinkers.HANDLER_Tinkers;
@@ -39,6 +40,7 @@ public class COMPAT_IntermodStaging {
 		HANDLER_Railcraft.preInit();
 		HANDLER_Reliquary.preInit();
 		HANDLER_OpenBlocks.preInit();
+		HANDLER_SpiceOfLife.preInit();
 	}
 
 	public static void init(FMLInitializationEvent init){
@@ -58,6 +60,7 @@ public class COMPAT_IntermodStaging {
 		HANDLER_Railcraft.init();
 		HANDLER_Reliquary.init();
 		HANDLER_OpenBlocks.init();
+		HANDLER_SpiceOfLife.init();
 	}
 
 	public static void postInit(FMLPostInitializationEvent postinit){
@@ -77,6 +80,7 @@ public class COMPAT_IntermodStaging {
 		HANDLER_Railcraft.postInit();
 		HANDLER_Reliquary.postInit();
 		HANDLER_OpenBlocks.postInit();
+		HANDLER_SpiceOfLife.postInit();
 	}
 
 	public static void onLoadComplete(FMLLoadCompleteEvent event) {
diff --git a/src/Java/gtPlusPlus/core/lib/LoadedMods.java b/src/Java/gtPlusPlus/core/lib/LoadedMods.java
index 329cf634b6..1eb8351d65 100644
--- a/src/Java/gtPlusPlus/core/lib/LoadedMods.java
+++ b/src/Java/gtPlusPlus/core/lib/LoadedMods.java
@@ -59,6 +59,7 @@ public class LoadedMods {
 	public static boolean Waila = false;
 	public static boolean CropsPlusPlus = false; //Barts Crop Mod
 	public static boolean Reliquary = false;
+	public static boolean SpiceOfLife = false;
 
 
 
@@ -211,6 +212,11 @@ public class LoadedMods {
 			Logger.INFO("Components enabled for: WAILA");
 			totalMods++;
 		}
+		if (isModLoaded("SpiceOfLife")){
+			SpiceOfLife  = true;
+			Logger.INFO("Components enabled for: Spice Of Life");
+			totalMods++;
+		}
 		if (isModLoaded("Mekanism")){
 			Mekanism  = true;
 			Logger.INFO("Components enabled for: Mekanism - This feature is not configurable and balances Mekanism to suit GT.");
diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
index e7c37f7994..beff269428 100644
--- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
+++ b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java
@@ -79,7 +79,8 @@ public class TileEntityFishTrap extends TileEntity implements ISidedInventory {
 					}
 				}
 				if ((waterCount >= 2) && (trapCount <= 4)) {
-					this.waterSides = waterCount;
+					int aCheck = trapCount + waterCount;
+					this.waterSides = MathUtils.balance(aCheck, 0, 6);
 					Logger.MACHINE_INFO("Valid Trap. "+waterCount+" | "+(this.tickCount/20)+"/"+(this.baseTickRate/20));
 					return true;
 				}
diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java
index 316d271961..5b837397b1 100644
--- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java
+++ b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java
@@ -340,12 +340,12 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide
 
 	@Override
 	public boolean canInsertItem(final int aSlot, final ItemStack p_102007_2_, final int p_102007_3_) {
-		return aSlot >= 0 && aSlot <= 24;
+		return aSlot == aCurrentMode;
 	}
 
 	@Override
-	public boolean canExtractItem(final int p_102008_1_, final ItemStack p_102008_2_, final int p_102008_3_) {
-		return p_102008_1_ == 25;
+	public boolean canExtractItem(final int aSlot, final ItemStack p_102008_2_, final int p_102008_3_) {
+		return aSlot == Container_VolumetricFlaskSetter.SLOT_OUTPUT;
 	}
 
 	public String getCustomName() {