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
|
@ -4,7 +4,6 @@ import net.minecraft.util.StatCollector;
|
|||
|
||||
public class Reference {
|
||||
public static String alloySmelteRecipe = StatCollector.translateToLocal("techreborn.recipe.alloysmelter");
|
||||
public static String ironalloySmelteRecipe = StatCollector.translateToLocal("techreborn.recipe.ironalloysmelter");
|
||||
public static String assemblingMachineRecipe = StatCollector.translateToLocal("techreborn.recipe.assemblingmachine");
|
||||
public static String blastFurnaceRecipe = StatCollector.translateToLocal("techreborn.recipe.blastfurnace");
|
||||
public static String centrifugeRecipe = StatCollector.translateToLocal("techreborn.recipe.centrifuge");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue