21 files changed, 121 insertions, 64 deletions
diff --git a/assets/combinator.blend b/assets/combinator.blend
index c14124c..78203af 100644
--- a/assets/combinator.blend
+++ b/assets/combinator.blend
diff --git a/assets/combinator.blend1 b/assets/combinator.blend1
new file mode 100644
index 0000000..f5af5e8
--- /dev/null
+++ b/assets/combinator.blend1
diff --git a/assets/combinator.json b/assets/combinator.json
index b4d41e0..ec383d8 100644
--- a/assets/combinator.json
+++ b/assets/combinator.json
@@ -1,7 +1,9 @@
 {
  "bases": [
-    "Great, you have succesfully created a new planet! It has a mass of /mass/, it is mainly /type/.",
-    "Your new creation is ready master! A planet was created as you commanded. /mass_comment/ /type_comment/"
+    "Great, you have succesfully created a new planet!\
+It has a mass of /mass/, it is mainly /type/.",
+    "Your new creation is ready master!\
+A planet was created as you commanded. /mass_comment/ /type_comment/"
  ],
  "mass_comment": {
     "very_small": "It's so tiny it's largest mountain almost covers it.",
diff --git a/assets/combine.png b/assets/combine.png
new file mode 100644
index 0000000..fab4be5
--- /dev/null
+++ b/assets/combine.png
diff --git a/assets/combine.png.import b/assets/combine.png.import
new file mode 100644
index 0000000..21ef27d
--- /dev/null
+++ b/assets/combine.png.import
@@ -0,0 +1,21 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.etc="res://.import/combine.png-01c3b1973361c46f62a6bffea08d77bb.etc.stex"
+path.s3tc="res://.import/combine.png-01c3b1973361c46f62a6bffea08d77bb.s3tc.stex"
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=1
+process/fix_alpha_border=true
+process/premult_alpha=true
+stream=false
+size_limit=0
+detect_3d=false
diff --git a/assets/combine.xcf b/assets/combine.xcf
new file mode 100644
index 0000000..ec96ad3
--- /dev/null
+++ b/assets/combine.xcf
diff --git a/assets/exporter.blend b/assets/exporter.blend
new file mode 100644
index 0000000..da18a95
--- /dev/null
+++ b/assets/exporter.blend
diff --git a/assets/exporter.blend1 b/assets/exporter.blend1
new file mode 100644
index 0000000..f9fd56b
--- /dev/null
+++ b/assets/exporter.blend1
diff --git a/assets/incubate.png b/assets/incubate.png
new file mode 100644
index 0000000..e40315c
--- /dev/null
+++ b/assets/incubate.png
diff --git a/assets/incubate.png.import b/assets/incubate.png.import
new file mode 100644
index 0000000..fa05a29
--- /dev/null
+++ b/assets/incubate.png.import
@@ -0,0 +1,21 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.etc="res://.import/incubate.png-9b20e9fe02ccdf1078824f16f77bc7db.etc.stex"
+path.s3tc="res://.import/incubate.png-9b20e9fe02ccdf1078824f16f77bc7db.s3tc.stex"
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=0
+process/fix_alpha_border=true
+process/premult_alpha=true
+stream=false
+size_limit=0
+detect_3d=false
diff --git a/assets/incubate.xcf b/assets/incubate.xcf
new file mode 100644
index 0000000..8bd90c5
--- /dev/null
+++ b/assets/incubate.xcf
diff --git a/assets/incubator.blend b/assets/incubator.blend
index 6db83fe..588a57e 100644
--- a/assets/incubator.blend
+++ b/assets/incubator.blend
diff --git a/assets/incubator.blend1 b/assets/incubator.blend1
new file mode 100644
index 0000000..db51c38
--- /dev/null
+++ b/assets/incubator.blend1
diff --git a/assets/incubator.json b/assets/incubator.json
index 568c1e8..d9a3a2f 100644
--- a/assets/incubator.json
+++ b/assets/incubator.json
@@ -1,20 +1,47 @@
 {
-"bases": [
-    ""
-]
-
-"misc": {
-    "schrodinger": [
-        "Life on this planet possesses a weird property, even by Multiverse standards. It seems to be in a state between existing and not existing.",
-        "Cardboard boxes are a common occurence on this planet, everything seems to have them on. Oh god, even the molecules are in cardboard boxes!",
-        ""
-    ],
-    "trees": [
-        "This planet is covered in trees full of solid rocket fuel. They grow to maturity, producing solid fuel in their trunks. When mature, they shed their branches apart from a few top, seed-bearing, ones and lift off, to seek another planet.",
-        "The smell of rocket fuel is very strong at the surface of the planet. It feels like it's evaporating from the trees.",
-        ""
-    ]
-},
-
-
+   "bases":[
+      ""
+   ],
+   "misc":{
+      "schrodinger":[
+         "Life on this planet possesses a weird property, even by Multiverse standards. It seems to be in a state between existing and not existing.",
+         "Cardboard boxes are a common occurence on this planet, everything seems to have them on. Oh god, even the molecules are in cardboard boxes!",
+         ""
+      ],
+      "trees":[
+         "This planet is covered in trees full of solid rocket fuel. They grow to maturity, producing solid fuel in their trunks. When mature, they shed their branches apart from a few top, seed-bearing, ones and lift off, to seek another planet.",
+         "The smell of rocket fuel is very strong at the surface of the planet. It feels like it's evaporating from the trees.",
+         ""
+      ]
+   },
+   "stages":[
+      {
+         "id":"none",
+         "text":"No life!"
+      },
+      {
+         "id":"basic",
+         "text":"Basic life."
+      },
+      {
+         "id":"diverse",
+         "text":"Diverse life."
+      },
+      {
+         "id":"multi-cell",
+         "text":"Multi cell life."
+      },
+      {
+         "id":"group",
+         "text":"Groups!"
+      },
+      {
+         "id":"societal",
+         "text":"Societal life!"
+      },
+      {
+         "id":"civilisation",
+         "text":"Civilisation!"
+      }
+   ]
 }
diff --git a/assets/life.json b/assets/life.json
deleted file mode 100644
index 568c1e8..0000000
--- a/assets/life.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-"bases": [
-    ""
-]
-
-"misc": {
-    "schrodinger": [
-        "Life on this planet possesses a weird property, even by Multiverse standards. It seems to be in a state between existing and not existing.",
-        "Cardboard boxes are a common occurence on this planet, everything seems to have them on. Oh god, even the molecules are in cardboard boxes!",
-        ""
-    ],
-    "trees": [
-        "This planet is covered in trees full of solid rocket fuel. They grow to maturity, producing solid fuel in their trunks. When mature, they shed their branches apart from a few top, seed-bearing, ones and lift off, to seek another planet.",
-        "The smell of rocket fuel is very strong at the surface of the planet. It feels like it's evaporating from the trees.",
-        ""
-    ]
-},
-
-
-}
diff --git a/assets/minus.png.import b/assets/minus.png.import
index fb3f760..8cfa6ed 100644
--- a/assets/minus.png.import
+++ b/assets/minus.png.import
@@ -2,19 +2,20 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/minus.png-4762f967f2398859383593e0213c863b.stex"
+path.etc="res://.import/minus.png-4762f967f2398859383593e0213c863b.etc.stex"
+path.s3tc="res://.import/minus.png-4762f967f2398859383593e0213c863b.s3tc.stex"
 
 [params]
 
-compress/mode=0
+compress/mode=2
 compress/lossy_quality=0.7
 flags/repeat=0
 flags/filter=true
 flags/mipmaps=false
 flags/anisotropic=false
-flags/srgb=2
+flags/srgb=0
 process/fix_alpha_border=true
 process/premult_alpha=true
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false
diff --git a/assets/plus.png.import b/assets/plus.png.import
index a5afd20..87413d2 100644
--- a/assets/plus.png.import
+++ b/assets/plus.png.import
@@ -2,19 +2,20 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/plus.png-4edcf3a95e8f281c366463cbe7a974c3.stex"
+path.etc="res://.import/plus.png-4edcf3a95e8f281c366463cbe7a974c3.etc.stex"
+path.s3tc="res://.import/plus.png-4edcf3a95e8f281c366463cbe7a974c3.s3tc.stex"
 
 [params]
 
-compress/mode=0
+compress/mode=2
 compress/lossy_quality=0.7
 flags/repeat=0
 flags/filter=true
 flags/mipmaps=false
 flags/anisotropic=false
-flags/srgb=2
+flags/srgb=0
 process/fix_alpha_border=true
 process/premult_alpha=true
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false
diff --git a/assets/storage.png.import b/assets/storage.png.import
index 8adceb0..2143d36 100644
--- a/assets/storage.png.import
+++ b/assets/storage.png.import
@@ -2,19 +2,20 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/storage.png-2117570ae7865fe22d823222d213cbbd.stex"
+path.etc="res://.import/storage.png-2117570ae7865fe22d823222d213cbbd.etc.stex"
+path.s3tc="res://.import/storage.png-2117570ae7865fe22d823222d213cbbd.s3tc.stex"
 
 [params]
 
-compress/mode=0
+compress/mode=2
 compress/lossy_quality=0.7
 flags/repeat=0
 flags/filter=true
 flags/mipmaps=false
 flags/anisotropic=false
-flags/srgb=2
+flags/srgb=0
 process/fix_alpha_border=true
 process/premult_alpha=true
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false
diff --git a/assets/triangle.png.import b/assets/triangle.png.import
index 05bbde8..3acb037 100644
--- a/assets/triangle.png.import
+++ b/assets/triangle.png.import
@@ -2,19 +2,20 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/triangle.png-81d9911a043b3b982b4bbd30d008317a.stex"
+path.etc="res://.import/triangle.png-81d9911a043b3b982b4bbd30d008317a.etc.stex"
+path.s3tc="res://.import/triangle.png-81d9911a043b3b982b4bbd30d008317a.s3tc.stex"
 
 [params]
 
-compress/mode=0
+compress/mode=2
 compress/lossy_quality=0.7
 flags/repeat=0
 flags/filter=true
 flags/mipmaps=false
 flags/anisotropic=false
-flags/srgb=2
+flags/srgb=0
 process/fix_alpha_border=true
 process/premult_alpha=true
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false
diff --git a/assets/triangles.png.import b/assets/triangles.png.import
index d8872a2..674e5c3 100644
--- a/assets/triangles.png.import
+++ b/assets/triangles.png.import
@@ -2,19 +2,20 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/triangles.png-297de53c2012e22e0c9acb69bf5e0414.stex"
+path.etc="res://.import/triangles.png-297de53c2012e22e0c9acb69bf5e0414.etc.stex"
+path.s3tc="res://.import/triangles.png-297de53c2012e22e0c9acb69bf5e0414.s3tc.stex"
 
 [params]
 
-compress/mode=0
+compress/mode=2
 compress/lossy_quality=0.7
 flags/repeat=0
 flags/filter=true
 flags/mipmaps=false
 flags/anisotropic=false
-flags/srgb=2
+flags/srgb=0
 process/fix_alpha_border=true
 process/premult_alpha=true
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false
diff --git a/assets/waves.png.import b/assets/waves.png.import
index d34ace5..369f9b4 100644
--- a/assets/waves.png.import
+++ b/assets/waves.png.import
@@ -2,19 +2,20 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/waves.png-eaf24c5101f895533f4d0df7d131e1c8.stex"
+path.etc="res://.import/waves.png-eaf24c5101f895533f4d0df7d131e1c8.etc.stex"
+path.s3tc="res://.import/waves.png-eaf24c5101f895533f4d0df7d131e1c8.s3tc.stex"
 
 [params]
 
-compress/mode=0
+compress/mode=2
 compress/lossy_quality=0.7
 flags/repeat=0
 flags/filter=true
 flags/mipmaps=false
 flags/anisotropic=false
-flags/srgb=2
+flags/srgb=0
 process/fix_alpha_border=true
 process/premult_alpha=true
 stream=false
 size_limit=0
-detect_3d=true
+detect_3d=false