From e55d6d1d8b3905f23190cc8a32b9353a64f5fb28 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sun, 10 May 2015 00:01:00 +0200 Subject: [PATCH 1/2] #2441 Use the correct variable names for the slots --- .../enderio/conduit/gui/ExternalConnectionContainer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java index e5b93c49..b4a0fdc9 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java +++ b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java @@ -64,12 +64,12 @@ public class ExternalConnectionContainer extends Container { x = 10; y = 47; - slotInputFilterUpgrades = addSlotToContainer(new FilterSlot(ui, 3, x, y)); + slotOutputFilterUpgrades = addSlotToContainer(new FilterSlot(ui, 3, x, y)); slotLocations.add(new Point(x, y)); x = 10; y = 47; - slotOutputFilterUpgrades = addSlotToContainer(new FilterSlot(ui, 2, x, y)); + slotInputFilterUpgrades = addSlotToContainer(new FilterSlot(ui, 2, x, y)); slotLocations.add(new Point(x, y)); x = 28; From 6ac625e62db44d0a15f981ee0efdf412447621e7 Mon Sep 17 00:00:00 2001 From: downslope7 Date: Sat, 9 May 2015 17:53:40 -0500 Subject: [PATCH 2/2] Fix config typos, closes #2447 --- src/main/java/crazypants/enderio/config/Config.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 4e94d81b..baeec75f 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -712,9 +712,9 @@ public final class Config { "Travel Anchors send a chat warning when skipping inaccessible anchors").getBoolean(travelAnchorSkipWarning); travelStaffMaxDistance = config.get(sectionStaff.name, "travelStaffMaxDistance", travelStaffMaxDistance, - "Maximum number of blocks that can be traveled using the Staff of the Traveling.").getInt(travelStaffMaxDistance); + "Maximum number of blocks that can be traveled using the Staff of Traveling.").getInt(travelStaffMaxDistance); travelStaffPowerPerBlockRF = (float) config.get(sectionStaff.name, "travelStaffPowerPerBlockRF", travelStaffPowerPerBlockRF, - "Number of RF required per block travelled using the Staff of the Traveling.").getDouble(travelStaffPowerPerBlockRF); + "Number of RF required per block traveled using the Staff of Traveling.").getDouble(travelStaffPowerPerBlockRF); travelStaffMaxBlinkDistance = config.get(sectionStaff.name, "travelStaffMaxBlinkDistance", travelStaffMaxBlinkDistance, "Max number of blocks teleported when shift clicking the staff.").getInt(travelStaffMaxBlinkDistance); @@ -1060,7 +1060,7 @@ public final class Config { "If true the magnet can be put into the 'amulet' Baubles slot even if switched off (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)").getBoolean(magnetAllowDeactivatedInBaublesSlot); magnetBaublesType = config.get(sectionMagnet.name, "magnetBaublesType", magnetBaublesType, - "The BaulesType the magnet should be, 'AMULET', 'RING' or 'BELT' (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)").getString(); + "The BaublesType the magnet should be, 'AMULET', 'RING' or 'BELT' (requires Baubles to be installed and magnetAllowInBaublesSlot to be on)").getString(); useCombustionGenModel = config.get(sectionAesthetic.name, "useCombustionGenModel", useCombustionGenModel, "If set to true: WIP Combustion Generator model will be used").getBoolean(useCombustionGenModel); @@ -1239,7 +1239,7 @@ public final class Config { "When set to true a list of all registered mobs will be dumped to config/enderio/mobTypes.txt The names are in the format required by EIOs mob blacklists."); xpObeliskMaxXpLevel = config.get(sectionMisc.name, "xpObeliskMaxXpLevel", xpObeliskMaxXpLevel, "Maximum level of XP the xp obelisk can contain.").getInt(); - xpJuiceName = config.getString("xpJuiceName", sectionMisc.name, xpJuiceName, "Id of liquid XP fluid (WARNING: only for users who know what they are doing - changing this id can break worlds) - this should match the with OpenBlocks when installed"); + xpJuiceName = config.getString("xpJuiceName", sectionMisc.name, xpJuiceName, "Id of liquid XP fluid (WARNING: only for users who know what they are doing - changing this id can break worlds) - this should match with OpenBlocks when installed"); clearGlassSameTexture = config.getBoolean("clearGlassSameTexture", sectionMisc.name, clearGlassSameTexture, "If true, quite clear glass will use the fused quartz border texture for the block instead of the white border."); clearGlassConnectToFusedQuartz = config.getBoolean("clearGlassConnectToFusedQuartz", sectionMisc.name, clearGlassConnectToFusedQuartz, "If true, quite clear glass will connect textures with fused quartz.");