• R/O
  • HTTP
  • SSH
  • HTTPS

ChemiCraftNext: List of commits


RSS
Rev. Tiempo Autor
5f126c4 2013-02-11 17:34:28 ponkotate

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

Conflicts:
common/pcc/chemicraft/ChemiCraft.java

17348fa 2013-02-11 17:31:26 ponkotate

とりあえずコミット

366810d 2013-02-11 17:06:39 mozipi

鉱石生成がAPIの処理に入っていなかったのを修正

e196afb 2013-02-11 15:38:05 ponkotate

修正
・鉱石が集中して生成される不具合を修正
・確率用メソッド修正

04401cf 2013-02-11 14:12:03 ponkotate

修正・変更
マージ時に起きたエラーを修正
APIのgetInstance()をinstance()変更

035b20b 2013-02-11 13:42:44 ponkotate

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

Conflicts:
common/chemicraft/inventory/InventoryElectrolysisTableFuel.java
common/chemicraft/inventory/InventoryElectrolysisTableMaterial.java
common/chemicraft/inventory/InventoryElectrolysisTableResult.java
common/pcc/chemicraft/ChemiCraft.java
common/pcc/chemicraft/ChemiCraftAPI.java
common/pcc/chemicraft/block/BlockChemicalCombinationTable.java
common/pcc/chemicraft/block/BlockChemicalCraftingTable.java
common/pcc/chemicraft/block/BlockElectrolysisTable.java
common/pcc/chemicraft/block/BlockPyrolysisTable.java
common/pcc/chemicraft/block/BlockToolAndWeaponCraftingTable.java
common/pcc/chemicraft/client/ClientProxy.java
common/pcc/chemicraft/compounds/CompoundWater.java
common/pcc/chemicraft/container/ContainerChemicalCombinationTable.java
common/pcc/chemicraft/container/ContainerChemicalCraftingTable.java
common/pcc/chemicraft/container/ContainerElectrolysisTable.java
common/pcc/chemicraft/container/ContainerPyrolysisTable.java
common/pcc/chemicraft/container/ContainerToolAndWeaponCraftingTable.java
common/pcc/chemicraft/debug/CompoundHandlerTest.java
common/pcc/chemicraft/gui/GuiChemicalCombinationTable.java
common/pcc/chemicraft/gui/GuiChemicalCraftingTable.java
common/pcc/chemicraft/gui/GuiElectrolysisTable.java
common/pcc/chemicraft/gui/GuiPyrolysisTable.java
common/pcc/chemicraft/gui/GuiToolAndWeaponCraftingTable.java
common/pcc/chemicraft/inventory/InventoryElectrolysisFuel.java
common/pcc/chemicraft/inventory/InventoryElectrolysisMaterial.java
common/pcc/chemicraft/inventory/InventoryElectrolysisResult.java
common/pcc/chemicraft/inventory/InventoryElectrolysisTableFuel.java
common/pcc/chemicraft/inventory/InventoryElectrolysisTableMaterial.java
common/pcc/chemicraft/inventory/InventoryElectrolysisTableResult.java
common/pcc/chemicraft/item/ItemAtomInfoContainer.java
common/pcc/chemicraft/item/ItemAtoms.java
common/pcc/chemicraft/item/ItemAtomsGrenade.java
common/pcc/chemicraft/item/ItemCompounds.java
common/pcc/chemicraft/item/ItemGasCollectingBottle.java
common/pcc/chemicraft/render/RenderAtomsGrenade.java
common/pcc/chemicraft/slot/SlotChemicalCombinationTableMaterial.java
common/pcc/chemicraft/system/ChemiCraftCraftingManager.java
common/pcc/chemicraft/system/CommonProxy.java
common/pcc/chemicraft/system/PacketHandler.java
common/pcc/chemicraft/tileentity/TileEntityChemicalCombinationTable.java
common/pcc/chemicraft/tileentity/TileEntityChemicalCraftingTable.java
common/pcc/chemicraft/tileentity/TileEntityElectrolysisTable.java
common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java
common/pcc/chemicraft/util/Auxiliary.java
common/pcc/chemicraft/util/CreativeTabAtoms.java
common/pcc/chemicraft/util/MaterialRecipe.java
common/pcc/chemicraft/util/MathHelperPlus.java
common/pcc/chemicraft/util/NBTRecipeGrenade.java

