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
/
block
/
BlockChemicalCombinationTable.java
diff --git
a/common/chemicraft/block/BlockChemicalCombinationTable.java
b/common/chemicraft/block/BlockChemicalCombinationTable.java
index
bf9ba58
..
3f8340a
100644
(file)
--- a/
common/chemicraft/block/BlockChemicalCombinationTable.java
+++ b/
common/chemicraft/block/BlockChemicalCombinationTable.java
@@
-25,7
+25,7
@@
public class BlockChemicalCombinationTable extends BlockContainer {
@Override
public String getTextureFile() {
- return ChemiCraft.instance.BLOCK
CHEMICALCRAFTINGTABLE
TEXTURE;
+ return ChemiCraft.instance.BLOCK
_CHEMICALCRAFTING_TABLE_
TEXTURE;
}