From 6f0136c54a7636f3d5a6367dcdcb58f2a720c98e Mon Sep 17 00:00:00 2001 From: mymagadsl Date: Wed, 26 Feb 2014 19:49:14 +0800 Subject: [PATCH 1/7] Update and rename zh_TW to zh_TW.lang Correction code en_US different error, and correct the file name. --- .../assets/enderio/lang/{zh_TW => zh_TW.lang} | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) rename resources/assets/enderio/lang/{zh_TW => zh_TW.lang} (93%) diff --git a/resources/assets/enderio/lang/zh_TW b/resources/assets/enderio/lang/zh_TW.lang similarity index 93% rename from resources/assets/enderio/lang/zh_TW rename to resources/assets/enderio/lang/zh_TW.lang index c90ccf6e..1ebec5eb 100644 --- a/resources/assets/enderio/lang/zh_TW +++ b/resources/assets/enderio/lang/zh_TW.lang @@ -82,15 +82,15 @@ enderio.enderCapacitor.name=八合一電容器 //Machines -enderio.blockStirlingGenerator.name=斯特林發電機 -enderio.blockReservoir.name=蓄水池 -enderio.blockAlloySmelter.name=合金冶煉機 -enderio.blockSolarPanel.name=光電池 -enderio.blockElectricLight.name=充能燈 -enderio.blockCapacitorBank.name=電容組 -enderio.blockCrusher.name=半自磨機 -enderio.blockHyperCube.name=跨位面收發器 -enderio.blockPowerMonitor.name=能量顯示器 +tile.enderio.blockStirlingGenerator.name=斯特林發電機 +tile.enderio.blockReservoir.name=蓄水池 +tile.enderio.blockAlloySmelter.name=合金冶煉機 +tile.enderio.blockSolarPanel.name=光電池 +tile.enderio.blockElectricLight.name=充能燈 +tile.enderio.blockCapacitorBank.name=電容組 +tile.enderio.blockCrusher.name=半自磨機 +tile.enderio.blockHyperCube.name=跨位面收發器 +tile.enderio.blockPowerMonitor.name=能量顯示器 //Travel tile.enderio.blockTravelPlatform.name=旅行錨 @@ -110,8 +110,8 @@ enderio.blockCustomSlab=染色臺階 enderio.blockCustomDoubleSlab=染色臺階 //Items -enderio.itemYetaWrench.name=耶塔扳手 -enderio.itemMJReader.name=能量探頭 +item.enderio.itemYetaWrench.name=耶塔扳手 +item.enderio.itemMJReader.name=能量探頭 enderio.itemEnderface.wrongDimension=安德接口方塊處於不同位面. enderio.itemEnderface.tooFar=安德接口方塊距離太遠. @@ -160,7 +160,7 @@ enderio.gui.mjReader.noPowerFromSide=不能從這個側面獲得能量 enderio.gui.mjReader.connectionDir=連接到 enderio.gui.mjReader.extractedItems=抽取物品 enderio.gui.mjReader.extractedItem=物品 -enderio.gui.mjReader.noOutputs=有無有效輸出 +enderio.gui.mjReader.noOutputs=有無效輸出 enderio.gui.mjReader.insertedInto=將被插入到: enderio.gui.mjReader.noItems=沒有收到物品。 enderio.gui.mjReader.noItem=不能接收 From 0d467cb31d0845872b2248712777505a976e3d65 Mon Sep 17 00:00:00 2001 From: kostek00 Date: Thu, 27 Feb 2014 23:39:40 +0100 Subject: [PATCH 2/7] Update pl_PL.lang --- resources/assets/enderio/lang/pl_PL.lang | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/resources/assets/enderio/lang/pl_PL.lang b/resources/assets/enderio/lang/pl_PL.lang index f226cc8b..cdf8c466 100644 --- a/resources/assets/enderio/lang/pl_PL.lang +++ b/resources/assets/enderio/lang/pl_PL.lang @@ -209,6 +209,16 @@ enderio.gui.alloy.mode.all=Przetapiaj wszystko enderio.gui.alloy.mode.alloy=Tylko stopy enderio.gui.alloy.mode.furnace=Tylko jak zwykły piec +//Travel Blocks +enderio.gui.travelAccessable.privateBlock1=Można +enderio.gui.travelAccessable.privateBlock2=zmienić tylko te ustawienia. +enderio.gui.travelAccessable.public=Publiczny +enderio.gui.travelAccessable.private=Prywatny +enderio.gui.travelAccessable.protected=Chroniony +enderio.gui.travelAccessable.unauthorised=Nie masz dostępu do tego bloku. +enderio.gui.travelAccessable.enterCode=Podaj hasło +enderio.gui.travelAccessable.ok=Autoryzuj + //conduits enderio.gui.conduit.ioMode=Tryb enderio.gui.conduit.ioMode.inOut=Wej./Wyj. From 35e6a95c2c29e865d7d1f4445a4d84cc15cc8b7f Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 3 Mar 2014 18:30:43 +0800 Subject: [PATCH 3/7] 0.11.2 - #510 Travel distance config not working correctly - #511 Staff of Traveling not using power - #512 Capacitor banks not responding to redstone signals bug - #517 Item conduit filters fail when more than one conduit ends at one chest - #518 Crash when breaking a TE redstone conduit, connected to an EIO power conduit, which is connected to a Power Monitor. - #519 Can't shift-wrench to pick up certain TE blocks - #520 Alloy Smelter upgrade breaks ME interface 'blocking mode' --- ReleaseNotes.txt | 8 +++++++- build.xml | 2 +- common/crazypants/enderio/EnderIO.java | 18 +++++++++--------- resources/mcmod.info | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 621935e0..ed7fc558 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,5 +1,11 @@ 0.11.2 -- #518 Crash when breaking a TE redstone conduit, connected to an EIO power conduit, which is connected to a Power Monitor. +- #510 Travel distance config not working correctly +- #511 Staff of Traveling not using power +- #512 Capacitor banks not responding to redstone signals bug +- #517 Item conduit filters fail when more than one conduit ends at one chest +- #518 Crash when breaking a TE redstone conduit, connected to an EIO power conduit, which is connected to a Power Monitor. +- #519 Can't shift-wrench to pick up certain TE blocks +- #520 Alloy Smelter upgrade breaks ME interface 'blocking mode' 0.11.1 - #497 Alloy only mode broken diff --git a/build.xml b/build.xml index b2dab883..4aa37bcb 100644 --- a/build.xml +++ b/build.xml @@ -20,7 +20,7 @@ - + diff --git a/common/crazypants/enderio/EnderIO.java b/common/crazypants/enderio/EnderIO.java index 29aa71c3..1a48e953 100644 --- a/common/crazypants/enderio/EnderIO.java +++ b/common/crazypants/enderio/EnderIO.java @@ -70,7 +70,7 @@ import crazypants.enderio.teleport.TeleportRecipes; import crazypants.enderio.trigger.TriggerEnderIO; import crazypants.enderio.trigger.TriggerProviderEIO; -@Mod(name = "EnderIO", modid = "EnderIO", version = "0.11.1", dependencies = "required-after:Forge@[9.11.0.883,)") +@Mod(name = "EnderIO", modid = "EnderIO", version = "0.11.2", dependencies = "required-after:Forge@[9.11.0.883,)") @NetworkMod(clientSideRequired = true, serverSideRequired = true, channels = { "EnderIO" }, packetHandler = PacketHandler.class) public class EnderIO { @@ -210,25 +210,25 @@ public class EnderIO { //Register Custom Dungeon Loot here ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem( - new WeightedRandomChestContent(new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ELECTRICAL_STEEL.ordinal()), 1, 3, 60)); + new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.ELECTRICAL_STEEL.ordinal()), 1, 3, 60)); ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST) - .addItem(new WeightedRandomChestContent(new ItemStack(ModObject.itemYetaWrench.actualId, 1, 0), 1, 1, 15)); - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(ModObject.itemMJReader.actualId, 1, 0), 1, 1, 1)); + .addItem(new WeightedRandomChestContent(new ItemStack(EnderIO.itemYetaWench, 1, 0), 1, 1, 15)); + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(EnderIO.itemMJReader, 1, 0), 1, 1, 1)); - ItemStack staff = new ItemStack(ModObject.itemTravelStaff.actualId, 1, 0); + ItemStack staff = new ItemStack(EnderIO.itemTravelStaff, 1, 0); itemTravelStaff.setFull(staff); ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(staff, 1, 1, 30)); ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(Item.netherQuartz), 3, 16, 40)); ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(Item.netherStalkSeeds), 1, 4, 30)); ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(Item.enderPearl), 1, 2, 30)); ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem( - new WeightedRandomChestContent(new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.ELECTRICAL_STEEL.ordinal()), 5, 20, 50)); + new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.ELECTRICAL_STEEL.ordinal()), 5, 20, 50)); ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem( - new WeightedRandomChestContent(new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.REDSTONE_ALLOY.ordinal()), 3, 14, 35)); + new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.REDSTONE_ALLOY.ordinal()), 3, 14, 35)); ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem( - new WeightedRandomChestContent(new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.PHASED_IRON.ordinal()), 2, 6, 20)); + new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_IRON.ordinal()), 2, 6, 20)); ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem( - new WeightedRandomChestContent(new ItemStack(ModObject.itemAlloy.actualId, 1, Alloy.PHASED_GOLD.ordinal()), 2, 6, 10)); + new WeightedRandomChestContent(new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_GOLD.ordinal()), 2, 6, 10)); ChestGenHooks.getInfo(ChestGenHooks.VILLAGE_BLACKSMITH).addItem(new WeightedRandomChestContent(staff, 1, 1, 5)); ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_DESERT_CHEST).addItem(new WeightedRandomChestContent(staff, 1, 1, 20)); diff --git a/resources/mcmod.info b/resources/mcmod.info index c13168a5..ffeec00d 100644 --- a/resources/mcmod.info +++ b/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "EnderIO", "name": "Ender IO", "description": "Compact conduits, painted things and access to your stuff through an eye of ender.", - "version": "0.11.1", + "version": "0.11.2", "mcversion": "1.6.4", "url": "http://www.minecraftforum.net/topic/1937619-162152-ender-io-how-many-pipes-in-one-block-updated-198/", "updateUrl": "", From 5c7bca6e6964138c3871c10a6e85714048ccd7c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pedro?= Date: Mon, 3 Mar 2014 13:38:04 +0000 Subject: [PATCH 4/7] Fixing the README Fixed a typo in "license" and formatting the text a little bit. --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fbc0c584..2a862c42 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ EnderIO ======= -All code (excluding the build craft API, which is covered by the build craft liscence) is liscened under the WTFPL (Do What the Fuck You Want to Public License http://www.wtfpl.net/ ) -Do what you want with it, as long as you smile while doing so. While it is not a requirement, it would be nice to know if it is being used and how, so send me hello to crazypants.mc at gmail.com. - +All code (excluding the BuildCraft API, which is covered by the BuildCraft license) is licensed under the WTFPL (Do What the Fuck You Want to Public License http://www.wtfpl.net/). +Do what you want with it, as long as you smile while doing so. While it is not a requirement, it would be nice to know if it is being used and how, so send me hello to **crazypants.mc at gmail.com**. From edf0b9e8193f61cf7babc11cc0ea44a664444334 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 4 Mar 2014 09:50:17 +0800 Subject: [PATCH 5/7] #523 Crash --- .../crazypants/enderio/conduit/power/NetworkPowerManager.java | 4 ++-- .../crazypants/enderio/machine/monitor/GuiPowerMonitor.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/crazypants/enderio/conduit/power/NetworkPowerManager.java b/common/crazypants/enderio/conduit/power/NetworkPowerManager.java index c9101146..544a4cb5 100644 --- a/common/crazypants/enderio/conduit/power/NetworkPowerManager.java +++ b/common/crazypants/enderio/conduit/power/NetworkPowerManager.java @@ -242,7 +242,7 @@ public class NetworkPowerManager { for (IPowerConduit con : network.getConduits()) { if(con.hasExternalConnections()) { PowerTracker tracker = getOrCreateTracker(con); - tracker.tickStart(con.getPowerHandler().getEnergyStored()); + tracker.tickStart(con.getEnergyStored()); } } } @@ -274,7 +274,7 @@ public class NetworkPowerManager { for (IPowerConduit con : network.getConduits()) { if(con.hasExternalConnections()) { PowerTracker tracker = getOrCreateTracker(con); - tracker.tickEnd(con.getPowerHandler().getEnergyStored()); + tracker.tickEnd(con.getEnergyStored()); } } } diff --git a/common/crazypants/enderio/machine/monitor/GuiPowerMonitor.java b/common/crazypants/enderio/machine/monitor/GuiPowerMonitor.java index 5ba1289e..11b658fc 100644 --- a/common/crazypants/enderio/machine/monitor/GuiPowerMonitor.java +++ b/common/crazypants/enderio/machine/monitor/GuiPowerMonitor.java @@ -90,7 +90,7 @@ public class GuiPowerMonitor extends GuiScreenBase { @Override protected void updateText() { text.clear(); - text.add(formatPower(te.getPowerHandler().getEnergyStored()) + "/" + formatPower(te.getPowerHandler().getMaxEnergyStored()) + " " + text.add(formatPower(te.getEnergyStored()) + "/" + formatPower(te.getPowerHandler().getMaxEnergyStored()) + " " + PowerDisplayUtil.abrevation()); } From c555b756de117988a5c258cb06eb3cf22fe0e08c Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 4 Mar 2014 11:14:40 +0800 Subject: [PATCH 6/7] #524 Item conduits are eating items. --- .../enderio/conduit/item/ItemConduitNetwork.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/common/crazypants/enderio/conduit/item/ItemConduitNetwork.java b/common/crazypants/enderio/conduit/item/ItemConduitNetwork.java index fac33194..9d423f3f 100644 --- a/common/crazypants/enderio/conduit/item/ItemConduitNetwork.java +++ b/common/crazypants/enderio/conduit/item/ItemConduitNetwork.java @@ -111,12 +111,11 @@ public class ItemConduitNetwork extends AbstractConduitNetwork invs = getOrCreate(loc); for (NetworkedInventory inv : invs) { - if(inv.con.getLocation().equals(loc)) { - + if(inv.con.getLocation().equals(itemConduit.getLocation())) { int numInserted = inv.insertIntoTargets(item.copy()); if(numInserted >= item.stackSize) { //TODO: I was returning null here as per the API but quarries plus @@ -125,9 +124,6 @@ public class ItemConduitNetwork extends AbstractConduitNetwork Date: Tue, 4 Mar 2014 11:17:14 +0800 Subject: [PATCH 7/7] 0.11.3 - #523 Crash - #524 Ender IO Item conduits are eating items --- ReleaseNotes.txt | 4 ++++ build.xml | 2 +- common/crazypants/enderio/EnderIO.java | 2 +- resources/mcmod.info | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index ed7fc558..7cca3156 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,7 @@ +0.11.3 +- #523 Crash +- #524 Ender IO Item conduits are eating items + 0.11.2 - #510 Travel distance config not working correctly - #511 Staff of Traveling not using power diff --git a/build.xml b/build.xml index 4aa37bcb..f9080147 100644 --- a/build.xml +++ b/build.xml @@ -20,7 +20,7 @@ - + diff --git a/common/crazypants/enderio/EnderIO.java b/common/crazypants/enderio/EnderIO.java index 1a48e953..bafe5503 100644 --- a/common/crazypants/enderio/EnderIO.java +++ b/common/crazypants/enderio/EnderIO.java @@ -70,7 +70,7 @@ import crazypants.enderio.teleport.TeleportRecipes; import crazypants.enderio.trigger.TriggerEnderIO; import crazypants.enderio.trigger.TriggerProviderEIO; -@Mod(name = "EnderIO", modid = "EnderIO", version = "0.11.2", dependencies = "required-after:Forge@[9.11.0.883,)") +@Mod(name = "EnderIO", modid = "EnderIO", version = "0.11.3", dependencies = "required-after:Forge@[9.11.0.883,)") @NetworkMod(clientSideRequired = true, serverSideRequired = true, channels = { "EnderIO" }, packetHandler = PacketHandler.class) public class EnderIO { diff --git a/resources/mcmod.info b/resources/mcmod.info index ffeec00d..546fb1b0 100644 --- a/resources/mcmod.info +++ b/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "EnderIO", "name": "Ender IO", "description": "Compact conduits, painted things and access to your stuff through an eye of ender.", - "version": "0.11.2", + "version": "0.11.3", "mcversion": "1.6.4", "url": "http://www.minecraftforum.net/topic/1937619-162152-ender-io-how-many-pipes-in-one-block-updated-198/", "updateUrl": "",