Merge remote-tracking branch 'origin/7.0-features' into 7.0-features

core/assets/bundles/bundle.properties

@@ -1942,12 +1942,12 @@ block.cyanogen-synthesizer.name = Cyanogen Synthesizer
 block.phase-synthesizer.name = Phase Synthesizer
 block.heat-reactor.name = Heat Reactor
 block.beryllium-wall.name = Beryllium Wall
-block.beryllium-wall-large.name = Beryllium Wall Large
+block.beryllium-wall-large.name = Large Beryllium Wall
 block.tungsten-wall.name = Tungsten Wall
-block.tungsten-wall-large.name = Tungsten Wall Large
+block.tungsten-wall-large.name = Large Tungsten Wall
 block.blast-door.name = Blast Door
 block.carbide-wall.name = Carbide Wall
-block.carbide-wall-large.name = Carbide Wall Large
+block.carbide-wall-large.name = Large Carbide Wall
 block.radar.name = Radar
 block.build-tower.name = Build Tower
 block.regen-projector.name = Regen Projector
@@ -2002,6 +2002,12 @@ block.small-deconstructor.name = Small Deconstructor
 block.canvas.name = Canvas
 block.world-processor.name = World Processor
 block.world-cell.name = World Cell
+block.shield-breaker.name = Shield Breaker
+block.tank-fabricator.name = Tank Fabricator
+block.mech-fabricator.name = Mech Fabricator
+block.ship-fabricator.name = Ship Fabricator
+block.basic-reconstructor.name = Basic Reconstructor
+block.unit-repair-tower.name = Unit Repair Tower
 status.slow.name = Slow
 status.shielded.name = Shielded
 status.corroded.name = Corroded
@@ -2015,15 +2021,18 @@ unit.bulwark.name = Bulwark
 unit.krepost.name = Krepost
 unit.avert.name = Avert
 unit.quell.name = Quell
-unit.quell-missile.name = Quell Missile
 unit.disrupt.name = Disrupt
-unit.disrupt-missile.name = Disrupt Missile
 unit.evoke.name = Evoke
 unit.incite.name = Incite
 unit.emanate.name = Emanate
 unit.manifold.name = Manifold
 unit.assembly-drone.name = Assembly Drone
 unit.effect-drone.name = Effect Drone
+unit.precept.name = Precept
+unit.merui.name = Merui
+unit.anthicus.name = Anthicus
+unit.osc.name = Osc
+unit.obviate.name = Obviate
 sector.two.name = Two
 sector.three.name = Three
 sector.four.name = Four

core/assets/icons/icons.properties

@@ -557,3 +557,4 @@
 63135=unit-repair-tower|block-unit-repair-tower-ui
 63134=merui|unit-merui-ui
 63133=osc|unit-osc-ui
+63132=precept|unit-precept-ui