Merge branch 'kotlin-1.10' into kotlin-1.11

2016-12-22 00:28:58 +01:00
parent ceb3e5b116 d852faad96
commit 37d091daed
23 changed files with 325 additions and 58 deletions
--- a/src/main/kotlin/mods/betterfoliage/client/render/EntityRisingSoulFX.kt
+++ b/src/main/kotlin/mods/betterfoliage/client/render/EntityRisingSoulFX.kt
@@ -16,6 +16,7 @@ import net.minecraftforge.fml.relauncher.SideOnly
 import org.apache.logging.log4j.Level.INFO
 import java.util.*

+@SideOnly(Side.CLIENT)
 class EntityRisingSoulFX(world: World, pos: BlockPos) :
 AbstractEntityFX(world, pos.x.toDouble() + 0.5, pos.y.toDouble() + 1.0, pos.z.toDouble() + 0.5) {