OSDN Git Service

Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
authorponkotate <ponkotate@users.sourceforge.jp>
Sun, 7 Apr 2013 07:21:46 +0000 (16:21 +0900)
committerponkotate <ponkotate@users.sourceforge.jp>
Sun, 7 Apr 2013 07:21:46 +0000 (16:21 +0900)
commit91359869cc19297302b40ad13be82adab863ef8d
tree08854ac1bb8034842f4faabbc27487242ffdc99e
parent18deec05d3263a1a9441c7a09da4404a6180f2c4
parent96715da9345814c21a7f13a550ae48a537abd784
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft

Conflicts:
common/pcc/chemicraft/base/ChemiCraftBaseAPI.java
common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java
common/pcc/chemicraft/base/ChemiCraftBase.java
common/pcc/chemicraft/base/ore/BlockAtomOres.java
common/pcc/chemicraft/core/ChemiCraftCore.java