diff --git a/core/assets/version.properties b/core/assets/version.properties index df8d6888bb..7ff1162d00 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Thu Feb 15 19:14:34 EST 2018 +#Fri Feb 16 11:30:06 EST 2018 version=beta -androidBuildCode=230 +androidBuildCode=234 name=Mindustry code=3.3 -build=22 +build=custom build diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Conveyor.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Conveyor.java index 2262004cd0..b412551773 100644 --- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/Conveyor.java +++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/Conveyor.java @@ -163,6 +163,10 @@ public class Conveyor extends Block{ long result = ItemPos.packItem(item, y*0.9f, pos, (byte)Mathf.random(255)); boolean inserted = false; + if(pos <= 0.00001f && entity.minitem <= 0.001f){ + return; //TODO low fps stacked items: what now? + } + for(int i = 0; i < entity.convey.size; i ++){ if(compareItems(result, entity.convey.get(i)) < 0){ entity.convey.insert(i, result);