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());