Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2020-02-06 20:25:17 -05:00

View File

@@ -59,7 +59,7 @@ public class Blocks implements ContentList{
//transport
conveyor, titaniumConveyor, armoredConveyor, distributor, junction, itemBridge, phaseConveyor, sorter, invertedSorter, router, overflowGate, underflowGate, massDriver,
//liquids
//liquid
mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, platedConduit, liquidRouter, liquidTank, liquidJunction, bridgeConduit, phaseConduit,
//power