aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCrystie <50521339+CrystieColon3@users.noreply.github.com>2024-11-24 12:15:49 +0300
committerGitHub <noreply@github.com>2024-11-24 10:15:49 +0100
commit3ca980252c3e14ef0c925cc02ed74d3e999583b4 (patch)
tree05fc000d66b8127b9a5d509a8c81d100d40f2fd7
parent41243097f3e95b1d0e98f4c816bd64e398ba30d4 (diff)
downloadGT5-Unofficial-3ca980252c3e14ef0c925cc02ed74d3e999583b4.tar.gz
GT5-Unofficial-3ca980252c3e14ef0c925cc02ed74d3e999583b4.tar.bz2
GT5-Unofficial-3ca980252c3e14ef0c925cc02ed74d3e999583b4.zip
Renaming "Assembling Line" to "Assembly Line" (#3548)
Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
-rw-r--r--src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java4
-rw-r--r--src/main/java/ggfab/mte/MTEAdvAssLine.java8
-rw-r--r--src/main/java/gregtech/common/blocks/BlockCasings2.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java4
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTENanoForge.java4
-rw-r--r--src/main/java/gregtech/loaders/preload/LoaderMetaTileEntities.java2
-rw-r--r--src/main/resources/assets/tectech/lang/en_US.lang6
7 files changed, 15 insertions, 15 deletions
diff --git a/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java b/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java
index 54810bcf6d..1cdcc314e1 100644
--- a/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java
+++ b/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java
@@ -129,7 +129,7 @@ public class MTECircuitAssemblyLine extends MTEEnhancedMultiBlockBase<MTECircuit
.dot(1)
.buildAndChain(GregTechAPI.sBlockCasings3, 10))
.addElement('g', ofGlassTieredMixed((byte) 4, (byte) 127, 5))
- .addElement('l', ofBlock(GregTechAPI.sBlockCasings2, 5)) // assembling line casings
+ .addElement('l', ofBlock(GregTechAPI.sBlockCasings2, 5)) // assembly line casings
.addElement(
'b',
buildHatchAdder(MTECircuitAssemblyLine.class).atLeast(InputHatch, Maintenance)
@@ -178,7 +178,7 @@ public class MTECircuitAssemblyLine extends MTEEnhancedMultiBlockBase<MTECircuit
"Layer 1 - Solid Steel Machine Casing, Input bus (Last Output bus), Solid Steel Machine Casing")
.addStructureInfo(
"Layer 2 - " + getColoredTierNameFromTier((byte) 4)
- + "+ Tier Glass, Assembling Line Casing, "
+ + "+ Tier Glass, Assembly Line Casing, "
+ getColoredTierNameFromTier((byte) 4)
+ "+ Tier Glass")
.addStructureInfo("Layer 3 - Grate Machine Casing")
diff --git a/src/main/java/ggfab/mte/MTEAdvAssLine.java b/src/main/java/ggfab/mte/MTEAdvAssLine.java
index f9874efd79..cba6c9e534 100644
--- a/src/main/java/ggfab/mte/MTEAdvAssLine.java
+++ b/src/main/java/ggfab/mte/MTEAdvAssLine.java
@@ -304,9 +304,9 @@ public class MTEAdvAssLine extends MTEExtendedPowerMultiBlockBase<MTEAdvAssLine>
@Override
protected MultiblockTooltipBuilder createTooltip() {
final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
- tt.addMachineType("Assembling Line")
- .addInfo("Built exactly the same as standard Assembling Line")
- .addInfo("Assembling Line with item pipelining")
+ tt.addMachineType("Assembly Line")
+ .addInfo("Built exactly the same as standard Assembly Line")
+ .addInfo("Assembly Line with item pipelining")
.addInfo("All fluids are however consumed at start")
.addInfo("Use voltage of worst energy hatch for overclocking")
.addInfo("Performs normal overclock with given voltage")
@@ -323,7 +323,7 @@ public class MTEAdvAssLine extends MTEExtendedPowerMultiBlockBase<MTEAdvAssLine>
.addStructureInfo(
"Layer 1 - Solid Steel Machine Casing, Input Bus (last can be Output Bus), Solid Steel Machine Casing")
.addStructureInfo(
- "Layer 2 - Borosilicate Glass(any)/Warded Glass/Reinforced Glass, Assembling Line Casing, Reinforced Glass")
+ "Layer 2 - Borosilicate Glass(any)/Warded Glass/Reinforced Glass, Assembly Line Casing, Reinforced Glass")
.addStructureInfo("Layer 3 - Grate Machine Casing, Assembler Machine Casing, Grate Machine Casing")
.addStructureInfo("Layer 4 - Empty, Solid Steel Machine Casing, Empty")
.addStructureInfo("Up to 16 repeating slices, each one allows for 1 more item in recipes")
diff --git a/src/main/java/gregtech/common/blocks/BlockCasings2.java b/src/main/java/gregtech/common/blocks/BlockCasings2.java
index 441bbd9b82..ad2f474870 100644
--- a/src/main/java/gregtech/common/blocks/BlockCasings2.java
+++ b/src/main/java/gregtech/common/blocks/BlockCasings2.java
@@ -36,7 +36,7 @@ public class BlockCasings2 extends BlockCasingsAbstract {
GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Bronze Gear Box Casing");
GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Steel Gear Box Casing");
GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Titanium Gear Box Casing");
- GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Assembling Line Casing");
+ GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Assembly Line Casing");
GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Processor Machine Casing");
GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Data Drive Machine Casing");
GTLanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Containment Field Machine Casing");
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java
index 30c0a388bc..bdf8294b0f 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java
@@ -131,7 +131,7 @@ public class MTEAssemblyLine extends MTEExtendedPowerMultiBlockBase<MTEAssemblyL
@Override
protected MultiblockTooltipBuilder createTooltip() {
final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
- tt.addMachineType("Assembling Line")
+ tt.addMachineType("Assembly Line")
.addInfo("Used to make complex machine parts (LuV+)")
.addInfo("Does not make Assembler items")
.addInfo("Recipe tier is at most Energy Hatch tier + 1.")
@@ -140,7 +140,7 @@ public class MTEAssemblyLine extends MTEExtendedPowerMultiBlockBase<MTEAssemblyL
.addStructureInfo(
"Layer 1 - Solid Steel Machine Casing, Input Bus (last can be Output Bus), Solid Steel Machine Casing")
.addStructureInfo(
- "Layer 2 - Borosilicate Glass(any)/Warded Glass/Reinforced Glass, Assembling Line Casing, Reinforced Glass")
+ "Layer 2 - Borosilicate Glass(any)/Warded Glass/Reinforced Glass, Assembly Line Casing, Reinforced Glass")
.addStructureInfo("Layer 3 - Grate Machine Casing, Assembler Machine Casing, Grate Machine Casing")
.addStructureInfo("Layer 4 - Empty, Solid Steel Machine Casing, Empty")
.addStructureInfo("Up to 16 repeating slices, each one allows for 1 more item in recipes")
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTENanoForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTENanoForge.java
index 66bad3d492..91e011f9e1 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/MTENanoForge.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTENanoForge.java
@@ -381,13 +381,13 @@ public class MTENanoForge extends MTEExtendedPowerMultiBlockBase<MTENanoForge> i
.addStructureInfo("Tier " + EnumChatFormatting.DARK_PURPLE + 2 + EnumChatFormatting.GRAY)
.addStructureInfo(
EnumChatFormatting.GOLD + "148" + EnumChatFormatting.GRAY + " Radiant Naquadah Alloy Casing")
- .addStructureInfo(EnumChatFormatting.GOLD + "16" + EnumChatFormatting.GRAY + " Assembling Line Casing")
+ .addStructureInfo(EnumChatFormatting.GOLD + "16" + EnumChatFormatting.GRAY + " Assembly Line Casing")
.addStructureInfo("")
.addStructureInfo("Tier " + EnumChatFormatting.DARK_PURPLE + 3 + EnumChatFormatting.GRAY)
.addStructureInfo(
EnumChatFormatting.GOLD + "228" + EnumChatFormatting.GRAY + " Radiant Naquadah Alloy Casing")
.addStructureInfo(EnumChatFormatting.GOLD + "84" + EnumChatFormatting.GRAY + " Stellar Alloy Frame Box")
- .addStructureInfo(EnumChatFormatting.GOLD + "16" + EnumChatFormatting.GRAY + " Assembling Line Casing")
+ .addStructureInfo(EnumChatFormatting.GOLD + "16" + EnumChatFormatting.GRAY + " Assembly Line Casing")
.addStructureInfo("")
.addStructureInfo(
"Requires " + EnumChatFormatting.GOLD
diff --git a/src/main/java/gregtech/loaders/preload/LoaderMetaTileEntities.java b/src/main/java/gregtech/loaders/preload/LoaderMetaTileEntities.java
index bfddb49278..baf687c5cd 100644
--- a/src/main/java/gregtech/loaders/preload/LoaderMetaTileEntities.java
+++ b/src/main/java/gregtech/loaders/preload/LoaderMetaTileEntities.java
@@ -1539,7 +1539,7 @@ public class LoaderMetaTileEntities implements Runnable { // TODO CHECK CIRCUIT
new MTEOilCracker(OIL_CRACKER_CONTROLLER.ID, "multimachine.cracker", "Oil Cracking Unit").getStackForm(1));
ItemList.Machine_Multi_Assemblyline.set(
- new MTEAssemblyLine(ASSEMBLING_LINE_CONTROLLER.ID, "multimachine.assemblyline", "Assembling Line")
+ new MTEAssemblyLine(ASSEMBLING_LINE_CONTROLLER.ID, "multimachine.assemblyline", "Assembly Line")
.getStackForm(1L));
ItemList.Machine_Multi_DieselEngine.set(
new MTEDieselEngine(COMBUSTION_ENGINE_CONTROLLER.ID, "multimachine.dieselengine", "Large Combustion Engine")
diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang
index 3117cf6a0c..c72f8c1ddf 100644
--- a/src/main/resources/assets/tectech/lang/en_US.lang
+++ b/src/main/resources/assets/tectech/lang/en_US.lang
@@ -714,8 +714,8 @@ gt.blockmachines.multimachine.em.databank.name=Data Bank
gt.blockmachines.multimachine.em.databank.hint.0=1 - Classic Hatches or high power casing
gt.blockmachines.multimachine.em.databank.hint.1=2 - Data Access/Data Bank Master Hatches or computer casing
gt.blockmachines.multimachine.em.databank.desc.0=Controller block of the Data Bank
-gt.blockmachines.multimachine.em.databank.desc.1=Used to supply Assembling Lines with more Data Sticks
-gt.blockmachines.multimachine.em.databank.desc.2=and give multiple Assembling Lines access to the same Data Stick
+gt.blockmachines.multimachine.em.databank.desc.1=Used to supply Assembly Lines with more Data Sticks
+gt.blockmachines.multimachine.em.databank.desc.2=and give multiple Assembly Lines access to the same Data Stick
gt.blockmachines.multimachine.em.databank.desc.3=Use screwdriver to toggle wireless mode
gt.blockmachines.multimachine.em.junction.name=Matter Junction
@@ -765,7 +765,7 @@ gt.blockmachines.multimachine.em.scanner.desc.0=Controller block of the Elementa
gt.blockmachines.multimachine.em.research.type=Research Station, Scanner
gt.blockmachines.multimachine.em.research.hint.0=1 - Classic/Data Hatches or Computer casing
gt.blockmachines.multimachine.em.research.hint.1=2 - Holder Hatch
-gt.blockmachines.multimachine.em.research.desc.1=Used to scan Data Sticks for Assembling Line Recipes
+gt.blockmachines.multimachine.em.research.desc.1=Used to scan Data Sticks for Assembly Line Recipes
gt.blockmachines.multimachine.em.research.desc.2=Needs to be fed with computation to work
gt.blockmachines.multimachine.em.research.desc.3=Does not consume the item until the Data Stick is written
gt.blockmachines.multimachine.em.research.desc.4=Use screwdriver to change mode