Merge branch 'master' into master

This commit is contained in:
Felix Corvus
2020-09-19 17:01:57 +03:00
committed by GitHub
134 changed files with 15238 additions and 12129 deletions
+5
View File
@@ -876,9 +876,11 @@ liquid.water.name = Water
liquid.slag.name = Slag
liquid.oil.name = Oil
liquid.cryofluid.name = Cryofluid
item.explosiveness = [lightgray]Explosiveness: {0}%
item.flammability = [lightgray]Flammability: {0}%
item.radioactivity = [lightgray]Radioactivity: {0}%
unit.health = [lightgray]Health: {0}
unit.speed = [lightgray]Speed: {0}
unit.weapon = [lightgray]Weapon: {0}
@@ -914,6 +916,8 @@ unit.mega.name = Mega
unit.risso.name = Risso
unit.minke.name = Minke
unit.bryde.name = Bryde
unit.sei.name = Sei
unit.omura.name = Omura
unit.alpha.name = Alpha
unit.beta.name = Beta
unit.gamma.name = Gamma
@@ -979,6 +983,7 @@ block.dune-wall.name = Dune Wall
block.pine.name = Pine
block.dirt.name = Dirt
block.dirt-wall.name = Dirt Wall
block.mud.name = Mud
block.white-tree-dead.name = White Tree Dead
block.white-tree.name = White Tree
block.spore-cluster.name = Spore Cluster
+7 -6
View File
@@ -803,7 +803,7 @@ rules.title.unit = 유닛
rules.title.experimental = 실험적인 기능
rules.title.environment = 환경
rules.lighting = 조명
rules.ambientlight = 주변 조명
rules.ambientlight = 자연 조명
rules.solarpowermultiplier = 태양광 발전 배수
content.item.name = 자원
@@ -856,11 +856,12 @@ unit.crawler.name = 크롤러
unit.atrax.name = 아트락스
unit.spiroct.name = 스피록트
unit.arkyid.name = 아키드
unit.flare.name = 화염
unit.horizon.name = 수평선
unit.zenith.name = 천정
unit.antumbra.name = 그림자
unit.eclipse.name = 일식
unit.toxipod.name = 독소포드
unit.flare.name = 플레어
unit.horizon.name = 호라이즌
unit.zenith.name = 제니스
unit.antumbra.name = 안텀브라
unit.eclipse.name = 이클립스
unit.mono.name = 모노
unit.poly.name = 폴리
unit.mega.name = 메가
File diff suppressed because it is too large Load Diff