Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
# Conflicts: # src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java
This commit is contained in:
commit
d5ce5cba04
3 changed files with 16 additions and 19 deletions
|
@ -53,7 +53,7 @@ public class IronAlloySmelterRecipeHandler extends GenericRecipeHander implement
|
|||
|
||||
@Override
|
||||
public String getRecipeName() {
|
||||
return Reference.ironalloySmelteRecipe;
|
||||
return Reference.alloySmelteRecipe;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue