mirror of
https://github.com/Multiverse/Multiverse-Core.git
synced 2024-11-05 02:11:06 +01:00
Merge remote-tracking branch 'origin/internal-chunk-generators' into internal-chunk-generators
# Conflicts: # src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java # src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java # src/main/java/com/onarandombox/MultiverseCore/commands/EnvironmentCommand.java # src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java # src/main/java/com/onarandombox/MultiverseCore/generators/InternalChunkGeneratorManager.java # src/main/java/com/onarandombox/MultiverseCore/utils/WorldManager.java
This commit is contained in:
commit
e3f461f61b