Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft

Conflicts:
	common/pcc/chemicraft/ChemiCraft.java
	common/pcc/chemicraft/client/ClientProxy.java
	common/pcc/chemicraft/container/ContainerElectrolysisTable.java
	common/pcc/chemicraft/system/CommonProxy.java
	common/pcc/chemicraft/tileentity/TileEntityElectrolysisTable.java

diff --cc common/pcc/chemicraft/container/ContainerElectrolysisTable.java
index 522c85c,79c722f..493692d
--- 1/common/pcc/chemicraft/container/ContainerElectrolysisTable.java
--- 2/common/pcc/chemicraft/container/ContainerElectrolysisTable.java
+++ b/common/pcc/chemicraft/container/ContainerElectrolysisTable.java
@@@ -8,13 -8,13 +8,14 @@@ import pcc.chemicraft.ChemiCraft
  import pcc.chemicraft.inventory.InventoryElectrolysisFuel;
  import pcc.chemicraft.inventory.InventoryElectrolysisMaterial;
  import pcc.chemicraft.inventory.InventoryElectrolysisResult;
 -import pcc.chemicraft.slot.SlotPyrolysisTableFuel;
 -import pcc.chemicraft.slot.SlotPyrolysisTableMaterial;
 +import pcc.chemicraft.slot.SlotElectrolysisFuel;
 +import pcc.chemicraft.slot.SlotElectrolysisMaterial;
 +import pcc.chemicraft.slot.SlotElectrolysisResult;
+ import pcc.chemicraft.slot.SlotPyrolysisTableResult;
  import pcc.chemicraft.tileentity.TileEntityElectrolysisTable;
  
 -public class ContainerElectrolysisTable extends Container
 -{
 +
 +public class ContainerElectrolysisTable extends Container {
  
        private World worldObj;
  
@@@ -28,7 -26,9 +29,7 @@@
        private InventoryElectrolysisResult invr;
        private InventoryElectrolysisFuel invf;
  
-       public ContainerElectrolysisTable(EntityPlayer par1EntityPlayer, TileEntityElectrolysisTable par2){
 -      private TileEntityElectrolysisTable tileentity;
 -
+       public ContainerElectrolysisTable(EntityPlayer par1EntityPlayer, TileEntityElectrolysisTable par2) {
                super();
                this.tileentity = par2;
                this.worldObj = par2.worldObj;