# Conflicts: # gradle.properties # src/main/kotlin/mods/betterfoliage/integration/ShadersModIntegration.kt # src/main/kotlin/mods/betterfoliage/model/HalfBaked.kt # src/main/kotlin/mods/betterfoliage/render/lighting/VanillaAoCalculation.kt
# Conflicts: # gradle.properties # src/main/kotlin/mods/betterfoliage/integration/ShadersModIntegration.kt # src/main/kotlin/mods/betterfoliage/model/HalfBaked.kt # src/main/kotlin/mods/betterfoliage/render/lighting/VanillaAoCalculation.kt