mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-22 04:52:26 +00:00
Conflicts: application.properties src/main/java/forestry/apiculture/gadgets/TileSwarm.java src/main/java/forestry/apiculture/genetics/Bee.java src/main/java/forestry/arboriculture/gadgets/ForestryBlockLeaves.java src/main/java/forestry/core/config/Config.java src/main/java/forestry/core/gui/widgets/ReservoirWidget.java src/main/java/forestry/core/utils/BlockUtil.java src/main/java/forestry/energy/EnergyManager.java src/main/java/forestry/factory/gadgets/MachineCarpenter.java src/main/java/forestry/mail/gui/GuiCatalogue.java src/main/java/forestry/plugins/PluginArboriculture.java