2 files changed, 33 insertions, 28 deletions
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
index 77ff3fbf79..371d6bdb2c 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
@@ -72,9 +72,9 @@ public class GT_MetaGenerated_Item_03
          * 
          * quantum chips
          */
-        ItemList.Circuit_Silicon_Ingot.set(addItem(tLastID = 30, "Monocrystalline Silicon Ingot", "Raw Circuit", o));
-        ItemList.Circuit_Silicon_Ingot2.set(addItem(tLastID = 31, "Glowstone doped Monocrystalline Silicon Ingot", "Raw Circuit", o));
-        ItemList.Circuit_Silicon_Ingot3.set(addItem(tLastID = 32, "Naquadah doped Monocrystalline Silicon Ingot", "Raw Circuit", o));
+        ItemList.Circuit_Silicon_Ingot.set(addItem(tLastID = 30, "Monocrystalline Silicon Boule", "Raw Circuit", o));
+        ItemList.Circuit_Silicon_Ingot2.set(addItem(tLastID = 31, "Glowstone doped Monocrystalline Silicon Boule", "Raw Circuit", o));
+        ItemList.Circuit_Silicon_Ingot3.set(addItem(tLastID = 32, "Naquadah doped Monocrystalline Silicon Boule", "Raw Circuit", o));
 
         ItemList.Circuit_Silicon_Wafer.set(addItem(tLastID = 33, "Wafer", "Raw Circuit", o));
         ItemList.Circuit_Silicon_Wafer2.set(addItem(tLastID = 34, "Glowstone doped Wafer", "Raw Circuit", o));
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
index 31ee92ea8f..e001e4c509 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
@@ -16,15 +16,15 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 
 public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBase {
-private int mHeatingCapacity = 0;
+    private int mHeatingCapacity = 0;
 
-public GT_MetaTileEntity_Cleanroom(int aID, String aName, String aNameRegional) {
-super(aID, aName, aNameRegional);
-}
+    public GT_MetaTileEntity_Cleanroom(int aID, String aName, String aNameRegional) {
+        super(aID, aName, aNameRegional);
+    }
 
-public GT_MetaTileEntity_Cleanroom(String aName) {
-super(aName);
-}
+    public GT_MetaTileEntity_Cleanroom(String aName) {
+        super(aName);
+    }
 
 	@Override
 	public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
@@ -36,7 +36,7 @@ super(aName);
         return new String[]{
                 "Controller Block for the Cleanroom",
                 "Min(WxHxD): 3x3x3 (Hollow), Max(WxHxD): 15x15x15 (Hollow)",
-                "Controller (Top center), Walls Plascrete",
+                "Controller (Top center), Walls Plascrete (20 min)",
                 "Top besides contoller and edges Filter Machine Casings",
                 "1x Reinforced Door",
                 "1x MV+ Energy Hatch, 1x Maintainance Hatch",
@@ -114,9 +114,7 @@ super(aName);
 									mDoorCount++;
 								} else {
 									if (tTileEntity == null) {
-										{
 											return false;
-										}
 									}
 									IMetaTileEntity aMetaTileEntity = tTileEntity.getMetaTileEntity();
 									if (aMetaTileEntity == null) {
@@ -130,8 +128,6 @@ super(aName);
 								}
 							}
 						}
-					} else {
-
 					}
 				}
 			}
@@ -153,21 +149,30 @@ super(aName);
 			}
 		}
 
-		if (doorState) {
-			mEfficiency = Math.max(0, mEfficiency - 200);
-		}
-
-return true;
-}
+        if (doorState) {
+            mEfficiency = Math.max(0, mEfficiency - 200);
+        }
+        for(byte i = 0 ; i<6 ; i++){
+        	byte t = (byte) Math.max(1, (byte)(15/(10000f / mEfficiency)));
+        aBaseMetaTileEntity.setInternalOutputRedstoneSignal(i, t);
+        }
+        
+        return true;
+    }
+    
+    @Override
+    public boolean allowGeneralRedstoneOutput(){
+    	return true;
+    }
 
-	@Override
-	public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
-		if (aSide == 0 || aSide == 1) {
-			return new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.BLOCK_PLASCRETE), new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_TOP_CLEANROOM_ACTIVE : Textures.BlockIcons.OVERLAY_TOP_CLEANROOM)};
+    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
+        if (aSide == 0 || aSide == 1) {
+            return new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.BLOCK_PLASCRETE),
+                    new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_TOP_CLEANROOM_ACTIVE : Textures.BlockIcons.OVERLAY_TOP_CLEANROOM)};
 
-}
-return new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.BLOCK_PLASCRETE)};
-}
+        }
+        return new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.BLOCK_PLASCRETE)};
+    }
 
 	@Override
 	public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {