octarine-noise
|
f1f811219e
|
Merge remote-tracking branch 'local/forge-1.14' into forge-1.15
# Conflicts:
# build.gradle.kts
# gradle.properties
# src/main/kotlin/mods/betterfoliage/BetterFoliageMod.kt
# src/main/kotlin/mods/betterfoliage/client/Client.kt
# src/main/kotlin/mods/betterfoliage/client/integration/ForestryIntegration.kt
# src/main/kotlin/mods/betterfoliage/client/integration/RubberIntegration.kt
# src/main/kotlin/mods/betterfoliage/client/render/EntityRisingSoulFX.kt
# src/main/kotlin/mods/betterfoliage/client/render/RenderCactus.kt
# src/main/kotlin/mods/betterfoliage/client/render/RenderGrass.kt
# src/main/kotlin/mods/betterfoliage/client/render/RenderLeaves.kt
# src/main/kotlin/mods/betterfoliage/client/render/RenderLilypad.kt
# src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt
# src/main/kotlin/mods/betterfoliage/client/render/RenderMycelium.kt
# src/main/kotlin/mods/betterfoliage/client/render/RenderNetherrack.kt
# src/main/kotlin/mods/betterfoliage/client/render/RenderReeds.kt
# src/main/kotlin/mods/betterfoliage/client/texture/GrassRegistry.kt
# src/main/kotlin/mods/betterfoliage/client/texture/LeafParticleRegistry.kt
# src/main/kotlin/mods/betterfoliage/client/texture/LeafRegistry.kt
# src/main/kotlin/mods/betterfoliage/client/texture/Utils.kt
# src/main/kotlin/mods/betterfoliage/config/Config.kt
# src/main/kotlin/mods/betterfoliage/config/DelegatingConfig.kt
# src/main/kotlin/mods/betterfoliage/config/MainConfig.kt
# src/main/kotlin/mods/betterfoliage/resource/discovery/Delegate.kt
# src/main/kotlin/mods/betterfoliage/resource/generated/CenteringTextureGenerator.kt
# src/main/kotlin/mods/betterfoliage/resource/generated/GeneratedGrass.kt
# src/main/kotlin/mods/octarinecore/client/resource/AsyncSpriteProviderManager.kt
# src/main/kotlin/mods/octarinecore/client/resource/ModelDiscovery.kt
# src/main/kotlin/mods/octarinecore/client/resource/ResourceGeneration.kt
# src/main/kotlin/mods/octarinecore/client/resource/ResourceHandler.kt
|
2021-05-22 18:07:32 +02:00 |
|