From cfe4ce0fb4705a6c231528d60e4833c4dc2ec68f Mon Sep 17 00:00:00 2001
From: J08nY
Date: Sun, 23 Apr 2017 16:31:27 +0200
Subject: Add a bunch of stuff

---
 assets/combinator.blend   | Bin 435816 -> 494056 bytes
 assets/combinator.blend1  | Bin 435816 -> 0 bytes
 assets/cover.blend        | Bin 0 -> 461468 bytes
 assets/cover_other.blend  | Bin 0 -> 464124 bytes
 assets/cube.blend         | Bin 0 -> 453344 bytes
 assets/gray_tex.aseprite  | Bin 1469 -> 795 bytes
 assets/gray_tex.png       | Bin 804 -> 448 bytes
 assets/incubator.blend    | Bin 558300 -> 513364 bytes
 assets/incubator.blend1   | Bin 558300 -> 0 bytes
 assets/shop.json          |   5 ++---
 assets/storage.png        | Bin 0 -> 1175 bytes
 assets/storage.png.import |  20 ++++++++++++++++++++
 12 files changed, 22 insertions(+), 3 deletions(-)
 delete mode 100644 assets/combinator.blend1
 create mode 100644 assets/cover.blend
 create mode 100644 assets/cover_other.blend
 create mode 100644 assets/cube.blend
 delete mode 100644 assets/incubator.blend1
 create mode 100644 assets/storage.png
 create mode 100644 assets/storage.png.import

(limited to 'assets')

diff --git a/assets/combinator.blend b/assets/combinator.blend
index 79f3ec3..c14124c 100644
Binary files a/assets/combinator.blend and b/assets/combinator.blend differ
diff --git a/assets/combinator.blend1 b/assets/combinator.blend1
deleted file mode 100644
index c927124..0000000
Binary files a/assets/combinator.blend1 and /dev/null differ
diff --git a/assets/cover.blend b/assets/cover.blend
new file mode 100644
index 0000000..f208890
Binary files /dev/null and b/assets/cover.blend differ
diff --git a/assets/cover_other.blend b/assets/cover_other.blend
new file mode 100644
index 0000000..0b97db0
Binary files /dev/null and b/assets/cover_other.blend differ
diff --git a/assets/cube.blend b/assets/cube.blend
new file mode 100644
index 0000000..725773f
Binary files /dev/null and b/assets/cube.blend differ
diff --git a/assets/gray_tex.aseprite b/assets/gray_tex.aseprite
index 4c329ee..784c284 100644
Binary files a/assets/gray_tex.aseprite and b/assets/gray_tex.aseprite differ
diff --git a/assets/gray_tex.png b/assets/gray_tex.png
index 084a929..5245f1d 100644
Binary files a/assets/gray_tex.png and b/assets/gray_tex.png differ
diff --git a/assets/incubator.blend b/assets/incubator.blend
index 694be13..6db83fe 100644
Binary files a/assets/incubator.blend and b/assets/incubator.blend differ
diff --git a/assets/incubator.blend1 b/assets/incubator.blend1
deleted file mode 100644
index 27ea1c1..0000000
Binary files a/assets/incubator.blend1 and /dev/null differ
diff --git a/assets/shop.json b/assets/shop.json
index f7c2d83..b50ee24 100644
--- a/assets/shop.json
+++ b/assets/shop.json
@@ -42,7 +42,7 @@
          "name": "Nucleotids",
          "desc": "Bunch of nucleotids will step up your life game. These are building blocks of nucleic acids.",
          "cost": 300},
-        {"id": "nucleic_acid",
+       {"id": "nucleic_acid",
          "name": "Nucleic acids",
          "desc": "",
          "cost": 400},
@@ -77,5 +77,4 @@
          "cost": 5}
     ]
 }
-
-
+ 
diff --git a/assets/storage.png b/assets/storage.png
new file mode 100644
index 0000000..e280369
Binary files /dev/null and b/assets/storage.png differ
diff --git a/assets/storage.png.import b/assets/storage.png.import
new file mode 100644
index 0000000..8adceb0
--- /dev/null
+++ b/assets/storage.png.import
@@ -0,0 +1,20 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/storage.png-2117570ae7865fe22d823222d213cbbd.stex"
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=true
+stream=false
+size_limit=0
+detect_3d=true
-- 
cgit v1.2.3-70-g09d2