Merge pull request #20 from SBT-community/web-interface

Обновление до 1.2
SBT-community · Dec 30, 2016 · ed91274 · ed91274
2 parents 67bbe75 + e675d8f
commit ed91274
Show file tree

Hide file tree

Showing 179 changed files with 13,576 additions and 1,236 deletions.
diff --git a/translations/substitutions.json b/translations/substitutions.json
diff --git a/translations/texts/biomes/surface/scorched.biome.json b/translations/texts/biomes/surface/scorched.biome.json
@@ -0,0 +1,13 @@
+[
+  {
+    "DeniedAlternatives": [],
+    "Files": {
+      "biomes/surface/scorched.biome": [
+        "/friendlyName"
+      ]
+    },
+    "Texts": {
+      "Eng": "Scorched Wasteland"
+    }
+  }
+]
diff --git a/translations/texts/biomes/surface/volcanicterraform.biome.json b/translations/texts/biomes/surface/volcanicterraform.biome.json
@@ -0,0 +1,13 @@
+[
+  {
+    "DeniedAlternatives": [],
+    "Files": {
+      "biomes/surface/volcanicterraform.biome": [
+        "/friendlyName"
+      ]
+    },
+    "Texts": {
+      "Eng": "Volcanic (Terraformed)"
+    }
+  }
+]
diff --git a/.../underground_detached/cellcave.biome.json → ...underground_detached/cellcaves.biome.json b/.../underground_detached/cellcave.biome.json → ...underground_detached/cellcaves.biome.json
@@ -2,7 +2,7 @@
   {
     "DeniedAlternatives": [],
     "Files": {
-      "biomes/underground_detached/cellcave.biome": [
+      "biomes/underground_detached/cellcaves.biome": [
         "/friendlyName"
       ]
     },

diff --git a/translations/texts/cinematics/story/finale/finale.cinematic.json b/translations/texts/cinematics/story/finale/finale.cinematic.json
diff --git a/translations/texts/damage/shield.damage.json b/translations/texts/damage/shield.damage.json
@@ -5,6 +5,7 @@
       "damage/shield.damage": [
         "/effects/organic/hit/particles/0/text",
         "/effects/robotic/hit/particles/0/text",
+        "/effects/stone/hit/particles/0/text",
         "/effects/wooden/hit/particles/0/text"
       ]
     },