Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Typo from Babbit to Babbitt #3825

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/gtPlusPlus/core/item/ModItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ public static void init() {
MaterialGenerator.generate(MaterialsAlloy.ARCANITE);
MaterialGenerator.generate(MaterialsAlloy.OCTIRON);

MaterialGenerator.generate(MaterialsAlloy.BABBIT_ALLOY, false);
MaterialGenerator.generate(MaterialsAlloy.BABBITT_ALLOY, false);
MaterialGenerator.generate(MaterialsAlloy.BLACK_TITANIUM, false);
MaterialGenerator.generate(MaterialsAlloy.INDALLOY_140, false, false);

Expand Down Expand Up @@ -887,7 +887,7 @@ public static void registerCustomMaterialComponents() {
MaterialUtils
.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsElements.getInstance().ZIRCONIUM);
MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.LEAGRISIUM);
MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.BABBIT_ALLOY);
MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.BABBITT_ALLOY);
MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.KOBOLDITE);
MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.HG1223);
MaterialUtils.generateComponentAndAssignToAMaterial(ComponentTypes.FINEWIRE, MaterialsAlloy.QUANTUM);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/gtPlusPlus/core/material/MaterialsAlloy.java
Original file line number Diff line number Diff line change
Expand Up @@ -835,8 +835,8 @@ public final class MaterialsAlloy {
new MaterialStack(MaterialsElements.getInstance().NIOBIUM, 2),
new MaterialStack(MaterialsElements.getInstance().ARGON, 5));