6fddb8a 2013-02-11 13:32:06 ponkotate

修正・変更
・パッケージ名の変更
・WorldGenAtomsOreクラス追加

a5e4a5c 2013-02-11 12:03:53 mozipi

いろいろ修正

4e7f1ca 2013-02-11 11:28:17 mozipi

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

Conflicts:
common/chemicraft/inventory/InventoryElectrolysisFuel.java
common/chemicraft/inventory/InventoryElectrolysisMaterial.java
common/chemicraft/inventory/InventoryElectrolysisResult.java
common/chemicraft/inventory/InventoryElectrolysisTableFuel.java
common/chemicraft/inventory/InventoryElectrolysisTableMaterial.java
common/chemicraft/inventory/InventoryElectrolysisTableResult.java
common/pcc/chemicraft/ChemiCraft.java
common/pcc/chemicraft/ChemiCraftAPI.java
common/pcc/chemicraft/block/BlockElectrolysisTable.java
common/pcc/chemicraft/compounds/CompoundDebug.java
common/pcc/chemicraft/container/ContainerElectrolysis.java
common/pcc/chemicraft/container/ContainerElectrolysisTable.java
common/pcc/chemicraft/container/ContainerToolAndWeaponCraftingTable.java
common/pcc/chemicraft/inventory/InventoryElectrolysisFuel.java
common/pcc/chemicraft/inventory/InventoryElectrolysisMaterial.java
common/pcc/chemicraft/inventory/InventoryElectrolysisResult.java
common/pcc/chemicraft/system/CommonProxy.java
common/pcc/chemicraft/system/PacketHandler.java
common/pcc/chemicraft/tileentity/TileEntityElectrolysisTable.java
common/pcc/chemicraft/tileentity/TileEntityPyrolysisTable.java
common/pcc/chemicraft/tileentity/TileEntityToolAndWeaponCraftingTable.java

e9b7d6c 2013-02-11 11:07:13 mozipi

パッケージをpcc.chemicraft.*に変更

b8902d3 2013-02-10 18:13:44 ponkotate

修正・変更
テクスチャの修正
分解機等のテクスチャをthis.blockIndexInTextureを使うように変更
電解機(未完)を再度追加
電解機のクラス名に変更有り

ff0d40f 2013-02-04 22:13:50 yykimoto

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

c5e2dee 2013-02-04 22:13:20 yykimoto

電解器テクスチャ入荷

3924dbb 2013-02-04 19:42:11 mozipi

ChemiCraft.java修正

e2705a6 2013-02-04 18:44:37 mozipi

競合修正

8c2e53d 2013-02-04 18:29:19 mozipi

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

Conflicts:
common/chemicraft/ChemiCraft.java

2ab5cb3 2013-02-04 18:16:07 mozipi

競合確認

888d7cd 2013-02-03 23:21:09 ponkotate

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

Conflicts:
common/chemicraft/block/BlockElectrolysisTable.java
common/chemicraft/container/ContainerElectrolysis.java

9d13c8b 2013-02-03 23:15:26 ponkotate

修正

87681a0 2013-02-03 19:19:43 ponkotate

更新&修正
・電気分解機(未完成)実装
・テクスチャ用フィールドを定数化(それに伴ってフィールド大文字化)

4b8c100 2013-02-03 18:50:44 ponkotate

ミスってたので再うp

f350567 2013-02-03 18:40:26 ponkotate

完全修正。
masterに戻せるかな?w

3d40ac3 2013-02-03 18:33:29 ponkotate

修正用

3e197ec 2013-02-03 18:30:56 ponkotate

ソース修正用ブランチ

9ce031d 2013-02-03 17:29:31 ponkotate

パッケージ修正。

7c305f6 2013-01-21 23:28:32 mozipi

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

fed248f 2013-01-21 23:00:16 mozipi

熱分解台できたのでpush
ついでにデバッグ用のwindow開くようにした

cbf016a 2013-01-17 20:18:55 inaka

まずそうなので削除
後でパスワードかえておく

437f858 2013-01-15 21:56:03 yykimoto

電池のテクスチャを追加

483cb8f 2013-01-13 17:55:50 ponkotate

commonとsrc統合。電解機中途半端なので注意。

Show on old repository browser