+ Added a new Alloy.

+ Added Recipes for the Fusion MK4 Components and the Deep Earth Drilling Platform components.
+ Added additional feature support to all Assembly Line recipes when TecTech is found.
+ Added initial work for future particle science.
% Initial functions added for Multiblock Requirements.
% More work on Multiblock Blueprints and Layers.
% Updated lead lined chest significantly.
% Improved Fish trap inventory handling and general logic, it's now slightly faster with slightly better loot rates.
% Changed texture of Fish trap.

3 files changed, 38 insertions, 4 deletions

diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java b/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java
index 006c346c64..54710662d8 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java
@@ -260,6 +260,7 @@ public class BaseItemTickable extends CoreItem {
 				//Done Ticking
 				if (maxTicks-getFilterDamage(world, aStack) <= 0) {
 					setIsActive(world, aStack, false);
+					return false;
 				}			
 				if (getIsActive(world, aStack)) {
 					if (aNBT != null) {
@@ -272,6 +273,9 @@ public class BaseItemTickable extends CoreItem {
 						
 						return true;
 					}
+					else {
+						return false;
+					}
 				}	
 				else {
 					return false;
@@ -293,7 +297,7 @@ public class BaseItemTickable extends CoreItem {
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {
+	public void addInformation(ItemStack stack, EntityPlayer player, @SuppressWarnings("rawtypes") List list, boolean bool) {
 		World world = player.getEntityWorld();
 		if (this.descriptionString.length > 0) {
 			list.add(EnumChatFormatting.GRAY+this.descriptionString[0]);
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
index b9cd9ede5f..51b133241b 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
@@ -22,7 +22,10 @@ public class ItemBlockBasicTile extends ItemBlock{
 	@Override
 	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
 		if (this.mID == 0){ //Fish trap
-			list.add("This trap catches fish faster if surrounded by more water blocks.");			
+			list.add("This trap catches fish faster if surrounded by more water blocks");	
+			list.add("Can also be placed beside upto 4 other fish traps");	
+			list.add("Requires at least two faces touching water");		
+			list.add("1/1000 chance to produce triple loot.");		
 		}
 		else if (this.mID == 1){ //Modularity
 			list.add("Used to construct modular armour & bauble upgrades..");			
@@ -39,8 +42,9 @@ public class ItemBlockBasicTile extends ItemBlock{
 			list.add("Default is used to select slot for auto-insertion");			
 		}
 		else if (this.mID == 5){ //Decayables Chest
-			list.add("Holds radioactive materials");	
-			list.add("Items which decay will tick while inside");			
+			list.add("Chest which holds radioactive materials");	
+			list.add("Items which decay will tick while inside");	
+			list.add("Place with right click");			
 		}
 		else {
 			list.add("Bad Tooltip ID - "+mID);
diff --git a/src/Java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java b/src/Java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java
new file mode 100644
index 0000000000..363b9ad00d
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java
@@ -0,0 +1,26 @@
+package gtPlusPlus.core.item.base.misc;
+
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.item.base.CoreItem;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.Material;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+
+public class BaseItemParticle extends CoreItem {
+
+	private final Material mParticleMaterial;
+	
+	public BaseItemParticle(Material aMat, String aType) {
+		super("particle"+aMat.getLocalizedName()+aType, aMat.getLocalizedName()+" "+aType, AddToCreativeTab.tabOther, 64, 0, new String[] {}, EnumRarity.rare, EnumChatFormatting.DARK_AQUA, false, null);
+		this.setTextureName(CORE.MODID + ":" + "science/Atom");
+		mParticleMaterial = aMat;
+	}
+
+	@Override
+	public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) {
+		return this.mParticleMaterial.getRgbAsHex();
+	}
+	
+}