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
/
BlockPyrolysisTable.java
diff --git
a/common/chemicraft/block/BlockPyrolysisTable.java
b/common/chemicraft/block/BlockPyrolysisTable.java
index
728545f
..
d24cc1a
100644
(file)
--- a/
common/chemicraft/block/BlockPyrolysisTable.java
+++ b/
common/chemicraft/block/BlockPyrolysisTable.java
@@
-26,7
+26,7
@@
public class BlockPyrolysisTable extends BlockContainer {
@Override
public String getTextureFile(){
- return ChemiCraft.instance.
blockChemicalCraftingTableTexture
;
+ return ChemiCraft.instance.
BLOCK_CHEMICALCRAFTING_TABLE_TEXTURE
;
}