Merge branch '6.0' into crater

# Conflicts: # core/assets/icons/icons.properties # core/assets/sprites/block_colors.png # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites2.png # core/assets/sprites/sprites4.png # core/assets/sprites/sprites6.png
2020-04-16 22:38:51 +02:00
parent 1acc6461e6 280f3dd428
commit 32e32ecae2
19 changed files with 373 additions and 10 deletions
@@ -1194,7 +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 \uf81c moves items in batches.\nOnly accepts items at the back.\nLoads & unloads on all 3 sides.
+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.
@@ -225,6 +225,8 @@
 63519=ground-factory|block-ground-factory-medium
 63518=legacy-unit-factory|block-legacy-unit-factory-medium
 63517=mass-conveyor|block-mass-conveyor-medium
-63516=crater|crater
-63515=plastanium-conveyor|block-plastanium-conveyor-medium
-63514=legacy-command-center|block-legacy-command-center-medium
+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