Merge branch 'master' into master

annotations/src/main/resources/classids.properties

@@ -35,6 +35,7 @@ poly=31
 pulsar=34
 quasar=32
 risse=33
+risso=41
 spirit=27
 spiroct=39
 tau=17

core/assets/bundles/bundle.properties

@@ -871,7 +871,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_be.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Цеплаёмістасць: {0}
 liquid.viscosity = [lightgray]Глейкасць: {0}
 liquid.temperature = [lightgray]Тэмпература: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_cs.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Rychlost těžení: {0}%
 unit.minepower = [lightgray]Těžební síla: {0}
 unit.ability = [lightgray]Schopnost: {0}
 unit.buildspeed = [lightgray]Rychlost stavění: {0}%
+
 liquid.heatcapacity = [lightgray]Teplotní kapacita: {0}[]
 liquid.viscosity = [lightgray]Viskozita: {0}[]
 liquid.temperature = [lightgray]Teplota: {0}[]
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_da.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Heat Capacity: {0}
 liquid.viscosity = [lightgray]Viscosity: {0}
 liquid.temperature = [lightgray]Temperature: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_de.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Wärmekapazität: {0}
 liquid.viscosity = [lightgray]Viskosität: {0}
 liquid.temperature = [lightgray]Temperatur: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_es.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Capacidad Térmica: {0}
 liquid.viscosity = [lightgray]Viscosidad: {0}
 liquid.temperature = [lightgray]Temperatura: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_et.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Soojusmahtuvus: {0}
 liquid.viscosity = [lightgray]Viskoossus: {0}
 liquid.temperature = [lightgray]Temperatuur: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_eu.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Bero edukiera: {0}
 liquid.viscosity = [lightgray]Likatasuna: {0}
 liquid.temperature = [lightgray]Tenperatura: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_fi.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Lämpökapasiteetti: {0}
 liquid.viscosity = [lightgray]Tahmeus: {0}
 liquid.temperature = [lightgray]Lämpö: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_fr.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Vitesse de Minage: {0}%
 unit.minepower = [lightgray]Puissance de Minage: {0}
 unit.ability = [lightgray]Abilité: {0}
 unit.buildspeed = [lightgray]Vitesse de Construction: {0}%
+
 liquid.heatcapacity = [lightgray]Capacité Thermique: {0}
 liquid.viscosity = [lightgray]Viscosité: {0}
 liquid.temperature = [lightgray]Température: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_fr_BE.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Capacité Thermique {0}
 liquid.viscosity = [lightgray]Viscosité: {0}
 liquid.temperature = [lightgray]Température: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_hu.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Hő hapacitás: {0}
 liquid.viscosity = [lightgray]Viszkozitás: {0}
 liquid.temperature = [lightgray]Hőmérséklet: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_in_ID.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Kapasitas Panas: {0}
 liquid.viscosity = [lightgray]Kelekatan: {0}
 liquid.temperature = [lightgray]Suhu: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_it.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Velocità di Scavo: {0}%
 unit.minepower = [lightgray]Potenza di Scavo: {0}
 unit.ability = [lightgray]Abilità: {0}
 unit.buildspeed = [lightgray]Velocità di Costruzione: {0}%
+
 liquid.heatcapacity = [lightgray]Capacità Termica: {0}
 liquid.viscosity = [lightgray]Viscosità: {0}
 liquid.temperature = [lightgray]Temperatura: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_ja.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]採掘速度: {0}%
 unit.minepower = [lightgray]採掘性能: {0}
 unit.ability = [lightgray]能力: {0}
 unit.buildspeed = [lightgray]建築速度: {0}%
+
 liquid.heatcapacity = [lightgray]熱容量: {0}
 liquid.viscosity = [lightgray]粘度: {0}
 liquid.temperature = [lightgray]温度: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_ko.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]채광 속도: {0}%
 unit.minepower = [lightgray]채광 레벨: {0}
 unit.ability = [lightgray]능력: {0}
 unit.buildspeed = [lightgray]건설 속도: {0}%
+
 liquid.heatcapacity = [lightgray]발열 용량: {0}
 liquid.viscosity = [lightgray]점도: {0}
 liquid.temperature = [lightgray]온도: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_lt.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Karščio Talpumas: {0}
 liquid.viscosity = [lightgray]Klampumas: {0}
 liquid.temperature = [lightgray]Temperatūra: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_nl.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Warmte Capaciteit: {0}
 liquid.viscosity = [lightgray]Viscositeit: {0}
 liquid.temperature = [lightgray]Tempratuur: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_nl_BE.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Heat Capacity: {0}
 liquid.viscosity = [lightgray]Viscosity: {0}
 liquid.temperature = [lightgray]Temperature: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_pl.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Prędkość kopania: {0}%
 unit.minepower = [lightgray]Moc kopania: {0}
 unit.ability = [lightgray]Umiejętność: {0}
 unit.buildspeed = [lightgray]Prędkość budowania: {0}%
