aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java12
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_Slave.java2
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java4
3 files changed, 9 insertions, 9 deletions
diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
index db3212ad86..c7fd1bffe6 100644
--- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
@@ -2533,25 +2533,25 @@ public class MachineLoader implements Runnable {
new GT_MetaTileEntity_Hatch_InputData(
OpticalSlaveConnector.ID,
"hatch.datain.tier.07",
- "Optical Slave Connector",
+ "Optical Reception Connector",
7).getStackForm(1L));
dataOut_Hatch.set(
new GT_MetaTileEntity_Hatch_OutputData(
OpticalMasterConnector.ID,
"hatch.dataout.tier.07",
- "Optical Master Connector",
+ "Optical Transmission Connector",
7).getStackForm(1L));
dataInAss_Hatch.set(
new GT_MetaTileEntity_Hatch_InputDataItems(
AssemblylineSlaveConnector.ID,
"hatch.datainass.tier.07",
- "Assembly line Slave Connector",
+ "Assembly line Reception Connector",
7).getStackForm(1L));
dataOutAss_Hatch.set(
new GT_MetaTileEntity_Hatch_OutputDataItems(
DataBankMasterConnector.ID,
"hatch.dataoutass.tier.07",
- "Data Bank Master Connector",
+ "Data Bank Transmission Connector",
7).getStackForm(1L));
dataOut_Wireless_Hatch.set(
new GT_MetaTileEntity_Hatch_WirelessComputation_Output(
@@ -2569,13 +2569,13 @@ public class MachineLoader implements Runnable {
new GT_MetaTileEntity_Hatch_WirelessInputDataItems(
WirelessAssemblylineSlaveConnector.ID,
"hatch.datainass.wireless.tier.12",
- "Wireless Assembly line Slave Connector",
+ "Wireless Assembly line Reception Connector",
12).getStackForm(1L));
dataOutAss_Wireless_Hatch.set(
new GT_MetaTileEntity_Hatch_WirelessOutputDataItems(
WirelessDataBankMasterConnector.ID,
"hatch.dataoutass.wireless.tier.12",
- "Wireless Data Bank Master Connector",
+ "Wireless Data Bank Transmission Connector",
12).getStackForm(1L));
rack_Hatch.set(
new GT_MetaTileEntity_Hatch_Rack(ComputerRack.ID, "hatch.rack.tier.08", "Computer Rack", 8)
diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_Slave.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_Slave.java
index ee53e9494a..6dede1bea5 100644
--- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_Slave.java
+++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_Slave.java
@@ -42,7 +42,7 @@ public class GT_MetaTileEntity_Hatch_CraftingInput_Slave extends GT_MetaTileEnti
aNameRegional,
6,
0,
- new String[] { "Slave for Crafting Input Buffer/Bus",
+ new String[] { "Proxy for Crafting Input Buffer/Bus",
"Link with Crafting Input Buffer/Bus using Data Stick to share inventory",
"Left click on the Crafting Input Buffer/Bus, then right click on this block to link them", });
disableSort = true;
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
index cda0f12c99..bbfe7538b2 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
@@ -10248,8 +10248,8 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
ItemList.Hatch_CraftingInput_Bus_Slave.set(
new GT_MetaTileEntity_Hatch_CraftingInput_Slave(
CRAFTING_INPUT_SLAVE.ID,
- "hatch.crafting_input.slave",
- "Crafting Input Slave").getStackForm(1L));
+ "hatch.crafting_input.proxy",
+ "Crafting Input Proxy").getStackForm(1L));
}
private static void registerMagHatch() {