From e98457c5409719d0c501c3c79a64176dae544b30 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 8 Sep 2018 11:57:57 -0400
Subject: [PATCH] Fixed server build error

---
 core/assets/bundles/bundle.properties                     | 2 ++
 server/src/io/anuke/mindustry/server/MindustryServer.java | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index acc4ea10fe..4532241268 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -626,6 +626,8 @@ block.fuse.name=Fuse
 block.shock-mine.name=Shock Mine
 block.overdrive-projector.name=Overdrive Projector
 block.force-projector.name=Force Projector
+block.arc.name=Arc
+block.rtg-generator.name=RTG Generator
 
 unit.alpha-drone.name=Alpha Drone
 unit.drone.name=Drone
diff --git a/server/src/io/anuke/mindustry/server/MindustryServer.java b/server/src/io/anuke/mindustry/server/MindustryServer.java
index fdd846c7f3..a1b835fa4b 100644
--- a/server/src/io/anuke/mindustry/server/MindustryServer.java
+++ b/server/src/io/anuke/mindustry/server/MindustryServer.java
@@ -1,7 +1,6 @@
 package io.anuke.mindustry.server;
 
 import io.anuke.mindustry.Vars;
-import io.anuke.mindustry.core.ContentLoader;
 import io.anuke.mindustry.core.Logic;
 import io.anuke.mindustry.core.NetServer;
 import io.anuke.mindustry.core.World;
@@ -25,8 +24,8 @@ public class MindustryServer extends ModuleCore{
         headless = true;
 
         BundleLoader.load();
-        ContentLoader.load();
-        ContentLoader.initialize(Content::init);
+        content.load();
+        content.initialize(Content::init);
 
         module(logic = new Logic());
         module(world = new World());