From 505f802e20be281f6be16b03338ad46479b256df Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 8 Nov 2019 14:55:32 -0500
Subject: [PATCH] Use ## for comments, just in case

---
 core/src/io/anuke/mindustry/mod/ContentParser.java             | 3 ++-
 .../mindustry/world/blocks/defense/turrets/PowerTurret.java    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/io/anuke/mindustry/mod/ContentParser.java b/core/src/io/anuke/mindustry/mod/ContentParser.java
index 3f10a49c46..85239beb4d 100644
--- a/core/src/io/anuke/mindustry/mod/ContentParser.java
+++ b/core/src/io/anuke/mindustry/mod/ContentParser.java
@@ -341,7 +341,8 @@ public class ContentParser{
         if(contentTypes.isEmpty()){
             init();
         }
-        json = json.replaceAll("#.*?\n","\n");
+        //add comments starting with #
+        json = json.replaceAll("##.*?\n","\n");
 
         JsonValue value = parser.fromJson(null, json);
         if(!parsers.containsKey(type)){
diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/PowerTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/PowerTurret.java
index a4a3fea2cb..2150fdac4d 100644
--- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/PowerTurret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/PowerTurret.java
@@ -6,7 +6,7 @@ import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockStat;
 import io.anuke.mindustry.world.meta.StatUnit;
 
-public abstract class PowerTurret extends CooledTurret{
+public class PowerTurret extends CooledTurret{
     protected @NonNull BulletType shootType;
     protected float powerUse = 1f;