mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-22 12:59:44 +00:00
# Conflicts: # gradle.properties # src/main/java/forestry/arboriculture/render/IconProviderWood.java # src/main/java/forestry/core/access/AccessHandler.java # src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java # src/main/java/forestry/farming/logic/FarmLogicOrchard.java # src/main/java/forestry/plugins/compat/PluginGrowthCraft.java # src/main/java/forestry/plugins/compat/PluginHarvestCraft.java # src/main/java/forestry/plugins/compat/PluginPlantMegaPack.java # src/main/java/forestry/plugins/compat/PluginWitchery.java