CannibalVox
|
2388be2681
|
Merge branch '1.6.2-code' of github.com:StevenRS11/DimDoors
Conflicts:
StevenDimDoors/mod_pocketDim/CraftingManager.java
StevenDimDoors/mod_pocketDim/EventHookContainer.java
StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java
StevenDimDoors/mod_pocketDim/blocks/BlockDimWall.java
StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java
StevenDimDoors/mod_pocketDim/blocks/BlockDoorGold.java
StevenDimDoors/mod_pocketDim/blocks/BlockGoldDimDoor.java
StevenDimDoors/mod_pocketDim/blocks/BlockLimbo.java
StevenDimDoors/mod_pocketDim/blocks/BlockRift.java
StevenDimDoors/mod_pocketDim/blocks/TransTrapdoor.java
StevenDimDoors/mod_pocketDim/commands/CommandCreateDungeonRift.java
StevenDimDoors/mod_pocketDim/commands/CommandCreatePocket.java
StevenDimDoors/mod_pocketDim/commands/CommandDeleteAllLinks.java
StevenDimDoors/mod_pocketDim/commands/CommandDeleteRifts.java
StevenDimDoors/mod_pocketDim/commands/CommandExportDungeon.java
StevenDimDoors/mod_pocketDim/commands/CommandResetDungeons.java
StevenDimDoors/mod_pocketDim/commands/CommandTeleportPlayer.java
StevenDimDoors/mod_pocketDim/commands/DDCommandBase.java
StevenDimDoors/mod_pocketDim/core/DDTeleporter.java
StevenDimDoors/mod_pocketDim/core/NewDimData.java
StevenDimDoors/mod_pocketDim/core/PocketManager.java
StevenDimDoors/mod_pocketDim/helpers/ChunkLoaderHelper.java
StevenDimDoors/mod_pocketDim/items/ItemBlockDimWall.java
StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java
StevenDimDoors/mod_pocketDim/items/ItemRiftSignature.java
StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java
StevenDimDoors/mod_pocketDim/mod_pocketDim.java
StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java
StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoorGold.java
StevenDimDoors/mod_pocketDim/watcher/ClientLinkData.java
StevenDimDoors/mod_pocketDim/world/CustomSkyProvider.java
StevenDimDoors/mod_pocketDim/world/PocketBuilder.java
StevenDimDoors/mod_pocketDimClient/RenderDimDoor.java
StevenDimDoors/mod_pocketDimClient/RenderMobObelisk.java
StevenDimDoors/mod_pocketDimClient/RenderTransTrapdoor.java
build.xml
|
2013-12-06 21:09:14 -06:00 |
|