Merge remote-tracking branch 'origin/1.12' into 1.12
This commit is contained in:
commit
d267bb4e09
2 changed files with 3 additions and 3 deletions
|
@ -30,10 +30,10 @@ import techreborn.lib.ModInfo;
|
|||
|
||||
@RebornRegistry(modID = ModInfo.MOD_ID)
|
||||
public class ConfigTechReborn {
|
||||
@ConfigRegistry(config = "recipes", category = "railcraft", key = "disableRailcraftNugget", comment = "When true TechReborn will remove Railcrafts Iron Nugget to steel nuggert recipe.")
|
||||
@ConfigRegistry(config = "recipes", category = "railcraft", key = "disableRailcraftNugget", comment = "When true TechReborn will remove Railcraft's Iron Nugget to steel nugget recipe.")
|
||||
public static boolean disableRailcraftSteelNuggetRecipe = false;
|
||||
|
||||
@ConfigRegistry(config = "recipes", category = "ic2", key = "deduplicate", comment = "Changes a lot of reipes and hides blocks to intrgrade TechReborn into IC2")
|
||||
@ConfigRegistry(config = "recipes", category = "ic2", key = "deduplicate", comment = "Changes a lot of recipes and hides blocks to integrate TechReborn into IC2")
|
||||
public static boolean REMOVE_DUPLICATES = false;
|
||||
@ConfigRegistry(config = "client", category = "hud", key = "showChargeHud", comment = "Show the charge hud")
|
||||
public static boolean ShowChargeHud = true;
|
||||
|
|
|
@ -434,7 +434,7 @@ item.techreborn.nuggets.tin.name=Tin Nugget
|
|||
item.techreborn.nuggets.titanium.name=Titanium Nugget
|
||||
item.techreborn.nuggets.tungsten.name=Tungsten Nugget
|
||||
item.techreborn.nuggets.tungstensteel.name=Tungstensteel Nugget
|
||||
item.techreborn.nuggets.hot_tungstensteel.name=Hot Tungstensteeel Nugget
|
||||
item.techreborn.nuggets.hot_tungstensteel.name=Hot Tungstensteel Nugget
|
||||
item.techreborn.nuggets.zinc.name=Zinc Nugget
|
||||
item.techreborn.nuggets.refined_iron.name=Refined Iron Nugget
|
||||
item.techreborn.nuggets.diamond.name=Diamond Nugget
|
||||
|
|
Loading…
Reference in a new issue