Merge branch 'master' into master

core/assets/bundles/bundle.properties

@@ -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

core/assets/bundles/bundle_ko.properties

@@ -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 = 메가

core/assets/contributors

@@ -91,3 +91,4 @@ GioIacca9
 SnakkiZXZ
 sk7725
 The Slaylord
+ThePlayerA

core/assets/icons/icons.properties

@@ -311,3 +311,6 @@
 63433=dacite-wall|block-dacite-wall-medium
 63432=dacite-boulder|block-dacite-boulder-medium
 63431=large-logic-display|block-large-logic-display-medium
+63430=omura|unit-omura-medium
+63429=mud|block-mud-medium
+63428=sei|unit-sei-medium

core/assets/shaders/mud.frag

@@ -0,0 +1,29 @@
+#define HIGHP
+
+#define NSCALE 180.0 / 2.0
+
+uniform sampler2D u_texture;
+uniform sampler2D u_noise;
+
+uniform vec2 u_campos;
+uniform vec2 u_resolution;
+uniform float u_time;
+
+varying vec2 v_texCoords;
+
+void main(){
+    vec2 c = v_texCoords.xy;
+    vec2 coords = vec2(c.x * u_resolution.x + u_campos.x, c.y * u_resolution.y + u_campos.y);
+
+    float btime = u_time / 8000000.0;
+    float noise = sin((texture2D(u_noise, (coords) / NSCALE + vec2(btime) * vec2(-0.9, 0.8)).r + texture2D(u_noise, (coords) / NSCALE + vec2(abs(sin(btime)) * 1.1) * vec2(-0.8, -1.0)).r) / 2.0);
+    vec4 color = texture2D(u_texture, c);
+
+    if(noise > 0.54 && noise < 0.68){
+        color.rgb *= 1.4;
+    }else if(!(noise > 0.40 && noise < 0.54)){
+        color.rgb *= 1.2;
+    }
+
+    gl_FragColor = color;
+}