+
 liquid.heatcapacity = [lightgray]Wytrzymałość na przegrzewanie: {0}
 liquid.viscosity = [lightgray]Lepkość: {0}
 liquid.temperature = [lightgray]Temperatura: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_pt_BR.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Capacidade de aquecimento: {0}
 liquid.viscosity = [lightgray]Viscosidade: {0}
 liquid.temperature = [lightgray]Temperatura: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_pt_PT.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Capacidade de aquecimento: {0}
 liquid.viscosity = [lightgray]Viscosidade: {0}
 liquid.temperature = [lightgray]Temperatura: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_sv.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Heat Capacity: {0}
 liquid.viscosity = [lightgray]Viskositet: {0}
 liquid.temperature = [lightgray]Temperatur: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_th.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]ความจุความร้อน: {0}
 liquid.viscosity = [lightgray]ความหนืด: {0}
 liquid.temperature = [lightgray]อุณหภูมิ: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_tk.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]isinma kapasitesi: {0}
 liquid.viscosity = [lightgray]Yari sivilik: {0}
 liquid.temperature = [lightgray]isi: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_tr.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Isı Kapasitesi: {0}
 liquid.viscosity = [lightgray]Vizkosite: {0}
 liquid.temperature = [lightgray]Sıcaklık: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_uk_UA.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Швидкість видобутку: {0} %
 unit.minepower = [lightgray]Потужність видобутку: {0}
 unit.ability = [lightgray]Здібність: {0}
 unit.buildspeed = [lightgray]Швидкість будування: {0} %
+
 liquid.heatcapacity = [lightgray]Теплоємність: {0}
 liquid.viscosity = [lightgray]В’язкість: {0}
 liquid.temperature = [lightgray]Температура: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_zh_CN.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]采矿速度：{0}%
 unit.minepower = [lightgray]采矿力量：{0}
 unit.ability = [lightgray]能力：{0}
 unit.buildspeed = [lightgray]建造速度：{0}%
+
 liquid.heatcapacity = [lightgray]热容量：{0}
 liquid.viscosity = [lightgray]粘度：{0}
 liquid.temperature = [lightgray]温度：{0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/bundles/bundle_zh_TW.properties

@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]採礦速度: {0}%
 unit.minepower = [lightgray]採礦能力: {0}
 unit.ability = [lightgray]能力: {0}
 unit.buildspeed = [lightgray]建造速度: {0}%
+
 liquid.heatcapacity = [lightgray]熱容量：{0}
 liquid.viscosity = [lightgray]粘性：{0}
 liquid.temperature = [lightgray]溫度：{0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha

core/assets/icons/icons.properties

@@ -278,3 +278,4 @@
 63466=beta|unit-beta-medium
 63465=gamma|unit-gamma-medium
 63464=block|unit-block-medium
+63463=risso|unit-risso-medium

core/src/mindustry/content/Blocks.java

@@ -1711,7 +1711,7 @@ public class Blocks implements ContentList{
         navalFactory = new UnitFactory("naval-factory"){{
             requirements(Category.units, with(Items.copper, 30, Items.lead, 70));
             plans = new UnitPlan[]{
-                new UnitPlan(UnitTypes.risse, 60f * 30f, with(Items.silicon, 20, Items.metaglass, 25)),
+                new UnitPlan(UnitTypes.risso, 60f * 30f, with(Items.silicon, 20, Items.metaglass, 25)),
             };
             size = 3;
             requiresWater = true;
@@ -1733,7 +1733,7 @@ public class Blocks implements ContentList{
                 {UnitTypes.crawler, UnitTypes.atrax},
                 {UnitTypes.flare, UnitTypes.horizon},
                 {UnitTypes.mono, UnitTypes.poly},
-                {UnitTypes.risse, UnitTypes.minke},
+                {UnitTypes.risso, UnitTypes.minke},
             };
         }};
 

core/src/mindustry/content/UnitTypes.java

@@ -45,7 +45,7 @@ public class UnitTypes implements ContentList{
     public static @EntityDef({Unitc.class, Builderc.class, Minerc.class, Trailc.class}) UnitType alpha, beta, gamma;
 
     //water
-    public static @EntityDef({Unitc.class, WaterMovec.class, Commanderc.class}) UnitType risse, minke, bryde;
+    public static @EntityDef({Unitc.class, WaterMovec.class, Commanderc.class}) UnitType risso, minke, bryde;
 
     //special block unit type
     public static @EntityDef({Unitc.class, BlockUnitc.class}) UnitType block;
@@ -674,7 +674,7 @@ public class UnitTypes implements ContentList{
         //endregion
         //region naval attack
 
-        risse = new UnitType("risse"){{
+        risso = new UnitType("risso"){{
             speed = 1.1f;
             drag = 0.13f;
             hitsize = 9f;

core/src/mindustry/world/blocks/distribution/StackConveyor.java

@@ -187,8 +187,8 @@ public class StackConveyor extends Block implements Autotiler{
             }else{ //transfer
                 if(state != stateLoad || (items.total() >= getMaximumAccepted(lastItem))){
                     if(front() != null
-                    && front().team() == team()
+                    && front().team == team
-                    && front().block() instanceof StackConveyor){
+                    && front().block instanceof StackConveyor){
                         StackConveyorEntity e = (StackConveyorEntity)front();
 
                         // sleep if its occupied