diff --git a/.travis.yml b/.travis.yml
index 4cf6a09aac..997046ee8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,18 @@
 jdk:
-  - openjdk8
+- openjdk8
 script:
-  - "git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc"
-  - "./gradlew test"
-  - "./gradlew desktop:dist -Pbuildversion=${TRAVIS_TAG:1}"
-  - "./gradlew server:dist -Pbuildversion=${TRAVIS_TAG:1}"
-
+- git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
+- "./gradlew test"
+- "./gradlew desktop:dist -Pbuildversion=${TRAVIS_TAG:1}"
+- "./gradlew server:dist -Pbuildversion=${TRAVIS_TAG:1}"
+- git clone --depth=1 --branch=master https://github.com/mindustrygame/wiki ../wiki
+- git clone --depth=1 --branch=master https://github.com/Anuken/Mindustry-Wiki-Generator ../Mindustry-Wiki-Generator
+- cd ../Mindustry-Wiki-Generator
+- "./gradlew run"
+- cd ../wiki
+- git add .
+- git commit -m "Update to match commit ${TRAVIS_COMMIT}"
+- git push https://Anuken:${GH_PUSH_TOKEN}@github.com/mindustrygame/wiki
 deploy:
   provider: releases
   skip_cleanup: true
@@ -13,8 +20,11 @@ deploy:
   api_key:
     secure: Cv5wFtWt62/A24EvSEQvMow7gKPbZ3oATEFPuSghhB2TQz1dA40Zee3Qvk4LFlpLrhYo4K0ZSczCZRGpR+hCd8+Dpww52bheYEvWuh3ZQfvu/fXtEx2j5PwP1qMpmIgSxETV/gkD7l9FImdh0VzktYiAvQfmi0bEocG9/D4QwjFpNat7iwBdcMiw1MvAygpdIWRsjiw0RKlB2mWarmoHhQ7Gu7qlU3j50uaEvcrtmU0pBUPggNQwQRv32i9NPvNFxrqqlUjDLIS8JFea99zCkp8BwYqbEvBIMzd+Qip1/stLJJA3+cDUClbsDtg8rAVetzpOrdLEEBmqShFe5MDl2yEHcsgpN9CFsyTaUfvB3P3rVjizvycMm42IsUkXQiarm5xTQ/TIA8Rd8AHiSKuweNCg1Fd5SFaRtKy8JVLXuxyfUccmyje6hhz2L4lS2Wfj3mAG7sqZUCXhWP79EKdGkiPOjKv4CwXEKmuH3BMVqPlNUZJr9Eg3sV1FG0h2l+MVOOnR635qdUbb49sYojYxVruMLX0BH1c4ZCu230m8CUoWA1Em1QNI75ya7+9Y5T6AsgWDVpBvdUo9fWNbdp+VQ0GskFQsJD5wtnxbcbHeFiERAgGBm7z6qt9u9LrQpBH+dsW52ADvYsu3L4nQEa+sdMHwTTwmGY+iUvsxu0DqxGg=
   file:
-    - "desktop/build/libs/desktop-release.jar"
-    - "server/build/libs/server-release.jar"
+  - desktop/build/libs/desktop-release.jar
+  - server/build/libs/server-release.jar
   on:
     repo: Anuken/Mindustry
     tags: true
+env:
+  global:
+    secure: TqlUl/ojjkCMVOGbCTKz7Cnr4F08UyWzY/CiJ0vvUOGJGZ1qm7XavAlDf5XT0egU4mvr37THubFO8vojbqmrmy0oZnYh3njKFA8axgyZ8PyKkjGHOfd0i6qyEWsOr9H90/2X8r3LwEeLaDFyHpu3wljIGBjweg53g2qwmDwCFa9UR80FJZ+xDB+rD6B3cXT0DTEkCoLZXLqXm0Y3HvBdSuBL1LR/FNb2BSxNq+tNLGiz1kdQZV5erausbbZypBoGxzz63xAnyz2kkFz73A8xQYVTzGbFodTPz7HM13GVZ5s43I03Y+HYyHBgBaSLziO2hi2kzVJccOwzBp7wS4fs1MqsFY5+IeWJ9k+hm89NiYT7+6zlEgoUMlIniny1qLqWTzx7btUeuC/y/h5TVBNgaV+z0jmHycHfeSyq5I+vmX4J8qe3wmaN8TcdqYKU5nIznOTk3CM5Fzu0Bs9vkCkOxmormmcjMFW1RbdOLc/hpZWZggsBA88sNEAI8eq+r5QEeqzeCx8YKoZDjdrsqvgLMc3El3gS9oMGxkn0Y/TEcqs9Tc4BXtTkqIA68hD0DYzlAxYjVbbkAI9Hh9lHNvV3Dr/oCkGXQ/HflM143kj1L3tSBZpqeqQE2XhngB5nqpS3OZTmZbMTQ8qD2luU18yaTGMLF5tJS/fdKPRx0gQ1kL8=
diff --git a/core/assets/maps/craters.msav b/core/assets/maps/craters.msav
index 01738f45b2..08435d2896 100644
Binary files a/core/assets/maps/craters.msav and b/core/assets/maps/craters.msav differ
diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java
index 6db5e41e98..c4baff95cd 100644
--- a/core/src/io/anuke/mindustry/content/Blocks.java
+++ b/core/src/io/anuke/mindustry/content/Blocks.java
@@ -1601,7 +1601,7 @@ public class Blocks implements ContentList{
         }};
 
         spiritFactory = new UnitFactory("spirit-factory"){{
-            requirements(Category.units, ItemStack.with(Items.copper, 70, Items.lead, 110, Items.silicon, 80));
+            requirements(Category.units, ItemStack.with(Items.metaglass, 70, Items.lead, 110, Items.silicon, 90));
             type = UnitTypes.spirit;
             produceTime = 5700;
             size = 2;