public static final Material BABBIT_ALLOY = new Material(
"Babbit Alloy", // Material Name
public static final Material BABBITT_ALLOY = new Material(
"Babbitt Alloy", // Material Name
mak8427 marked this conversation as resolved.
Show resolved Hide resolved
MaterialState.SOLID, // State
null, // Material Colour
268, // Melting Point in C
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ private static void assemblyLineRecipes() {
CI.getTieredFluid(8, 144 * 32),
CI.getAlternativeTieredFluid(7, 144 * 16),
CI.getTertiaryTieredFluid(7, 144 * 16),
MaterialsAlloy.BABBIT_ALLOY.getFluidStack(128 * 144))
MaterialsAlloy.BABBITT_ALLOY.getFluidStack(128 * 144))
.itemOutputs(GregtechItemList.Hatch_Input_TurbineHousing.get(4))
.eut(TierEU.RECIPE_UV)
.duration(2 * HOURS)
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ private static void multiForgeHammer() {
GTModHandler.addCraftingRecipe(
GregtechItemList.Casing_IndustrialForgeHammer.get(1),
CI.bitsd,
new Object[] { "IBI", "HCH", "IHI", 'I', CI.getPlate(4, 1), 'B', MaterialsAlloy.BABBIT_ALLOY.getPlate(1),
new Object[] { "IBI", "HCH", "IHI", 'I', CI.getPlate(4, 1), 'B', MaterialsAlloy.BABBITT_ALLOY.getPlate(1),
'C', ItemList.Casing_HeatProof.get(1), 'H', MaterialsAlloy.HASTELLOY_X.getRod(1) });
}

Expand Down Expand Up @@ -365,7 +365,7 @@ private static void multiMolecularTransformer() {
CI.getTieredComponent(OrePrefixes.wireGt16, 5, 32),
MaterialsAlloy.ZERON_100.getFrameBox(4),
MaterialsAlloy.ZIRCONIUM_CARBIDE.getPlateDouble(32),
MaterialsAlloy.BABBIT_ALLOY.getPlate(64),
MaterialsAlloy.BABBITT_ALLOY.getPlate(64),
MaterialsAlloy.LEAGRISIUM.getGear(8),
new Object[] { CI.getTieredCircuitOreDictName(4), 64 },
new Object[] { CI.getTieredCircuitOreDictName(5), 32 },
Expand Down Expand Up @@ -664,7 +664,7 @@ private static void multiElementalDuplicator() {
CI.getTieredFluid(7, 144 * 32),
CI.getAlternativeTieredFluid(6, 144 * 16),
CI.getTertiaryTieredFluid(6, 144 * 16),
MaterialsAlloy.BABBIT_ALLOY.getFluidStack(128 * 144))
MaterialsAlloy.BABBITT_ALLOY.getFluidStack(128 * 144))
.itemOutputs(GregtechItemList.Controller_ElementalDuplicator.get(1))
.eut(TierEU.RECIPE_ZPM)
.duration(10 * MINUTES)
Expand All @@ -688,7 +688,7 @@ private static void multiElementalDuplicator() {
CI.getTieredFluid(6, 144 * 16),
CI.getAlternativeTieredFluid(5, 144 * 8),
CI.getTertiaryTieredFluid(5, 144 * 8),
MaterialsAlloy.BABBIT_ALLOY.getFluidStack(64 * 144))
MaterialsAlloy.BABBITT_ALLOY.getFluidStack(64 * 144))
.itemOutputs(GregtechItemList.Hatch_Input_Elemental_Duplicator.get(1))
.eut(TierEU.RECIPE_LuV)
.duration(2 * HOURS)
Expand All @@ -712,7 +712,7 @@ private static void multiElementalDuplicator() {
CI.getTieredFluid(5, 144 * 16),
CI.getAlternativeTieredFluid(4, 144 * 8),
CI.getTertiaryTieredFluid(4, 144 * 8),
MaterialsAlloy.BABBIT_ALLOY.getFluidStack(16 * 144))
MaterialsAlloy.BABBITT_ALLOY.getFluidStack(16 * 144))
.itemOutputs(GregtechItemList.Casing_ElementalDuplicator.get(1))
.eut(TierEU.RECIPE_LuV)
.duration(10 * MINUTES)
Expand Down Expand Up @@ -852,7 +852,7 @@ private static void distillus() {
.itemOutputs(GregtechItemList.Machine_Adv_DistillationTower.get(1))
.fluidInputs(
MaterialsAlloy.AQUATIC_STEEL.getFluidStack(144 * 32),
MaterialsAlloy.BABBIT_ALLOY.getFluidStack(144 * 16),
MaterialsAlloy.BABBITT_ALLOY.getFluidStack(144 * 16),
MaterialsAlloy.BRONZE.getFluidStack(144 * 64),
MaterialsAlloy.KANTHAL.getFluidStack(144 * 16))
.duration(10 * MINUTES)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public GregtechMetaCasingBlocksPipeGearbox() {
GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Pikyonium Gear Box Casing");
GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Titansteel Gear Box Casing");
GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Abyssal Gear Box Casing");
GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Babbit Alloy Pipe Casing");
GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Babbitt Alloy Pipe Casing");
GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Inconel-690 Pipe Casing");
GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Stellite Pipe Casing");
GTLanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Nitinol-60 Pipe Casing");
Expand All @@ -45,7 +45,7 @@ public GregtechMetaCasingBlocksPipeGearbox() {
sMaterialMapping.put(aMappingID++, MaterialsAlloy.PIKYONIUM.getRgbAsHex());
sMaterialMapping.put(aMappingID++, MaterialsAlloy.TITANSTEEL.getRgbAsHex());
sMaterialMapping.put(aMappingID++, MaterialsAlloy.ABYSSAL.getRgbAsHex());
sMaterialMapping.put(aMappingID++, MaterialsAlloy.BABBIT_ALLOY.getRgbAsHex());
sMaterialMapping.put(aMappingID++, MaterialsAlloy.BABBITT_ALLOY.getRgbAsHex());
sMaterialMapping.put(aMappingID++, MaterialsAlloy.INCONEL_690.getRgbAsHex());
sMaterialMapping.put(aMappingID++, MaterialsAlloy.STELLITE.getRgbAsHex());
sMaterialMapping.put(aMappingID++, MaterialsAlloy.NITINOL_60.getRgbAsHex());
Expand Down
24 changes: 12 additions & 12 deletions src/main/resources/assets/miscutils/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -2112,7 +2112,7 @@ block.ArceusAlloy2B.frame.name=Arceus Alloy 2B Frame Box
block.ArceusAlloy2B.standard.name=Block of Arceus Alloy 2B
block.AstralTitanium.frame.name=Astral Titanium Frame Box
block.AstralTitanium.standard.name=Block of Astral Titanium
block.BabbitAlloy.standard.name=Block of Babbit Alloy
block.BabbittAlloy.standard.name=Block of Babbitt Alloy
block.BlackMetal.frame.name=Black Metal Frame Box
block.BlackMetal.standard.name=Block of Black Metal
block.BlackTitanium.standard.name=Block of Black Titanium
Expand Down Expand Up @@ -3163,16 +3163,16 @@ item.itemPlateAncientGranite.name=Ancient Granite Plate
item.itemPlateDoubleAncientGranite.name=Double Ancient Granite Plate
tile.Block of Ancient Granite.name=Block of Ancient Granite

item.itemIngotBabbitAlloy.name=Babbit Alloy Ingot
item.itemHotIngotBabbitAlloy.name=Hot Babbit Alloy Ingot
item.itemDustBabbitAlloy.name=Babbit Alloy Dust
item.itemDustTinyBabbitAlloy.name=Tiny Pile of Babbit Alloy Dust
item.itemDustSmallBabbitAlloy.name=Small Pile of Babbit Alloy Dust
item.itemNuggetBabbitAlloy.name=Babbit Alloy Nugget
item.itemPlateBabbitAlloy.name=Babbit Alloy Plate
item.itemPlateDoubleBabbitAlloy.name=Double Babbit Alloy Plate
item.itemCellBabbitAlloy.name=Babbit Alloy Cell
tile.Block of Babbit Alloy.name=Block of Babbit Alloy
item.itemIngotBabbittAlloy.name=Babbitt Alloy Ingot
item.itemHotIngotBabbittAlloy.name=Hot Babbitt Alloy Ingot
item.itemDustBabbittAlloy.name=Babbitt Alloy Dust
item.itemDustTinyBabbittAlloy.name=Tiny Pile of Babbitt Alloy Dust
item.itemDustSmallBabbittAlloy.name=Small Pile of Babbitt Alloy Dust
item.itemNuggetBabbittAlloy.name=Babbitt Alloy Nugget
item.itemPlateBabbittAlloy.name=Babbitt Alloy Plate
item.itemPlateDoubleBabbittAlloy.name=Double Babbitt Alloy Plate
item.itemCellBabbittAlloy.name=Babbitt Alloy Cell
tile.Block of Babbitt Alloy.name=Block of Babbitt Alloy

item.itemIngotBlackMetal.name=Black Metal Ingot
item.itemHotIngotBlackMetal.name=Hot Black Metal Ingot
Expand Down Expand Up @@ -3495,7 +3495,7 @@ item.itemFineWireWhiteMetal.name=Fine White Metal Wire
item.itemFineWirePalladium.name=Fine Palladium Wire
item.itemFineWireZirconium.name=Fine Zirconium Wire
item.itemFineWireGrisium.name=Fine Grisium Wire
item.itemFineWireBabbitAlloy.name=Fine Babbit Alloy Wire
item.itemFineWireBabbittAlloy.name=Fine Babbitt Alloy Wire
item.itemFineWireKoboldite.name=Fine Koboldite Wire
item.itemFineWireHG1223.name=Fine HG-1223 Wire
item.itemFineWireQuantum.name=Fine Quantum Wire
Expand Down
22 changes: 11 additions & 11 deletions src/main/resources/assets/miscutils/lang/ru_RU.lang
Original file line number Diff line number Diff line change
Expand Up @@ -2798,16 +2798,16 @@ item.itemPlateAncientGranite.name=Ancient Granite Plate
item.itemPlateDoubleAncientGranite.name=Double Ancient Granite Plate
tile.Block of Ancient Granite.name=Block of Ancient Granite

item.itemIngotBabbitAlloy.name=Babbit Alloy Ingot
item.itemHotIngotBabbitAlloy.name=Hot Babbit Alloy Ingot
item.itemDustBabbitAlloy.name=Babbit Alloy Dust
item.itemDustTinyBabbitAlloy.name=Tiny Pile of Babbit Alloy Dust
item.itemDustSmallBabbitAlloy.name=Small Pile of Babbit Alloy Dust
item.itemNuggetBabbitAlloy.name=Babbit Alloy Nugget
item.itemPlateBabbitAlloy.name=Babbit Alloy Plate
item.itemPlateDoubleBabbitAlloy.name=Double Babbit Alloy Plate
item.itemCellBabbitAlloy.name=Babbit Alloy Cell
tile.Block of Babbit Alloy.name=Block of Babbit Alloy
item.itemIngotBabbittAlloy.name=Babbitt Alloy Ingot
item.itemHotIngotBabbittAlloy.name=Hot Babbitt Alloy Ingot
item.itemDustBabbittAlloy.name=Babbitt Alloy Dust
item.itemDustTinyBabbittAlloy.name=Tiny Pile of Babbitt Alloy Dust
item.itemDustSmallBabbittAlloy.name=Small Pile of Babbitt Alloy Dust
item.itemNuggetBabbittAlloy.name=Babbitt Alloy Nugget
item.itemPlateBabbittAlloy.name=Babbitt Alloy Plate
item.itemPlateDoubleBabbittAlloy.name=Double Babbitt Alloy Plate
item.itemCellBabbittAlloy.name=Babbitt Alloy Cell
tile.Block of Babbitt Alloy.name=Block of Babbitt Alloy

item.itemIngotBlackMetal.name=Black Metal Ingot
item.itemHotIngotBlackMetal.name=Hot Black Metal Ingot
Expand Down Expand Up @@ -2900,7 +2900,7 @@ item.itemFineWireWhiteMetal.name=Fine White Metal Wire
item.itemFineWirePalladium.name=Fine Palladium Wire
item.itemFineWireZirconium.name=Fine Zirconium Wire
item.itemFineWireGrisium.name=Fine Grisium Wire
item.itemFineWireBabbitAlloy.name=Fine Babbit Alloy Wire
item.itemFineWireBabbittAlloy.name=Fine Babbitt Alloy Wire
item.itemFineWireKoboldite.name=Fine Koboldite Wire
item.itemFineWireHG1223.name=Fine HG-1223 Wire
item.itemFineWireQuantum.name=Fine Quantum Wire
Expand Down
22 changes: 11 additions & 11 deletions src/main/resources/assets/miscutils/lang/zh_CN.lang
Original file line number Diff line number Diff line change
Expand Up @@ -2798,16 +2798,16 @@ item.itemPlateAncientGranite.name=古花岗岩板
item.itemPlateDoubleAncientGranite.name=双重古花岗岩板
tile.Block of Ancient Granite.name=古花岗岩块

item.itemIngotBabbitAlloy.name=巴氏合金锭
item.itemHotIngotBabbitAlloy.name=热巴氏合金锭
item.itemDustBabbitAlloy.name=巴氏合金粉
item.itemDustTinyBabbitAlloy.name=小撮巴氏合金粉
item.itemDustSmallBabbitAlloy.name=小堆巴氏合金粉
item.itemNuggetBabbitAlloy.name=巴氏合金粒
item.itemPlateBabbitAlloy.name=巴氏合金板
item.itemPlateDoubleBabbitAlloy.name=双重巴氏合金板
item.itemCellBabbitAlloy.name=巴氏合金单元
tile.Block of Babbit Alloy.name=巴氏合金块
item.itemIngotBabbittAlloy.name=巴氏合金锭
item.itemHotIngotBabbittAlloy.name=热巴氏合金锭
item.itemDustBabbittAlloy.name=巴氏合金粉
item.itemDustTinyBabbittAlloy.name=小撮巴氏合金粉
item.itemDustSmallBabbittAlloy.name=小堆巴氏合金粉
item.itemNuggetBabbittAlloy.name=巴氏合金粒
item.itemPlateBabbittAlloy.name=巴氏合金板
item.itemPlateDoubleBabbittAlloy.name=双重巴氏合金板
item.itemCellBabbittAlloy.name=巴氏合金单元
tile.Block of Babbitt Alloy.name=巴氏合金块

item.itemIngotBlackMetal.name=黑物质锭
item.itemHotIngotBlackMetal.name=热黑物质锭
Expand Down Expand Up @@ -2900,7 +2900,7 @@ item.itemFineWireWhiteMetal.name=精致白物质导线
item.itemFineWirePalladium.name=精致钯导线
item.itemFineWireZirconium.name=精致锆导线
item.itemFineWireGrisium.name=精致灰钛合金导线
item.itemFineWireBabbitAlloy.name=精致巴氏合金导线
item.itemFineWireBabbittAlloy.name=精致巴氏合金导线
item.itemFineWireKoboldite.name=精致妖金导线
item.itemFineWireHG1223.name=精致HG-1223导线
item.itemFineWireQuantum.name=精致量子导线
Expand Down
Loading