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
CannibalVox
e825cb74b9
1.6.4 basic fixes
2013-12-06 20:38:55 -06:00
skyboy
7769a6e6a5
Merge upstream
2013-11-06 18:19:31 -05:00
skyboy
4cfd5475de
Fix large swath of warnings, fix most render-methods
2013-11-06 18:15:30 -05:00
StevenRS11
b4e0d53509
Not quite
2013-11-06 16:53:14 -05:00
SenseiKiwi
f132153cf4
Renamed Blocks and Minor Changes
...
Renamed block 1973:1 to Ancient Fabric. Renamed block 220 to Eternal
Fabric. I assigned new names so that we didn't need to use the long ones
we had before (e.g. "Fabric of Reality Permanent/Pushable"). Also
removed unused imports from various classes along the way.
2013-07-16 17:52:26 -04:00
SenseiKiwi
f97b40f2c5
Minor Style Changes and Fixes
...
Made some minor changes such as removing unused imports and fixing up
code to remove warnings. Stop calling static methods as if they were
instance methods!!! @_@
2013-07-16 16:54:48 -04:00
StevenRS11
db9bb02b43
FoR changes
...
Added a metaData block to FoR, meta 1 acts like permafabric but can be
pushed with pistons. Fixed a bug where permafabric could be pushed by
pistons.
2013-07-16 03:00:57 -04:00
