mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-18 11:19:28 +00:00
Conflicts: application.properties src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java src/main/java/forestry/apiculture/worldgen/HiveDecorator.java src/main/java/forestry/apiculture/worldgen/HiveForest.java src/main/java/forestry/apiculture/worldgen/HiveGen.java src/main/java/forestry/apiculture/worldgen/HiveGenHelper.java src/main/java/forestry/apiculture/worldgen/HiveMeadows.java src/main/java/forestry/apiculture/worldgen/HiveSnow.java src/main/java/forestry/apiculture/worldgen/HiveSwamp.java src/main/java/forestry/apiculture/worldgen/HiveSwarmer.java src/main/java/forestry/core/gui/ContainerForestry.java src/main/java/forestry/core/utils/RecipeUtil.java src/main/java/forestry/factory/gadgets/TileWorktable.java src/main/java/forestry/factory/gui/ContainerFabricator.java src/main/java/forestry/factory/gui/ContainerWorktable.java src/main/java/forestry/factory/recipes/RecipeMemory.java