mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-19 19:59:58 +00:00
Merge branch 'master' into 1.7
Conflicts: src/main/java/crazypants/enderio/EnderIO.java src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java
This commit is contained in:
commit
1bb3dbabc7
9 files changed
+42
-26
No files matched your search
@@ -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**.
|
||||
+11
-1
@@ -1,5 +1,15 @@
|
||||
0.11.3
|
||||
- #523 Crash
|
||||
- #524 Ender IO Item conduits are eating items
|
||||
|
||||
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
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
<property name="mc.version" value="1.6.4"/>
|
||||
<property name="forge.version" value="9.11.1.953"/>
|
||||
<property name="project.version" value="0.11.1"/>
|
||||
<property name="project.version" value="0.11.3"/>
|
||||
|
||||
<property name="forge.name" value="minecraftforge-src-${mc.version}-${forge.version}.zip"/>
|
||||
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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=不能接收
|
||||
@@ -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.3",
|
||||
"mcversion": "1.6.4",
|
||||
"url": "http://www.minecraftforum.net/topic/1937619-162152-ender-io-how-many-pipes-in-one-block-updated-198/",
|
||||
"updateUrl": "",
|
||||
|
||||
@@ -110,18 +110,15 @@ public class ItemConduitNetwork extends AbstractConduitNetwork<IItemConduit, IIt
|
||||
|
||||
BlockCoord loc = itemConduit.getLocation().getLocation(side);
|
||||
|
||||
ItemStack result = null;
|
||||
ItemStack result = item.copy();
|
||||
List<NetworkedInventory> 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) {
|
||||
return null;
|
||||
}
|
||||
if(result == null) {
|
||||
result = item.copy();
|
||||
}
|
||||
result.stackSize -= numInserted;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -241,7 +241,7 @@ public class NetworkPowerManager {
|
||||
for (IPowerConduit con : network.getConduits()) {
|
||||
if(con.hasExternalConnections()) {
|
||||
PowerTracker tracker = getOrCreateTracker(con);
|
||||
tracker.tickStart((float) con.getPowerHandler().getEnergyStored());
|
||||
tracker.tickStart(con.getEnergyStored());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -273,7 +273,7 @@ public class NetworkPowerManager {
|
||||
for (IPowerConduit con : network.getConduits()) {
|
||||
if(con.hasExternalConnections()) {
|
||||
PowerTracker tracker = getOrCreateTracker(con);
|
||||
tracker.tickEnd((float) con.getPowerHandler().getEnergyStored());
|
||||
tracker.tickEnd(con.getEnergyStored());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user