OSDN Git Service
ponkotate [Wed, 17 Apr 2013 16:00:00 +0000 (01:00 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
Conflicts:
common/pcc/chemicraft/base/ChemiCraftBase.java
common/pcc/chemicraft/base/ChemiCraftRegisterItem.java
ponkotate [Wed, 17 Apr 2013 15:57:06 +0000 (00:57 +0900)]
修正・変更
・名前の修正。
・インゴット未完。
・Formula整形
mozipi [Wed, 17 Apr 2013 10:27:23 +0000 (19:27 +0900)]
tc
ponkotate [Mon, 15 Apr 2013 10:30:25 +0000 (19:30 +0900)]
修正・変更
・テクスチャ名を変更
ponkotate [Mon, 15 Apr 2013 10:27:19 +0000 (19:27 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
ponkotate [Mon, 15 Apr 2013 10:26:56 +0000 (19:26 +0900)]
修正・変更
・元素仕様変更&テクスチャ移行完了
・鉱石生成処理を修正
・Formulaクラスの修正
yykimoto [Mon, 15 Apr 2013 10:04:40 +0000 (19:04 +0900)]
核制御剤、鉱石検索機のテクスチャ追加
yykimoto [Sun, 14 Apr 2013 09:15:23 +0000 (18:15 +0900)]
ms。再び
yykimoto [Sun, 14 Apr 2013 09:09:23 +0000 (18:09 +0900)]
msした
yykimoto [Sun, 14 Apr 2013 08:36:03 +0000 (17:36 +0900)]
texture 分割
mozipi [Fri, 12 Apr 2013 14:03:41 +0000 (23:03 +0900)]
Formulaクラスのテストケース作った
mozipi [Fri, 12 Apr 2013 12:48:06 +0000 (21:48 +0900)]
tc
ponkotate [Fri, 12 Apr 2013 11:26:06 +0000 (20:26 +0900)]
修正・変更
・名前のつづりがあっていなかったので修正
・鉱石テクスチャの実装(ランタノイド・アクチノイドは未実装)
・電解台のインベントリ名を修正
・Slotの修正
・Formulaクラスの修正
ponkotate [Sun, 7 Apr 2013 08:52:23 +0000 (17:52 +0900)]
修正・変更
・追加アイテムテクスチャの分割
(元素、化合物は未分割)
・類似Slotクラスの統合
・素材製作台のShift対応・GUI閉扉時ドロップ対応
ponkotate [Sun, 7 Apr 2013 07:21:46 +0000 (16:21 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
Conflicts:
common/pcc/chemicraft/base/ChemiCraftBaseAPI.java
common/pcc/chemicraft/base/ChemiCraftRegisterBaseRecipe.java
ponkotate [Sun, 7 Apr 2013 07:17:11 +0000 (16:17 +0900)]
修正・変更
・鉱石修正
・テクスチャ修正
mozipi [Sat, 6 Apr 2013 06:18:13 +0000 (15:18 +0900)]
作物のテクスチャごねごねの仕様書ついか
mozipi [Thu, 4 Apr 2013 03:59:56 +0000 (12:59 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
mozipi [Thu, 4 Apr 2013 03:59:13 +0000 (12:59 +0900)]
tc
ponkotate [Thu, 4 Apr 2013 03:58:34 +0000 (12:58 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
ponkotate [Thu, 4 Apr 2013 03:58:09 +0000 (12:58 +0900)]
修正・変更
・鉱石WIPテクスチャを追加。
mozipi [Wed, 3 Apr 2013 10:37:47 +0000 (19:37 +0900)]
とうもろこし
mozipi [Tue, 2 Apr 2013 16:01:34 +0000 (01:01 +0900)]
エラー大半修正
mozipi [Tue, 2 Apr 2013 04:40:51 +0000 (13:40 +0900)]
(・∀・)
mozipi [Tue, 2 Apr 2013 03:53:58 +0000 (12:53 +0900)]
細かい修正
mozipi [Tue, 2 Apr 2013 03:51:28 +0000 (12:51 +0900)]
ファイルパス色々変更。
仕様書関連をすべて仕様書フォルダへ。
1.5からのTexture仕様変更について.odtを/仕様書/に追加。
現在エラー修正中なので、エラー吐きまくってます。
mozipi [Mon, 1 Apr 2013 11:09:43 +0000 (20:09 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
mozipi [Mon, 1 Apr 2013 11:09:26 +0000 (20:09 +0900)]
いろいろした
yykimoto [Mon, 1 Apr 2013 10:32:04 +0000 (19:32 +0900)]
texture色々
Signed-off-by: yykimoto <y_kimoto_live@yahoo.oc.jp>
mozipi [Sun, 31 Mar 2013 06:53:25 +0000 (15:53 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
mozipi [Sun, 31 Mar 2013 06:52:32 +0000 (15:52 +0900)]
FinalCommit(V1.0.0Alpha
ponkotate [Sun, 31 Mar 2013 06:01:26 +0000 (15:01 +0900)]
修正・変更
・放射性同位体完成
mozipi [Sun, 31 Mar 2013 05:02:40 +0000 (14:02 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
mozipi [Sun, 31 Mar 2013 05:02:25 +0000 (14:02 +0900)]
>>><<<
ponkotate [Sun, 31 Mar 2013 05:01:33 +0000 (14:01 +0900)]
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
ponkotate [Sun, 31 Mar 2013 05:01:09 +0000 (14:01 +0900)]
修正・変更
・バグ潰し
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)]
処理をスレッド化した(ノリで