OSDN Git Service
(root)
/
chemicraft
/
chemicraft.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
競合修正
[chemicraft/chemicraft.git]
/
common
/
chemicraft
/
item
/
ItemCompounds.java
diff --git
a/common/chemicraft/item/ItemCompounds.java
b/common/chemicraft/item/ItemCompounds.java
index
18df605
..
17d6514
100644
(file)
--- a/
common/chemicraft/item/ItemCompounds.java
+++ b/
common/chemicraft/item/ItemCompounds.java
@@
-79,7
+79,7
@@
public class ItemCompounds extends Item {
@Override
public String getTextureFile(){
- return ChemiCraft.instance.
itemCompoundsTexture
;
+ return ChemiCraft.instance.
ITEM_COMPOUNDS_TEXTURE
;
}