Merged with master

This commit is contained in:
Anuken
2020-02-09 12:27:44 -05:00
84 changed files with 488 additions and 413 deletions

View File

@ -58,7 +58,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