merge conflict resolution

Author: dshadowwolf

build.gradle

@@ -34,19 +34,15 @@ javadoc {
 
 description = 'OreSpawn'
 def mod_file = getModFile()
-def mc_version = '1.11.2'
-
-ext {
-    short_version = getVersion('VERSION', mod_file)
-}
-
-version = mc_version + '-' + short_version
+def mc_version = "1.11.2"
+def short_version = getVersion("VERSION", mod_file)
+version = mc_version + "-" + short_version
 if (System.getenv().BUILD_NUMBER) {
     version += '.' + System.getenv().BUILD_NUMBER
 }
-group = 'com.mcmoddev'
-archivesBaseName = 'OreSpawn'
-sourceCompatibility = targetCompatibility = '1.8'
+group = "com.mcmoddev"
+archivesBaseName = "OreSpawn"
+sourceCompatibility = targetCompatibility = "1.8"
 
 class Secrets {
     def data = null
@@ -73,12 +69,10 @@ if (secretFile.exists()) {
 }
 
 minecraft {
-    version = '1.11.2-13.20.0.2228'
-    runDir = 'run'
-    mappings = 'stable_32'
-//  coreMod = corePlugin
-//  clientJvmArgs = ["-Dfml.coreMods.load=$corePlugin"]
-//  serverJvmArgs = ["-Dfml.coreMods.load=$corePlugin"]
+    version = "1.11.2-13.20.0.2228"
+    runDir = "run"
+    mappings = "stable_32"
+//    coreMod = ""
     makeObfSourceJar = false
 }
 
@@ -236,12 +230,12 @@ publishing {
 curseforge {
     apiKey = secret.curseforgeAPIKey
     project {
-        id = '245586'
-        changelog = file('CHANGELOG.txt')
-        releaseType = 'release'
-        addGameVersion(project.mc_version)
-        def projName = 'OreSpawn'
-        def displayVersion = getVersion('VERSION', mod_file)
+        id = "245586"
+        changelog = file("CHANGELOG.txt")
+        releaseType = "alpha"
+        addGameVersion("1.11")
+        def projName = "OreSpawn"
+        def displayVersion = getVersion("VERSION", mod_file)
         if (System.getenv().BUILD_NUMBER) {
             displayVersion += '.' + System.getenv().BUILD_NUMBER
         }

src/main/java/com/mcmoddev/orespawn/commands/ClearChunkCommand.java

@@ -39,7 +39,6 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
                 for (int z = chunkPos.getZStart(); z <= chunkPos.getZEnd(); z++) {
                     BlockPos pos = new BlockPos(x, y, z);
                     Block block = player.world.getBlockState(pos).getBlock();
-                    
                     if (OreSpawnWorldGen.getSpawnBlocks().contains(block)) {
                         player.world.setBlockToAir(pos);
                     }