OSDN Git Service
mozipi [Sun, 31 Mar 2013 03:01:12 +0000 (12:01 +0900)]
素材制作台修正
mozipi [Sun, 31 Mar 2013 02:43:28 +0000 (11:43 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
ponkotate [Sun, 31 Mar 2013 02:42:58 +0000 (11:42 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
ponkotate [Sun, 31 Mar 2013 02:42:38 +0000 (11:42 +0900)]
修正・変更
・バグ発見
mozipi [Sun, 31 Mar 2013 02:40:16 +0000 (11:40 +0900)]
I with OWATA
mozipi [Sun, 31 Mar 2013 02:08:21 +0000 (11:08 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
mozipi [Sun, 31 Mar 2013 02:08:09 +0000 (11:08 +0900)]
コミットしろやっていわれたので
ponkotate [Sun, 31 Mar 2013 02:07:25 +0000 (11:07 +0900)]
修正・変更
・手榴弾の修正
・Formulaクラス修正
mozipi [Sun, 31 Mar 2013 00:36:41 +0000 (09:36 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
ponkotate [Sun, 31 Mar 2013 00:35:57 +0000 (09:35 +0900)]
修正・変更
・バグ潰し
mozipi [Sun, 31 Mar 2013 00:34:04 +0000 (09:34 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
ponkotate [Sun, 31 Mar 2013 00:22:10 +0000 (09:22 +0900)]
修正・変更
・バグ潰し
mozipi [Sun, 31 Mar 2013 00:16:41 +0000 (09:16 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
Conflicts:
common/pcc/chemicraft/base/ChemiCraftRegisterChemicalRecipe.java
ponkotate [Sun, 31 Mar 2013 00:05:30 +0000 (09:05 +0900)]
修正・変更
・鉱石バグがあるので注意
mozipi [Sun, 31 Mar 2013 00:01:56 +0000 (09:01 +0900)]
(*´ω｀*)
ponkotate [Sat, 30 Mar 2013 12:32:12 +0000 (21:32 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
Conflicts:
common/pcc/chemicraft/core/ChemiCraftCore.java
ponkotate [Sat, 30 Mar 2013 12:31:13 +0000 (21:31 +0900)]
修正・変更
・電池修正
mozipi [Sat, 30 Mar 2013 10:59:08 +0000 (19:59 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
mozipi [Sat, 30 Mar 2013 10:58:35 +0000 (19:58 +0900)]
tc
ponkotate [Sat, 30 Mar 2013 10:55:41 +0000 (19:55 +0900)]
修正・変更
・AtomInfoに気体等の判定メソッド追加
・鉱石完全収録
mozipi [Fri, 29 Mar 2013 05:34:38 +0000 (14:34 +0900)]
名前つけできるようにした
ponkotate [Fri, 29 Mar 2013 04:47:28 +0000 (13:47 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
ponkotate [Fri, 29 Mar 2013 04:46:55 +0000 (13:46 +0900)]
修正・更新
・バグ潰し
mozipi [Fri, 29 Mar 2013 03:13:46 +0000 (12:13 +0900)]
Merge branch 'master' of git://git.sourceforge.jp/gitroot/chemicraft/chemicraft
mozipi [Fri, 29 Mar 2013 03:13:40 +0000 (12:13 +0900)]
www
ponkotate [Fri, 29 Mar 2013 03:10:40 +0000 (12:10 +0900)]
修正・変更
・鉱石名が付かない等のバグを修正。
ponkotate [Fri, 29 Mar 2013 02:01:35 +0000 (11:01 +0900)]
要チェック!!!
・大幅な仕様変更
(Core・Base分け)
mozipi [Wed, 27 Mar 2013 03:53:12 +0000 (12:53 +0900)]
tc
mozipi [Tue, 26 Mar 2013 05:05:06 +0000 (14:05 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft
Conflicts:
common/pcc/chemicraft/util/Auxiliary.java
mozipi [Tue, 26 Mar 2013 05:02:58 +0000 (14:02 +0900)]
tc
ponkotate [Tue, 26 Mar 2013 04:43:05 +0000 (13:43 +0900)]
修正・変更
・鉱石の仕様変更
・Formulaクラスを作成
・1.5移行用クラスOldItem,OldItemFoodを作成
mozipi [Thu, 21 Mar 2013 17:38:26 +0000 (02:38 +0900)]
壊れてたので再度up
mozipi [Thu, 21 Mar 2013 17:26:58 +0000 (02:26 +0900)]
音声修正
mozipi [Thu, 21 Mar 2013 17:16:27 +0000 (02:16 +0900)]
RaditionGunのSE追加。Credit表記も
mozipi [Wed, 20 Mar 2013 04:18:56 +0000 (13:18 +0900)]
大規模なソース仕様変更
mozipi [Wed, 20 Mar 2013 03:13:59 +0000 (12:13 +0900)]
tc
ponkotate [Sun, 10 Mar 2013 07:22:31 +0000 (16:22 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
ponkotate [Sun, 10 Mar 2013 07:22:08 +0000 (16:22 +0900)]
修正・変更
電解台・熱解台のShiftクリック対応。
化合台のドロップ処理。(多分完成？？)
mozipi [Sun, 10 Mar 2013 06:48:58 +0000 (15:48 +0900)]
放射線銃完成
ponkotate [Sun, 10 Mar 2013 01:00:14 +0000 (10:00 +0900)]
修正・変更
鉱石分解レシピ処理を修正。
鉱石追加。
mozipi [Sat, 9 Mar 2013 09:37:28 +0000 (18:37 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft
mozipi [Sat, 9 Mar 2013 09:22:45 +0000 (18:22 +0900)]
(・∀・)
mozipi [Sat, 9 Mar 2013 09:22:45 +0000 (18:22 +0900)]
(・∀・)
mozipi [Sat, 9 Mar 2013 09:20:22 +0000 (18:20 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft
mozipi [Sat, 9 Mar 2013 09:20:06 +0000 (18:20 +0900)]
(・∀・)
inaka [Sat, 9 Mar 2013 07:24:12 +0000 (16:24 +0900)]
ライセンス文の修正
ponkotate [Sat, 9 Mar 2013 01:38:21 +0000 (10:38 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
Conflicts:
common/pcc/chemicraft/ChemiCraftAPI.java
ponkotate [Sat, 9 Mar 2013 01:35:37 +0000 (10:35 +0900)]
修正・変更
鉱石の仕様変更。
mozipi [Sat, 9 Mar 2013 01:33:40 +0000 (10:33 +0900)]
Merge branch '繧｢繧､繝・Β邉ｻ邨ｱ霑ｽ蜉
'
Conflicts:
common/pcc/chemicraft/ChemiCraft.java
common/pcc/chemicraft/item/ItemDust.java
mozipi [Sat, 9 Mar 2013 01:32:09 +0000 (10:32 +0900)]
マージ用にコミット
mozipi [Thu, 7 Mar 2013 11:23:26 +0000 (20:23 +0900)]
粉塵完成版。チケット完了にしておきます
mozipi [Thu, 7 Mar 2013 10:40:49 +0000 (19:40 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft
mozipi [Thu, 7 Mar 2013 10:40:19 +0000 (19:40 +0900)]
くるったのでtc
mozipi [Thu, 7 Mar 2013 10:29:59 +0000 (19:29 +0900)]
粉塵実装。デバッグよろしくお願いします
ponkotate [Wed, 6 Mar 2013 09:10:11 +0000 (18:10 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
ponkotate [Wed, 6 Mar 2013 09:09:48 +0000 (18:09 +0900)]
修正・変更
・集気ビンの修正
・鉱石の追加
mozipi [Wed, 6 Mar 2013 08:17:49 +0000 (17:17 +0900)]
鉱石の生成頻度をEnumでも指定できるように変更
mozipi [Wed, 6 Mar 2013 08:15:49 +0000 (17:15 +0900)]
鉱石の生成頻度の列挙追加
mozipi [Tue, 5 Mar 2013 00:41:56 +0000 (09:41 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft into Change(Sys)
mozipi [Tue, 5 Mar 2013 00:41:31 +0000 (09:41 +0900)]
Merge branch 'Change(Sys)' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft into Change(Sys)
mozipi [Mon, 4 Mar 2013 11:34:06 +0000 (20:34 +0900)]
Merge branch 'Change(Sys)' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft into Change(Sys)
mozipi [Mon, 4 Mar 2013 11:34:06 +0000 (20:34 +0900)]
Merge branch 'Change(Sys)' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft into Change(Sys)
mozipi [Mon, 4 Mar 2013 11:30:18 +0000 (20:30 +0900)]
処理をスレッド化した(ノリで
mozipi [Mon, 4 Mar 2013 11:30:18 +0000 (20:30 +0900)]
処理をスレッド化した(ノリで
ponkotate [Sun, 3 Mar 2013 00:27:25 +0000 (09:27 +0900)]
修正・変更
鉱石分解時の元素を修正
ponkotate [Sat, 2 Mar 2013 10:02:09 +0000 (19:02 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
ponkotate [Sat, 2 Mar 2013 10:01:36 +0000 (19:01 +0900)]
修正・変更
・電解台
・鉱石の仕様変更
mozipi [Sat, 23 Feb 2013 10:14:03 +0000 (19:14 +0900)]
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
mozipi [Sat, 23 Feb 2013 10:10:51 +0000 (19:10 +0900)]
?
mozipi [Sat, 23 Feb 2013 10:10:14 +0000 (19:10 +0900)]
修正
ponkotate [Sat, 23 Feb 2013 09:03:21 +0000 (18:03 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
Conflicts:
common/pcc/chemicraft/ChemiCraft.java
ponkotate [Sat, 23 Feb 2013 08:56:16 +0000 (17:56 +0900)]
修正・変更
mozipiｓ頑張って!!
yykimoto [Sat, 23 Feb 2013 06:04:26 +0000 (15:04 +0900)]
yykimoto/sanboru/yakinikutation.java追加
Signed-off-by: yykimoto <y_kimoto_live@yahoo.co.jp>
mozipi [Sat, 23 Feb 2013 01:18:12 +0000 (10:18 +0900)]
tc
ponkotate [Sun, 17 Feb 2013 15:51:04 +0000 (00:51 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
Conflicts:
common/pcc/chemicraft/ChemiCraft.java
ponkotate [Sun, 17 Feb 2013 15:43:59 +0000 (00:43 +0900)]
修正・更新
・CreativeTab「ChemiCraftAtomsOre」を追加。
注意!!これに伴って、CreativeTabAtomsが*.utilから*.creativeTabに変更されてます。
・17種の鉱石とそのテクスチャを追加。
・鉱石の生成方法を修正。
mozipi [Sun, 17 Feb 2013 15:37:37 +0000 (00:37 +0900)]
とc
mozipi [Sun, 17 Feb 2013 09:17:40 +0000 (18:17 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft
Conflicts:
common/pcc/chemicraft/ChemiCraft.java
mozipi [Sun, 17 Feb 2013 00:14:17 +0000 (09:14 +0900)]
とりあえずコミット
ponkotate [Sat, 16 Feb 2013 17:43:41 +0000 (02:43 +0900)]
鉱石追加用クラス・API等を追加or更新
・addAtomsOre()で任意の鉱石を追加。
・鉱石用テクスチャ追加(ホントは前からあったりしてｗ)。
ponkotate [Mon, 11 Feb 2013 08:34:28 +0000 (17:34 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
Conflicts:
common/pcc/chemicraft/ChemiCraft.java
ponkotate [Mon, 11 Feb 2013 08:31:26 +0000 (17:31 +0900)]
とりあえずコミット
mozipi [Mon, 11 Feb 2013 08:06:39 +0000 (17:06 +0900)]
鉱石生成がAPIの処理に入っていなかったのを修正
ponkotate [Mon, 11 Feb 2013 06:38:05 +0000 (15:38 +0900)]
修正
・鉱石が集中して生成される不具合を修正
・確率用メソッド修正
ponkotate [Mon, 11 Feb 2013 05:12:03 +0000 (14:12 +0900)]
修正・変更
マージ時に起きたエラーを修正
APIのgetInstance()をinstance()変更
ponkotate [Mon, 11 Feb 2013 04:42:44 +0000 (13:42 +0900)]
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
ponkotate [Mon, 11 Feb 2013 04:32:06 +0000 (13:32 +0900)]
修正・変更
・パッケージ名の変更
・WorldGenAtomsOreクラス追加
mozipi [Mon, 11 Feb 2013 03:03:53 +0000 (12:03 +0900)]
いろいろ修正
mozipi [Mon, 11 Feb 2013 02:28:17 +0000 (11:28 +0900)]
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
mozipi [Mon, 11 Feb 2013 02:07:13 +0000 (11:07 +0900)]
パッケージをpcc.chemicraft.*に変更
ponkotate [Sun, 10 Feb 2013 09:13:44 +0000 (18:13 +0900)]
修正・変更
テクスチャの修正
分解機等のテクスチャをthis.blockIndexInTextureを使うように変更
電解機(未完)を再度追加
電解機のクラス名に変更有り
yykimoto [Mon, 4 Feb 2013 13:13:50 +0000 (22:13 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
yykimoto [Mon, 4 Feb 2013 13:13:20 +0000 (22:13 +0900)]
電解器テクスチャ入荷
mozipi [Mon, 4 Feb 2013 10:42:11 +0000 (19:42 +0900)]
ChemiCraft.java修正
mozipi [Mon, 4 Feb 2013 09:44:37 +0000 (18:44 +0900)]
競合修正
mozipi [Mon, 4 Feb 2013 09:29:19 +0000 (18:29 +0900)]
Merge branch 'master' of git.sourceforge.jp:/gitroot/chemicraft/chemicraft
Conflicts:
common/chemicraft/ChemiCraft.java
mozipi [Mon, 4 Feb 2013 09:16:07 +0000 (18:16 +0900)]
競合確認
ponkotate [Sun, 3 Feb 2013 14:21:09 +0000 (23:21 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
Conflicts:
common/chemicraft/block/BlockElectrolysisTable.java
common/chemicraft/container/ContainerElectrolysis.java
ponkotate [Sun, 3 Feb 2013 14:15:26 +0000 (23:15 +0900)]
修正
ponkotate [Sun, 3 Feb 2013 10:19:43 +0000 (19:19 +0900)]
更新&修正
・電気分解機(未完成)実装
・テクスチャ用フィールドを定数化(それに伴ってフィールド大文字化)
OSDN Git Service
