Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2019-02-06 17:14:54 -05:00
4 changed files with 50 additions and 29 deletions
@@ -673,9 +673,10 @@ public class Blocks implements ContentList{
}};
junction = new Junction("junction"){{
requirements(Category.distribution, ItemStack.with(Items.copper, 2));
requirements(Category.distribution, ItemStack.with(Items.copper, 3));
speed = 26;
capacity = 32;
health = 25;
}};
itemBridge = new BufferedItemBridge("bridge-conveyor"){{