aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriouter <62897714+iouter@users.noreply.github.com>2022-10-01 16:52:15 +0800
committerGitHub <noreply@github.com>2022-10-01 10:52:15 +0200
commitad7f7b95550d8a27cc5cddc8c419898d8d836713 (patch)
tree4c311cbcf152dd045b4ef4fa3f90b948374e24cf
parent5404dda312c34b62178e1c0eba93b6ef011a6547 (diff)
downloadGT5-Unofficial-ad7f7b95550d8a27cc5cddc8c419898d8d836713.tar.gz
GT5-Unofficial-ad7f7b95550d8a27cc5cddc8c419898d8d836713.tar.bz2
GT5-Unofficial-ad7f7b95550d8a27cc5cddc8c419898d8d836713.zip
no-more-duplicate-key (#1424)
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java2
-rw-r--r--src/main/java/gregtech/api/objects/GT_Cover_Default.java8
-rw-r--r--src/main/java/gregtech/api/util/GT_LanguageManager.java203
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Arm.java2
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java8
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java2
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java8
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java8
-rw-r--r--src/main/java/gregtech/common/gui/GT_Container_OutputHatch.java2
-rw-r--r--src/main/java/gregtech/common/power/Power.java2
-rw-r--r--src/main/java/gregtech/common/power/UnspecifiedEUPower.java4
-rw-r--r--src/main/java/gregtech/nei/GT_NEI_AssLineHandler.java6
-rw-r--r--src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java10
13 files changed, 180 insertions, 85 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java
index e249be541e..85b0112eab 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java
@@ -422,7 +422,7 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM
// I was so proud of all this but I literally just copied code from OutputBus
bSortStacks = !bSortStacks;
GT_Utility.sendChatToPlayer(
- aPlayer, GT_Utility.trans("200", "Sort mode: " + (bSortStacks ? "Enabled" : "Disabled")));
+ aPlayer, GT_Utility.trans("200", "Sort mode: ") + (bSortStacks ? GT_Utility.trans("088", "Enabled") : GT_Utility.trans("087", "Disabled")));
return true;
}
return super.onSolderingToolRightClick(aSide, aWrenchingSide, aPlayer, aX, aY, aZ);
diff --git a/src/main/java/gregtech/api/objects/GT_Cover_Default.java b/src/main/java/gregtech/api/objects/GT_Cover_Default.java
index a975de9759..4f5eca5b24 100644
--- a/src/main/java/gregtech/api/objects/GT_Cover_Default.java
+++ b/src/main/java/gregtech/api/objects/GT_Cover_Default.java
@@ -32,10 +32,10 @@ public class GT_Cover_Default extends GT_CoverBehavior {
aCoverVariable = ((aCoverVariable + 1) & 15);
GT_Utility.sendChatToPlayer(
aPlayer,
- ((aCoverVariable & 1) != 0 ? GT_Utility.trans("128", "Redstone ") : "")
- + ((aCoverVariable & 2) != 0 ? GT_Utility.trans("129", "Energy ") : "")
- + ((aCoverVariable & 4) != 0 ? GT_Utility.trans("130", "Fluids ") : "")
- + ((aCoverVariable & 8) != 0 ? GT_Utility.trans("131", "Items ") : ""));
+ ((aCoverVariable & 1) != 0 ? GT_Utility.trans("128.1", "Redstone ") : "")
+ + ((aCoverVariable & 2) != 0 ? GT_Utility.trans("129.1", "Energy ") : "")
+ + ((aCoverVariable & 4) != 0 ? GT_Utility.trans("130.1", "Fluids ") : "")
+ + ((aCoverVariable & 8) != 0 ? GT_Utility.trans("131.1", "Items ") : ""));
return aCoverVariable;
}
diff --git a/src/main/java/gregtech/api/util/GT_LanguageManager.java b/src/main/java/gregtech/api/util/GT_LanguageManager.java
index 50d0deeee7..e61114e6d3 100644
--- a/src/main/java/gregtech/api/util/GT_LanguageManager.java
+++ b/src/main/java/gregtech/api/util/GT_LanguageManager.java
@@ -156,9 +156,9 @@ public class GT_LanguageManager {
public static void writePlaceholderStrings() {
addStringLocalization("Interaction_DESCRIPTION_Index_001", "Puts out into adjacent Slot #");
addStringLocalization("Interaction_DESCRIPTION_Index_002", "Grabs in for own Slot #");
- addStringLocalization("Interaction_DESCRIPTION_Index_003", "Normal");
- addStringLocalization("Interaction_DESCRIPTION_Index_004", "Inverted");
- addStringLocalization("Interaction_DESCRIPTION_Index_005", "No Work at all");
+ addStringLocalization("Interaction_DESCRIPTION_Index_003", "Enable with Signal");
+ addStringLocalization("Interaction_DESCRIPTION_Index_004", "Disable with Signal");
+ addStringLocalization("Interaction_DESCRIPTION_Index_005", "Disabled");
addStringLocalization("Interaction_DESCRIPTION_Index_006", "Export");
addStringLocalization("Interaction_DESCRIPTION_Index_007", "Import");
addStringLocalization("Interaction_DESCRIPTION_Index_008", "Export (conditional)");
@@ -181,9 +181,6 @@ public class GT_LanguageManager {
addStringLocalization("Interaction_DESCRIPTION_Index_025", "Keep Liquids Away");
addStringLocalization("Interaction_DESCRIPTION_Index_026", "Keep Liquids Away (conditional)");
addStringLocalization("Interaction_DESCRIPTION_Index_027", "Keep Liquids Away (invert cond)");
- addStringLocalization("Interaction_DESCRIPTION_Index_028", "Allow");
- addStringLocalization("Interaction_DESCRIPTION_Index_029", "Allow (conditional)");
- addStringLocalization("Interaction_DESCRIPTION_Index_030", "Disallow (conditional)");
addStringLocalization("Interaction_DESCRIPTION_Index_031", "Normal Universal Storage");
addStringLocalization("Interaction_DESCRIPTION_Index_032", "Inverted Universal Storage");
addStringLocalization("Interaction_DESCRIPTION_Index_033", "Normal Electricity Storage");
@@ -196,16 +193,14 @@ public class GT_LanguageManager {
addStringLocalization("Interaction_DESCRIPTION_Index_040", "Inverted Average Electric Output");
addStringLocalization("Interaction_DESCRIPTION_Index_041", "Normal Electricity Storage(Including Batteries)");
addStringLocalization("Interaction_DESCRIPTION_Index_042", "Inverted Electricity Storage(Including Batteries)");
- addStringLocalization("Interaction_DESCRIPTION_Index_043", "Allow input, no output");
- addStringLocalization("Interaction_DESCRIPTION_Index_044", "Deny input, no output");
- addStringLocalization("Interaction_DESCRIPTION_Index_045", "Allow input, permit any output");
- addStringLocalization("Interaction_DESCRIPTION_Index_046", "Deny input, permit any output");
+ addStringLocalization("Interaction_DESCRIPTION_Index_043", "Filter input, Deny output");
+ addStringLocalization("Interaction_DESCRIPTION_Index_044", "Invert input, Deny output");
+ addStringLocalization("Interaction_DESCRIPTION_Index_045", "Filter input, Permit any output");
+ addStringLocalization("Interaction_DESCRIPTION_Index_046", "Invert input, Permit any output");
addStringLocalization("Interaction_DESCRIPTION_Index_047", "Filter Fluid: ");
addStringLocalization("Interaction_DESCRIPTION_Index_048", "Pump speed: ");
addStringLocalization("Interaction_DESCRIPTION_Index_049", "L/tick ");
addStringLocalization("Interaction_DESCRIPTION_Index_050", "L/sec");
- addStringLocalization("Interaction_DESCRIPTION_Index_051", "Normal");
- addStringLocalization("Interaction_DESCRIPTION_Index_052", "Inverted");
addStringLocalization("Interaction_DESCRIPTION_Index_053", "Slot: ");
addStringLocalization("Interaction_DESCRIPTION_Index_054", "Inverted");
addStringLocalization("Interaction_DESCRIPTION_Index_055", "Normal");
@@ -219,10 +214,12 @@ public class GT_LanguageManager {
addStringLocalization("Interaction_DESCRIPTION_Index_063", "Emit if 4 Maintenance Needed(inverted)");
addStringLocalization("Interaction_DESCRIPTION_Index_064", "Emit if 5 Maintenance Needed");
addStringLocalization("Interaction_DESCRIPTION_Index_065", "Emit if 5 Maintenance Needed(inverted)");
- addStringLocalization("Interaction_DESCRIPTION_Index_066", "Emit if rotor needs maintenance");
- addStringLocalization("Interaction_DESCRIPTION_Index_067", "Emit if rotor needs maintenance(inverted)");
- addStringLocalization("Interaction_DESCRIPTION_Index_068", "Emit if any Player is close");
- addStringLocalization("Interaction_DESCRIPTION_Index_069", "Emit if other player is close");
+ addStringLocalization("Interaction_DESCRIPTION_Index_066", "Emit if rotor needs maintenance low accuracy mod");
+ addStringLocalization("Interaction_DESCRIPTION_Index_067", "Emit if rotor needs maintenance low accuracy mod(inverted)");
+ addStringLocalization("Interaction_DESCRIPTION_Index_068", "Emit if rotor needs maintenance high accuracy mod");
+ addStringLocalization("Interaction_DESCRIPTION_Index_068.1", "Emit if any Player is close");
+ addStringLocalization("Interaction_DESCRIPTION_Index_069", "Emit if rotor needs maintenance high accuracy mod(inverted)");
+ addStringLocalization("Interaction_DESCRIPTION_Index_069.1", "Emit if other Player is close");
addStringLocalization("Interaction_DESCRIPTION_Index_070", "Emit if you are close");
addStringLocalization("Interaction_DESCRIPTION_Index_071", "Conducts strongest Input");
addStringLocalization("Interaction_DESCRIPTION_Index_072", "Conducts from bottom Input");
@@ -250,10 +247,9 @@ public class GT_LanguageManager {
addStringLocalization("Interaction_DESCRIPTION_Index_094", "Weak");
addStringLocalization("Interaction_DESCRIPTION_Index_095", "Input from Output Side allowed");
addStringLocalization("Interaction_DESCRIPTION_Index_096", "Input from Output Side forbidden");
- addStringLocalization("Interaction_DESCRIPTION_Index_097", "It's dangerous to go alone! Take this.");
addStringLocalization("Interaction_DESCRIPTION_Index_098", "Do not regulate Item Stack Size");
addStringLocalization("Interaction_DESCRIPTION_Index_099", "Regulate Item Stack Size to: ");
- addStringLocalization("Interaction_DESCRIPTION_Index_100", "This is "); // Spartaaaaaaa!!!
+ addStringLocalization("Interaction_DESCRIPTION_Index_100", "This is ");
addStringLocalization("Interaction_DESCRIPTION_Index_101", " Ore.");
addStringLocalization("Interaction_DESCRIPTION_Index_102", "There is Lava behind this Rock.");
addStringLocalization("Interaction_DESCRIPTION_Index_103", "There is a Liquid behind this Rock.");
@@ -261,13 +257,13 @@ public class GT_LanguageManager {
addStringLocalization("Interaction_DESCRIPTION_Index_105", "Material is changing behind this Rock.");
addStringLocalization("Interaction_DESCRIPTION_Index_106", "Found traces of ");
addStringLocalization("Interaction_DESCRIPTION_Index_107", "No Ores found.");
- addStringLocalization("Interaction_DESCRIPTION_Index_108", "Outputs Liquids, Steam and Items");
+ addStringLocalization("Interaction_DESCRIPTION_Index_108", "Outputs misc. Fluids, Steam and Items");
addStringLocalization("Interaction_DESCRIPTION_Index_109", "Outputs Steam and Items");
- addStringLocalization("Interaction_DESCRIPTION_Index_110", "Outputs Steam and Liquids");
+ addStringLocalization("Interaction_DESCRIPTION_Index_110", "Outputs Steam and misc. Fluids");
addStringLocalization("Interaction_DESCRIPTION_Index_111", "Outputs Steam");
- addStringLocalization("Interaction_DESCRIPTION_Index_112", "Outputs Liquids and Items");
+ addStringLocalization("Interaction_DESCRIPTION_Index_112", "Outputs misc. Fluids and Items");
addStringLocalization("Interaction_DESCRIPTION_Index_113", "Outputs only Items");
- addStringLocalization("Interaction_DESCRIPTION_Index_114", "Outputs only Liquids");
+ addStringLocalization("Interaction_DESCRIPTION_Index_114", "Outputs only misc. Fluids");
addStringLocalization("Interaction_DESCRIPTION_Index_115", "Outputs nothing");
addStringLocalization("Interaction_DESCRIPTION_Index_116", "Emit Energy to Outputside");
addStringLocalization("Interaction_DESCRIPTION_Index_117", "Don't emit Energy");
@@ -278,13 +274,19 @@ public class GT_LanguageManager {
addStringLocalization("Interaction_DESCRIPTION_Index_122", "Emit Redstone if slots contain something");
addStringLocalization("Interaction_DESCRIPTION_Index_123", "Don't emit Redstone");
addStringLocalization("Interaction_DESCRIPTION_Index_124", "Invert Filter");
+ addStringLocalization("Interaction_DESCRIPTION_Index_124.1", "Blacklist Mode");
addStringLocalization("Interaction_DESCRIPTION_Index_125", "Don't invert Filter");
+ addStringLocalization("Interaction_DESCRIPTION_Index_125.1", "Whitelist Mode");
addStringLocalization("Interaction_DESCRIPTION_Index_126", "Ignore NBT");
addStringLocalization("Interaction_DESCRIPTION_Index_127", "NBT has to match");
- addStringLocalization("Interaction_DESCRIPTION_Index_128", "Redstone ");
- addStringLocalization("Interaction_DESCRIPTION_Index_129", "Energy ");
- addStringLocalization("Interaction_DESCRIPTION_Index_130", "Fluids ");
- addStringLocalization("Interaction_DESCRIPTION_Index_131", "Items ");
+ addStringLocalization("Interaction_DESCRIPTION_Index_128", "Redstone");
+ addStringLocalization("Interaction_DESCRIPTION_Index_128.1", "Redstone ");
+ addStringLocalization("Interaction_DESCRIPTION_Index_129", "Energy");
+ addStringLocalization("Interaction_DESCRIPTION_Index_129.1", "Energy ");
+ addStringLocalization("Interaction_DESCRIPTION_Index_130", "Fluids");
+ addStringLocalization("Interaction_DESCRIPTION_Index_130.1", "Fluids ");
+ addStringLocalization("Interaction_DESCRIPTION_Index_131", "Items");
+ addStringLocalization("Interaction_DESCRIPTION_Index_131.1", "Items ");
addStringLocalization("Interaction_DESCRIPTION_Index_132", "Pipe is loose.");
addStringLocalization("Interaction_DESCRIPTION_Index_133", "Screws are loose.");
addStringLocalization("Interaction_DESCRIPTION_Index_134", "Something is stuck.");
@@ -292,7 +294,7 @@ public class GT_LanguageManager {
addStringLocalization("Interaction_DESCRIPTION_Index_136", "Circuitry burned out.");
addStringLocalization("Interaction_DESCRIPTION_Index_137", "That doesn't belong there.");
addStringLocalization("Interaction_DESCRIPTION_Index_138", "Incomplete Structure.");
- addStringLocalization("Interaction_DESCRIPTION_Index_139", "Hit with Soft Hammer");
+ addStringLocalization("Interaction_DESCRIPTION_Index_139", "Hit with Soft Mallet");
addStringLocalization("Interaction_DESCRIPTION_Index_140", "to (re-)start the Machine");
addStringLocalization("Interaction_DESCRIPTION_Index_141", "if it doesn't start.");
addStringLocalization("Interaction_DESCRIPTION_Index_142", "Running perfectly.");
@@ -300,12 +302,16 @@ public class GT_LanguageManager {
addStringLocalization("Interaction_DESCRIPTION_Index_144", "Missing Turbine Rotor");
addStringLocalization("Interaction_DESCRIPTION_Index_145", "Step Down, In: ");
addStringLocalization("Interaction_DESCRIPTION_Index_146", "Step Up, In: ");
- addStringLocalization("Interaction_DESCRIPTION_Index_147", "Amp, Out: ");
- addStringLocalization("Interaction_DESCRIPTION_Index_148", " V at ");
- addStringLocalization("Interaction_DESCRIPTION_Index_149", " Amp");
+ addStringLocalization("Interaction_DESCRIPTION_Index_147", "A, Out: ");
+ addStringLocalization("Interaction_DESCRIPTION_Index_148", "V ");
+ addStringLocalization("Interaction_DESCRIPTION_Index_149", "A");
addStringLocalization("Interaction_DESCRIPTION_Index_150", "Chance: ");
addStringLocalization("Interaction_DESCRIPTION_Index_151", "Does not get consumed in the process");
+ addStringLocalization("Interaction_DESCRIPTION_Index_151.1", "Outputs items and 1 specific Fluid");
+ addStringLocalization("Interaction_DESCRIPTION_Index_151.2", "Outputs 1 specific Fluid");
+ addStringLocalization("Interaction_DESCRIPTION_Index_151.4", "Successfully locked Fluid to %s");
addStringLocalization("Interaction_DESCRIPTION_Index_152", "Total: ");
+ addStringLocalization("Interaction_DESCRIPTION_Index_152.1", "Max EU: ");
addStringLocalization("Interaction_DESCRIPTION_Index_153", "Usage: ");
addStringLocalization("Interaction_DESCRIPTION_Index_154", "Voltage: ");
addStringLocalization("Interaction_DESCRIPTION_Index_155", "Amperage: ");
@@ -314,16 +320,17 @@ public class GT_LanguageManager {
addStringLocalization("Interaction_DESCRIPTION_Index_158", "Time: ");
addStringLocalization("Interaction_DESCRIPTION_Index_159", "Needs Low Gravity");
addStringLocalization("Interaction_DESCRIPTION_Index_160", "Needs Cleanroom");
+ addStringLocalization("Interaction_DESCRIPTION_Index_160.1", "Needs Cleanroom & LowGrav");
addStringLocalization("Interaction_DESCRIPTION_Index_161", " secs");
addStringLocalization("Interaction_DESCRIPTION_Index_162", "Name: ");
- addStringLocalization("Interaction_DESCRIPTION_Index_163", " MetaData: ");
+ addStringLocalization("Interaction_DESCRIPTION_Index_163", " MetaData: ");
addStringLocalization("Interaction_DESCRIPTION_Index_164", "Hardness: ");
- addStringLocalization("Interaction_DESCRIPTION_Index_165", " Blast Resistance: ");
+ addStringLocalization("Interaction_DESCRIPTION_Index_165", " Blast Resistance: ");
addStringLocalization("Interaction_DESCRIPTION_Index_166", "Is valid Beacon Pyramid Material");
addStringLocalization("Interaction_DESCRIPTION_Index_167", "Tank ");
addStringLocalization("Interaction_DESCRIPTION_Index_168", "Heat: ");
- addStringLocalization("Interaction_DESCRIPTION_Index_169", " HEM: ");
- addStringLocalization("Interaction_DESCRIPTION_Index_170", " Base EU Output: ");
+ addStringLocalization("Interaction_DESCRIPTION_Index_169", "HEM: ");
+ addStringLocalization("Interaction_DESCRIPTION_Index_170", " Base EU Output: ");
addStringLocalization("Interaction_DESCRIPTION_Index_171", "Facing: ");
addStringLocalization("Interaction_DESCRIPTION_Index_172", " / Chance: ");
addStringLocalization("Interaction_DESCRIPTION_Index_173", "You can remove this with a Wrench");
@@ -331,14 +338,12 @@ public class GT_LanguageManager {
addStringLocalization("Interaction_DESCRIPTION_Index_175", "Conduction Loss: ");
addStringLocalization("Interaction_DESCRIPTION_Index_176", "Contained Energy: ");
addStringLocalization("Interaction_DESCRIPTION_Index_177", "Has Muffler Upgrade");
- addStringLocalization("Interaction_DESCRIPTION_Index_178", "Progress: ");
+ addStringLocalization("Interaction_DESCRIPTION_Index_178", "Progress/Load: ");
addStringLocalization("Interaction_DESCRIPTION_Index_179", "Max IN: ");
- addStringLocalization("Interaction_DESCRIPTION_Index_180", " EU");
addStringLocalization("Interaction_DESCRIPTION_Index_181", "Max OUT: ");
addStringLocalization("Interaction_DESCRIPTION_Index_182", " EU at ");
- addStringLocalization("Interaction_DESCRIPTION_Index_183", " Amperes");
+ addStringLocalization("Interaction_DESCRIPTION_Index_183", " A");
addStringLocalization("Interaction_DESCRIPTION_Index_184", "Energy: ");
- addStringLocalization("Interaction_DESCRIPTION_Index_185", "EU");
addStringLocalization("Interaction_DESCRIPTION_Index_186", "Owned by: ");
addStringLocalization("Interaction_DESCRIPTION_Index_187", "Type -- Crop-Name: ");
addStringLocalization("Interaction_DESCRIPTION_Index_188", " Growth: ");
@@ -353,38 +358,128 @@ public class GT_LanguageManager {
addStringLocalization("Interaction_DESCRIPTION_Index_197", " Air-Quality: ");
addStringLocalization("Interaction_DESCRIPTION_Index_198", "Attributes:");
addStringLocalization("Interaction_DESCRIPTION_Index_199", "Discovered by: ");
- addStringLocalization("Interaction_DESCRIPTION_Index_200", " L");
+ addStringLocalization("Interaction_DESCRIPTION_Index_200", "Sort mode: ");
+ addStringLocalization("Interaction_DESCRIPTION_Index_200.1", "Automatic Item Shuffling: ");
addStringLocalization("Interaction_DESCRIPTION_Index_201", "Nothing");
addStringLocalization("Interaction_DESCRIPTION_Index_202", "Pollution in Chunk: ");
addStringLocalization("Interaction_DESCRIPTION_Index_203", " gibbl");
addStringLocalization("Interaction_DESCRIPTION_Index_204", "No Pollution in Chunk! HAYO!");
- addStringLocalization("Interaction_DESCRIPTION_Index_205", " of ");
addStringLocalization("Interaction_DESCRIPTION_Index_206", "Scan for Assembly Line");
- // addStringLocalization("Interaction_DESCRIPTION_Index_207", "Grab");
- // addStringLocalization("Interaction_DESCRIPTION_Index_208", "Grab");
- // addStringLocalization("Interaction_DESCRIPTION_Index_209", "Grab");
- // addStringLocalization("Interaction_DESCRIPTION_Index_210", "Grab");
+ addStringLocalization("Interaction_DESCRIPTION_Index_207", "Pump speed: %dL every %d ticks, %.2f L/sec on average");
+ addStringLocalization("Interaction_DESCRIPTION_Index_208", " L");
+ addStringLocalization("Interaction_DESCRIPTION_Index_209", " ticks");
+ addStringLocalization("Interaction_DESCRIPTION_Index_210", "Average: %.2f L/sec");
addStringLocalization("Interaction_DESCRIPTION_Index_211", "Items per side: ");
addStringLocalization("Interaction_DESCRIPTION_Index_212", "Input enabled");
addStringLocalization("Interaction_DESCRIPTION_Index_213", "Input disabled");
addStringLocalization("Interaction_DESCRIPTION_Index_214", "Connected");
addStringLocalization("Interaction_DESCRIPTION_Index_215", "Disconnected");
addStringLocalization("Interaction_DESCRIPTION_Index_216", "Deprecated Recipe");
- addStringLocalization(
- "Interaction_DESCRIPTION_Index_217",
- "Stocking mode. Keeps this many items in destination input slots. This mode can be server unfriendly.");
- addStringLocalization(
- "Interaction_DESCRIPTION_Index_218",
- "Transfer size mode. Add exactly this many items in destination input slots as long as there is room.");
- addStringLocalization("Interaction_DESCRIPTION_Index_219", "Extended Facing:");
+ addStringLocalization("Interaction_DESCRIPTION_Index_219", "Extended Facing: ");
addStringLocalization("Interaction_DESCRIPTION_Index_220", "Single recipe locking disabled.");
addStringLocalization("Interaction_DESCRIPTION_Index_221", "Item threshold");
addStringLocalization("Interaction_DESCRIPTION_Index_222", "Fluid threshold");
- addStringLocalization(
- "Interaction_DESCRIPTION_Index_223", "Single recipe locking enabled. Will lock to next recipe.");
- addStringLocalization("Interaction_DESCRIPTION_Index_224", " ticks");
+ addStringLocalization("Interaction_DESCRIPTION_Index_222.1", "Energy threshold");
+ addStringLocalization("Interaction_DESCRIPTION_Index_223", "Single recipe locking enabled. Will lock to next recipe.");
+ addStringLocalization("Interaction_DESCRIPTION_Index_224", "Always On");
+ addStringLocalization("Interaction_DESCRIPTION_Index_225", "Active with Redstone Signal");
+ addStringLocalization("Interaction_DESCRIPTION_Index_226", "Inactive with Redstone Signal");
+ addStringLocalization("Interaction_DESCRIPTION_Index_227", "Allow Input");
+ addStringLocalization("Interaction_DESCRIPTION_Index_228", "Block Input");
+ addStringLocalization("Interaction_DESCRIPTION_Index_229", "Import/Export");
+ addStringLocalization("Interaction_DESCRIPTION_Index_230", "Conditional");
+ addStringLocalization("Interaction_DESCRIPTION_Index_231", "Enable Input");
+ addStringLocalization("Interaction_DESCRIPTION_Index_232", "Filter Input");
+ addStringLocalization("Interaction_DESCRIPTION_Index_233", "Filter Output");
+ addStringLocalization("Interaction_DESCRIPTION_Index_234", "Block Output");
+ addStringLocalization("Interaction_DESCRIPTION_Index_235", "Allow Output");
+ addStringLocalization("Interaction_DESCRIPTION_Index_236", "Whitelist Fluid");
+ addStringLocalization("Interaction_DESCRIPTION_Index_237", "Blacklist Fluid");
+ addStringLocalization("Interaction_DESCRIPTION_Index_238", "Filter Direction");
+ addStringLocalization("Interaction_DESCRIPTION_Index_239", "Filter Type");
+ addStringLocalization("Interaction_DESCRIPTION_Index_240", "Block Flow");
+ addStringLocalization("Interaction_DESCRIPTION_Index_241", "Recipe progress");
+ addStringLocalization("Interaction_DESCRIPTION_Index_242", "Machine idle");
+ addStringLocalization("Interaction_DESCRIPTION_Index_243", "Enable with Redstone");
+ addStringLocalization("Interaction_DESCRIPTION_Index_244", "Disable with Redstone");
+ addStringLocalization("Interaction_DESCRIPTION_Index_245", "Disable machine");
+ addStringLocalization("Interaction_DESCRIPTION_Index_246", "Frequency");
+ addStringLocalization("Interaction_DESCRIPTION_Index_247", "1 Issue");
+ addStringLocalization("Interaction_DESCRIPTION_Index_248", "2 Issues");
+ addStringLocalization("Interaction_DESCRIPTION_Index_249", "3 Issues");
+ addStringLocalization("Interaction_DESCRIPTION_Index_250", "4 Issues");
+ addStringLocalization("Interaction_DESCRIPTION_Index_251", "5 Issues");
+ addStringLocalization("Interaction_DESCRIPTION_Index_252", "Rotor < 80%");
+ addStringLocalization("Interaction_DESCRIPTION_Index_253", "Rotor < 100%");
+ addStringLocalization("Interaction_DESCRIPTION_Index_254", "Detect slot#");
+ addStringLocalization("Interaction_DESCRIPTION_Index_254.1", "Internal slot#");
+ addStringLocalization("Interaction_DESCRIPTION_Index_255", "Adjacent slot#");
+ addStringLocalization("Interaction_DESCRIPTION_Index_256", "Universal Storage");
+ addStringLocalization("Interaction_DESCRIPTION_Index_257", "Electricity Storage");
+ addStringLocalization("Interaction_DESCRIPTION_Index_258", "Steam Storage");
+ addStringLocalization("Interaction_DESCRIPTION_Index_259", "Average Electric Input");
+ addStringLocalization("Interaction_DESCRIPTION_Index_260", "Average Electric Output");
+ addStringLocalization("Interaction_DESCRIPTION_Index_261", "Electricity Storage(Including Batteries)");
+ addStringLocalization("Interaction_DESCRIPTION_Index_262", "Fluid Auto Output Disabled");
+ addStringLocalization("Interaction_DESCRIPTION_Index_263", "Fluid Auto Output Enabled");
+ addStringLocalization("Interaction_DESCRIPTION_Index_264", "currently none, will be locked to the next that is put in");
+ addStringLocalization("Interaction_DESCRIPTION_Index_265", "1 specific Fluid");
+ addStringLocalization("Interaction_DESCRIPTION_Index_266", "Lock Fluid Mode Disabled");
+ addStringLocalization("Interaction_DESCRIPTION_Index_267", "Overflow Voiding Mode Disabled");
+ addStringLocalization("Interaction_DESCRIPTION_Index_268", "Overflow Voiding Mode Enabled");
+ addStringLocalization("Interaction_DESCRIPTION_Index_269", "Void Full Mode Disabled");
+ addStringLocalization("Interaction_DESCRIPTION_Index_270", "Void Full Mode Enabled");
+ addStringLocalization("Interaction_DESCRIPTION_Index_271", "unspecified");
+ addStringLocalization("Interaction_DESCRIPTION_Index_272", "Recipe by: ");
+ addStringLocalization("Interaction_DESCRIPTION_Index_273", "Original Recipe by: ");
+ addStringLocalization("Interaction_DESCRIPTION_Index_274", "Modified by: ");
+ addStringLocalization("Interaction_DESCRIPTION_Index_275", "Original voltage: ");
+ addStringLocalization("Interaction_DESCRIPTION_Index_299", "Item Filter: ");
+ addStringLocalization("Interaction_DESCRIPTION_Index_300", "Filter Cleared!");
+ addStringLocalization("Interaction_DESCRIPTION_Index_300.1", "Fluid Lock Cleared.");
+ addStringLocalization("Interaction_DESCRIPTION_Index_301", "Universal");
+ addStringLocalization("Interaction_DESCRIPTION_Index_302", "Int. EU");
+ addStringLocalization("Interaction_DESCRIPTION_Index_303", "Steam");
+ addStringLocalization("Interaction_DESCRIPTION_Index_304", "Avg. Input");
+ addStringLocalization("Interaction_DESCRIPTION_Index_305", "Avg. Output");
+ addStringLocalization("Interaction_DESCRIPTION_Index_306", "EU stored");
+ addStringLocalization("Interaction_DESCRIPTION_Index_307", "Deny input, Filter output");
+ addStringLocalization("Interaction_DESCRIPTION_Index_308", "Deny input, Invert output");
+ addStringLocalization("Interaction_DESCRIPTION_Index_309", "Permit any input, Filter output");
+ addStringLocalization("Interaction_DESCRIPTION_Index_310", "Permit any input, Invert output");
+ addStringLocalization("Interaction_DESCRIPTION_Index_311", "Block Output");
+ addStringLocalization("Interaction_DESCRIPTION_Index_312", "Allow Output");
+ addStringLocalization("Interaction_DESCRIPTION_Index_313", "Block Input");
+ addStringLocalization("Interaction_DESCRIPTION_Index_314", "Allow Input");
+ addStringLocalization("Interaction_DESCRIPTION_Index_315", "Filter Empty");
+ addStringLocalization("Interaction_DESCRIPTION_Index_316", "Pump speed limit reached!");
+ addStringLocalization("Interaction_DESCRIPTION_Index_317", "Filter: ");
+ addStringLocalization("Interaction_DESCRIPTION_Index_318", "Check Mode");
+ addStringLocalization("Interaction_DESCRIPTION_Index_319", "Any player");
+ addStringLocalization("Interaction_DESCRIPTION_Index_320", "Other players");
+ addStringLocalization("Interaction_DESCRIPTION_Index_321", "Only owner");
+ addStringLocalization("Interaction_DESCRIPTION_Index_322", "Overflow point: ");
+ addStringLocalization("Interaction_DESCRIPTION_Index_323", "L");
+ addStringLocalization("Interaction_DESCRIPTION_Index_324", "Now");
+ addStringLocalization("Interaction_DESCRIPTION_Index_325", "Max");
+ addStringLocalization("Interaction_DESCRIPTION_Index_326", "Public");
+ addStringLocalization("Interaction_DESCRIPTION_Index_327", "Private");
+ addStringLocalization("Interaction_DESCRIPTION_Index_328", "Channel");
+ addStringLocalization("Interaction_DESCRIPTION_Index_329", "Public/Private");
addStringLocalization("Interaction_DESCRIPTION_Index_500", "Fitting: Loose - More Flow");
addStringLocalization("Interaction_DESCRIPTION_Index_501", "Fitting: Tight - More Efficiency");
+ addStringLocalization("Interaction_DESCRIPTION_Index_502", "Mining chunk loading enabled");
+ addStringLocalization("Interaction_DESCRIPTION_Index_503", "Mining chunk loading disabled");
+ addStringLocalization("Interaction_DESCRIPTION_Index_505", "Enable with Signal (Safe)");
+ addStringLocalization("Interaction_DESCRIPTION_Index_506", "Disable with Signal (Safe)");
+ addStringLocalization("Interaction_DESCRIPTION_Index_507", "Safe Mode");
+ addStringLocalization("Interaction_DESCRIPTION_Index_601", "Use Private Frequency");
+ addStringLocalization("Interaction_DESCRIPTION_Index_756", "Connectable: ");
+ addStringLocalization("Interaction_DESCRIPTION_Index_ALL", "All");
+ addStringLocalization("Interaction_DESCRIPTION_Index_ANY", "Any");
+ addStringLocalization("Interaction_DESCRIPTION_Index_INVERTED", "Inverted");
+ addStringLocalization("Interaction_DESCRIPTION_Index_NORMAL", "Normal");
+ addStringLocalization("Interaction_DESCRIPTION_Index_SIDE", "Side: ");
addStringLocalization("Item_DESCRIPTION_Index_000", "Stored Heat: %s");
addStringLocalization("Item_DESCRIPTION_Index_001", "Durability: %s/%s");
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java
index 7d824565cb..fb556989c1 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java
@@ -359,7 +359,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
this.getFontRenderer()
.drawString(
- GT_Utility.trans("254", "Internal slot#"),
+ GT_Utility.trans("254.1", "Internal slot#"),
startX + spaceX * 3,
4 + startY + spaceY * 1,
textColor);
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java b/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java
index 1332fa66c6..8c52ade5d2 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java
@@ -64,10 +64,10 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
aCoverVariable.mFlags = ((aCoverVariable.mFlags + 1) & 15);
GT_Utility.sendChatToPlayer(
aPlayer,
- ((aCoverVariable.mFlags & 1) != 0 ? GT_Utility.trans("128", "Redstone ") : "")
- + ((aCoverVariable.mFlags & 2) != 0 ? GT_Utility.trans("129", "Energy ") : "")
- + ((aCoverVariable.mFlags & 4) != 0 ? GT_Utility.trans("130", "Fluids ") : "")
- + ((aCoverVariable.mFlags & 8) != 0 ? GT_Utility.trans("131", "Items ") : ""));
+ ((aCoverVariable.mFlags & 1) != 0 ? GT_Utility.trans("128.1", "Redstone ") : "")
+ + ((aCoverVariable.mFlags & 2) != 0 ? GT_Utility.trans("129.1", "Energy ") : "")
+ + ((aCoverVariable.mFlags & 4) != 0 ? GT_Utility.trans("130.1", "Fluids ") : "")
+ + ((aCoverVariable.mFlags & 8) != 0 ? GT_Utility.trans("131.1", "Items ") : ""));
return aCoverVariable;
}
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
index fa20d8206e..2d6fc685c3 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
@@ -461,7 +461,7 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
textColor);
this.getFontRenderer()
.drawString(
- GT_Utility.trans("229", "Conditional"),
+ GT_Utility.trans("230", "Conditional"),
startX + spaceX * 4,
4 + startY + spaceY * 1,
textColor);
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java b/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java
index aee762f36c..2fa545d76d 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java
@@ -130,8 +130,8 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilte
GT_Utility.sendChatToPlayer(
aPlayer,
aCoverVariable.mWhitelist
- ? GT_Utility.trans("125", "Whitelist Mode")
- : GT_Utility.trans("124", "Blacklist Mode"));
+ ? GT_Utility.trans("125.1", "Whitelist Mode")
+ : GT_Utility.trans("124.1", "Blacklist Mode"));
return aCoverVariable;
}
@@ -290,8 +290,8 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilte
startY + spaceY * 0,
GT_GuiIcon.WHITELIST,
GT_GuiIcon.BLACKLIST,
- GT_Utility.trans("125", "Whitelist Mode"),
- GT_Utility.trans("124", "Blacklist Mode"));
+ GT_Utility.trans("125.1", "Whitelist Mode"),
+ GT_Utility.trans("124.1", "Blacklist Mode"));
itemFilterButtons =
new GT_GuiFakeItemButton(this, startX + spaceX * 0, startY + spaceY * 2, GT_GuiIcon.SLOT_GRAY);
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java b/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
index 338a214ada..a77119b413 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
@@ -97,10 +97,10 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior {
}
switch (aCoverVariable) {
case 0:
- GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("068", "Emit if any Player is close"));
+ GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("068.1", "Emit if any Player is close"));
break;
case 1:
- GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("069", "Emit if other Player is close"));
+ GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("069.1", "Emit if other Player is close"));
break;
case 2:
GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("070", "Emit if you are close"));
@@ -181,9 +181,9 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior {
this.coverVariable = aCoverVariable;
new GT_GuiIconCheckButton(this, 0, startX + spaceX * 0, startY + spaceY * 0, GT_GuiIcon.CHECKMARK, null)
- .setTooltipText(GT_Utility.trans("068", "Emit if any Player is close"));
+ .setTooltipText(GT_Utility.trans("068.1", "Emit if any Player is close"));
new GT_GuiIconCheckButton(this, 1, startX + spaceX * 0, startY + spaceY * 1, GT_GuiIcon.CHECKMARK, null)
- .setTooltipText(GT_Utility.trans("069", "Emit if other Player is close"));
+ .setTooltipText(GT_Utility.trans("069.1", "Emit if other Player is close"));
new GT_GuiIconCheckButton(this, 2, startX + spaceX * 0, startY + spaceY * 2, GT_GuiIcon.CHECKMARK, null)
.setTooltipText(GT_Utility.trans("070", "Emit if you are close"));
}
diff --git a/src/main/java/gregtech/common/gui/GT_Container_OutputHatch.java b/src/main/java/gregtech/common/gui/GT_Container_OutputHatch.java
index 135c20dafe..e42e145eb3 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_OutputHatch.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_OutputHatch.java
@@ -36,7 +36,7 @@ public class GT_Container_OutputHatch extends GT_Container_BasicTank {
if (tReadyLockFluid == null
|| (tMode >= 8 && tReadyLockFluid.getFluid().getName().equals(tHatch.getLockedFluidName()))) {
tHatch.setLockedFluidName(null);
- GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("300", "Fluid Lock Cleared."));
+ GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("300.1", "Fluid Lock Cleared."));
tHatch.lockFluid(false);
} else {
tHatch.setLockedFluidName(tReadyLockFluid.getFluid().getName());
diff --git a/src/main/java/gregtech/common/power/Power.java b/src/main/java/gregtech/common/power/Power.java
index eac33e7997..9ce749801d 100644
--- a/src/main/java/gregtech/common/power/Power.java
+++ b/src/main/java/gregtech/common/power/Power.java
@@ -39,7 +39,7 @@ public abstract class Power {
}
public String getDurationStringTicks() {
- return GT_Utility.formatNumbers(getDurationTicks()) + GT_Utility.trans("224", " ticks");
+ return GT_Utility.formatNumbers(getDurationTicks()) + GT_Utility.trans("209", " ticks");
}
public abstract String getTotalPowerString();
diff --git a/src/main/java/gregtech/common/power/UnspecifiedEUPower.java b/src/main/java/gregtech/common/power/UnspecifiedEUPower.java
index c2e3615ad1..5ac85adfee 100644
--- a/src/main/java/gregtech/common/power/UnspecifiedEUPower.java
+++ b/src/main/java/gregtech/common/power/UnspecifiedEUPower.java
@@ -3,8 +3,8 @@ package gregtech.common.power;
import gregtech.api.util.GT_Utility;
public class UnspecifiedEUPower extends EUPower {
- private final String VOLTAGE = GT_Utility.trans("156", "unspecified");
- private final String AMPERAGE = GT_Utility.trans("157", "unspecified");
+ private final String VOLTAGE = GT_Utility.trans("271", "unspecified");
+ private final String AMPERAGE = GT_Utility.trans("271", "unspecified");
public UnspecifiedEUPower(byte tier, int amperage) {
super(tier, amperage);
diff --git a/src/main/java/gregtech/nei/GT_NEI_AssLineHandler.java b/src/main/java/gregtech/nei/GT_NEI_AssLineHandler.java
index e75b5e3ad0..90b0532bbc 100644
--- a/src/main/java/gregtech/nei/GT_NEI_AssLineHandler.java
+++ b/src/main/java/gregtech/nei/GT_NEI_AssLineHandler.java
@@ -322,7 +322,7 @@ public class GT_NEI_AssLineHandler extends RecipeMapHandler {
10,
y,
EnumChatFormatting.ITALIC
- + GT_Utility.trans("226", "Original Recipe by: ")
+ + GT_Utility.trans("273", "Original Recipe by: ")
+ recipe.owners.get(0).getName(),
0xFF000000);
y += 10;
@@ -331,7 +331,7 @@ public class GT_NEI_AssLineHandler extends RecipeMapHandler {
10,
y,
EnumChatFormatting.ITALIC
- + GT_Utility.trans("227", "Modified by: ")
+ + GT_Utility.trans("274", "Modified by: ")
+ recipe.owners.get(i).getName(),
0xFF000000);
y += 10;
@@ -341,7 +341,7 @@ public class GT_NEI_AssLineHandler extends RecipeMapHandler {
10,
y,
EnumChatFormatting.ITALIC
- + GT_Utility.trans("225", "Recipe by: ")
+ + GT_Utility.trans("272", "Recipe by: ")
+ recipe.owners.get(0).getName(),
0xFF000000);
y += 10;
diff --git a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
index 1675c50b43..d5c59c61c6 100644
--- a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
+++ b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
@@ -394,7 +394,7 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
originalPower.computePowerUsageAndDuration(recipe.mEUt, recipe.mDuration);
drawLine(
lineCounter,
- GT_Utility.trans("228", "Original voltage: ") + originalPower.getVoltageString());
+ GT_Utility.trans("275", "Original voltage: ") + originalPower.getVoltageString());
lineCounter++;
}
}
@@ -452,14 +452,14 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
drawLine(
lineCounter,
EnumChatFormatting.ITALIC
- + GT_Utility.trans("226", "Original Recipe by: ")
+ + GT_Utility.trans("273", "Original Recipe by: ")
+ recipe.owners.get(0).getName());
lineCounter++;
for (int i = 1; i < recipe.owners.size(); i++) {
drawLine(
lineCounter,
EnumChatFormatting.ITALIC
- + GT_Utility.trans("227", "Modified by: ")
+ + GT_Utility.trans("274", "Modified by: ")
+ recipe.owners.get(i).getName());
lineCounter++;
}
@@ -467,7 +467,7 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
drawLine(
lineCounter,
EnumChatFormatting.ITALIC
- + GT_Utility.trans("225", "Recipe by: ")
+ + GT_Utility.trans("272", "Recipe by: ")
+ recipe.owners.get(0).getName());
lineCounter++;
}
@@ -502,7 +502,7 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler {
} else if (specialValue == -201) {
specialInfo = GT_Utility.trans("206", "Scan for Assembly Line");
} else if (specialValue == -300 && GT_Mod.gregtechproxy.mEnableCleanroom) {
- specialInfo = GT_Utility.trans("160", "Needs Cleanroom & LowGrav");
+ specialInfo = GT_Utility.trans("160.1", "Needs Cleanroom & LowGrav");
} else if (specialValue == -400) {
specialInfo = GT_Utility.trans("216", "Deprecated Recipe");
} else if (hasSpecialValueFormat()) {