Merge branch 'crater' of https://github.com/Quezler/Mindustry into Quezler-crater

2020-04-24 15:46:32 -04:00
parent 32a182cd01 cf186e0219
commit 21946cafd1
25 changed files with 8194 additions and 7785 deletions
@@ -958,6 +958,7 @@ block.hail.name = Hail
 block.lancer.name = Lancer
 block.conveyor.name = Conveyor
 block.titanium-conveyor.name = Titanium Conveyor
+block.plastanium-conveyor.name = Plastanium Conveyor
 block.armored-conveyor.name = Armored Conveyor
 block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyor belts.
 block.junction.name = Junction
@@ -1193,6 +1194,7 @@ block.force-projector.description = Creates a hexagonal force field around itsel
 block.shock-mine.description = Damages enemies stepping on the mine. Nearly invisible to the enemy.
 block.conveyor.description = Basic item transport block. Moves items forward and automatically deposits them into blocks. Rotatable.
 block.titanium-conveyor.description = Advanced item transport block. Moves items faster than standard conveyors.
+block.plastanium-conveyor.description = The \uf818 moves items in batches.\nOnly accepts items at the back.\nLoads & unloads on all 3 sides.
 block.junction.description = Acts as a bridge for two crossing conveyor belts. Useful in situations with two different conveyors carrying different materials to different locations.
 block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building.
 block.phase-conveyor.description = Advanced item transport block. Uses power to teleport items to a connected phase conveyor over several tiles.
@@ -228,3 +228,5 @@
 63516=legacy-command-center|block-legacy-command-center-medium
 63515=block-forge|block-block-forge-medium
 63514=block-launcher|block-block-launcher-medium
+63513=plastanium-conveyor|block-plastanium-conveyor-medium
+63512=crater|crater