Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha

2020-10-06 10:06:06 +02:00
parent bf4b01e46c c87f0c27b3
commit 91875ec45f
47 changed files with 781 additions and 226 deletions
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -638,6 +638,8 @@ bar.progress = Build Progress
 bar.input = Input
 bar.output = Output

+units.processorcontrol = [lightgray]Processor Controlled
+
 bullet.damage = [stat]{0}[lightgray] damage
 bullet.splashdamage = [stat]{0}[lightgray] area dmg ~[stat] {1}[lightgray] tiles
 bullet.incendiary = [stat]incendiary