OSDN Git Service

Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft
authormozipi <mozipi@users.sourceforge.jp>
Mon, 21 Jan 2013 14:28:32 +0000 (23:28 +0900)
committermozipi <mozipi@users.sourceforge.jp>
Mon, 21 Jan 2013 14:28:32 +0000 (23:28 +0900)
commit7c305f66b7b26b4d70cf3acd2264e35be55e2555
treec9b69373c4c7acf5113b67a5d1730073ce8fb5ce
parentfed248fa1247ee1be077f08f685da925fba93a80
parentcbf016a981df6758b057ca883a1527676a1a9ec3
Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft

Conflicts:
src/chemicraft/ChemiCraft.java
src/chemicraft/block/BlockDecompositionTable.java
src/chemicraft/container/ContainerDecompositionTable.java
src/chemicraft/gui/GuiDecompositionTable.java
src/chemicraft/tileentity/TileEntityDecompositionTable.java
33 files changed:
common/chemicraft/ChemiCraft.java
common/chemicraft/client/ClientProxy.java
common/chemicraft/container/ContainerChemicalCombinationTable.java
common/chemicraft/container/ContainerElectrolysisTable.java
common/chemicraft/debug/DebugTick.java
common/chemicraft/gui/GuiElectrolysisTable.java
common/chemicraft/inventory/InventoryElectrolysisFuel.java
common/chemicraft/inventory/InventoryElectrolysisMaterial.java
common/chemicraft/inventory/InventoryElectrolysisResult.java
common/chemicraft/inventory/InventoryPyrolysisTableMaterial.java
common/chemicraft/inventory/InventoryPyrolysisTableResult.java
common/chemicraft/item/ItemGasCollectingBottle.java
common/chemicraft/slot/SlotDecompositionTableMaterial.java
common/chemicraft/slot/SlotDecompositionTableResult.java
common/chemicraft/slot/SlotElectrolysisFuel.java
common/chemicraft/slot/SlotElectrolysisMaterial.java
common/chemicraft/slot/SlotElectrolysisResult.java
common/chemicraft/slot/SlotPyrolysisTableMaterial.java
common/chemicraft/slot/SlotPyrolysisTableResult.java
common/chemicraft/system/CommonProxy.java
common/chemicraft/tileentity/TileEntityChemicalCombinationTable.java
common/chemicraft/tileentity/TileEntityElectrolysisTable.java
common/chemicraft/tileentity/TileEntityPyrolysisTable.java
src/chemicraft/ChemiCraft.java
src/chemicraft/block/BlockDecompositionTable.java
src/chemicraft/container/ContainerDecompositionTable.java
src/chemicraft/debug/CommandDeleteItem.java
src/chemicraft/gui/GuiDecompositionTable.java
src/chemicraft/inventory/InventoryDecompositionTableMaterial.java
src/chemicraft/item/ItemGasCollectingBottle.java
src/chemicraft/system/CommonProxy.java
src/chemicraft/tileentity/TileEntityDecompositionTable.java
src/chemicraft/util/MathHelperPlus.java