Merge remote-tracking branch 'origin/master'

README.md

@@ -6,7 +6,8 @@
 A sandbox tower defense game written in Java.
 
 _[Trello Board](https://trello.com/b/aE2tcUwF/mindustry-40-plans)_  
-_[Wiki](https://mindustrygame.github.io/wiki)_ 
+_[Wiki](https://mindustrygame.github.io/wiki)_  
+_[Javadoc](https://mindustrygame.github.io/docs/)_ 
 
 ### Contributing
 

core/assets/bundles/bundle.properties

@@ -1025,6 +1025,19 @@ block.meltdown.name = Meltdown
 block.container.name = Container
 block.launch-pad.name = Launch Pad
 block.launch-pad-large.name = Large Launch Pad
+block.segment.name = Segment
+block.ground-factory.name = Ground Factory
+block.air-factory.name = Air Factory
+block.naval-factory.name = Naval Factory
+block.additive-reconstructor.name = Additive Reconstructor
+block.multiplicative-reconstructor.name = Multiplicative Reconstructor
+block.exponential-reconstructor.name = Exponential Reconstructor
+block.tetrative-reconstructor.name = Tetrative Reconstructor
+block.mass-conveyor.name = Mass Conveyor
+block.payload-router.name = Payload Router
+block.disassembler.name = Disassembler
+block.silicon-crucible.name = Silicon Crucible
+block.large-overdrive-projector.name = Large Overdrive Projector
 team.blue.name = blue
 team.crux.name = red
 team.sharded.name = orange
@@ -1212,4 +1225,5 @@ block.spectre.description = A massive dual-barreled cannon. Shoots large armor-p
 block.meltdown.description = A massive laser cannon. Charges and fires a persistent laser beam at nearby enemies. Requires coolant to operate.
 block.command-center.description = Issues movement commands to allied units across the map.\nCauses units to rally, attack an enemy core or retreat to the core/factory. When no enemy core is present, units will default to patrolling under the attack command.
 block.repair-point.description = Continuously heals the closest damaged unit in its vicinity.
+block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.