mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-22 13:09:47 +00:00
Merge branch 'master-MC1.11.2' of https://github.com/ForestryMC/Binnie into master-MC1.11.2
# Conflicts: # src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java # src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java
This commit is contained in:
commit
2a873e8bfb
835 files changed
+5922
-4280
No files matched your search
@@ -1,5 +1,10 @@
|
||||
package binnie.extrabees.init;
|
||||
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
import forestry.api.apiculture.IAlleleBeeSpecies;
|
||||
import forestry.apiculture.genetics.BeeDefinition;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.alveary.BlockAlveary;
|
||||
import binnie.extrabees.alveary.TileEntityExtraBeesAlvearyPart;
|
||||
@@ -10,9 +15,6 @@ import binnie.extrabees.genetics.ExtraBeesSpecies;
|
||||
import binnie.extrabees.utils.HiveDrop;
|
||||
import binnie.extrabees.utils.Utils;
|
||||
import binnie.extrabees.utils.config.ConfigurationMain;
|
||||
import forestry.api.apiculture.IAlleleBeeSpecies;
|
||||
import forestry.apiculture.genetics.BeeDefinition;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
public final class BlockRegister {
|
||||
|
||||
|
||||
Reference in new issue
Block a user