Commit Graph

22 Commits

Author SHA1 Message Date
CannibalVox
1e6a4a8b4a A few build fixes 2013-12-06 21:48:16 -06:00
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
StevenRS11
db9f422824 build stuff 2013-11-11 18:33:31 -05:00
StevenRS11
4486ef62fe Signed-off-by: StevenRS11 <stevenrs11@aol.com> 2013-11-11 18:05:42 -05:00
StevenRS11
7d13c3afc0 more buildserver2 2013-11-05 21:27:37 -05:00
StevenRS11
a3a6c80fe5 More buildserver 2013-11-05 20:34:39 -05:00
StevenRS11
c39e2b34ab buildserver fixes
thanks deathrat!
2013-11-05 19:43:28 -05:00
StevenRS11
45e6e5ac0d fixed build.xml 2013-07-18 14:39:02 -04:00
StevenRS11
871634c772 updated build info
Signed-off-by: StevenRS11 <stevenrs11@aol.com>
2013-05-09 17:21:21 -04:00
Ken Minalien Murray
1ed041fa4c Updated build script to use Searge names for obfuscation to allow for cross-version compatibility.
Signed-off-by: Ken Minalien Murray <minalien@gmail.com>
2013-05-08 12:52:38 -07:00
StevenRS11
19b099479f Changed name and fixed block update issues when setting door rotation
Also improved random rift code

Signed-off-by: StevenRS11 <stevenrs11@aol.com>
2013-04-01 16:45:16 -04:00
StevenRS11
50e17c7ead Signed-off-by: StevenRS11 <steven.r.stafford.ii.14@dartmouth.edu> 2013-03-18 19:13:15 -04:00
StevenRS11
f1dd936794 Signed-off-by: StevenRS11 <steven.r.stafford.ii.14@dartmouth.edu> 2013-03-18 19:04:55 -04:00
StevenRS11
c5a201cbd9 Signed-off-by: StevenRS11 <steven.r.stafford.ii.14@dartmouth.edu> 2013-03-18 18:58:07 -04:00
StevenRS11
c4172804d0 Signed-off-by: StevenRS11 <steven.r.stafford.ii.14@dartmouth.edu> 2013-03-18 18:42:56 -04:00
StevenRS11
2d668305cf Signed-off-by: StevenRS11 <stevenrs11@aol.com> 2013-03-10 19:13:54 -04:00
StevenRS11
bb5cb23b6c Signed-off-by: StevenRS11 <stevenrs11@aol.com> 2013-02-18 01:01:47 -05:00
StevenRS11
c28e64b4bd Signed-off-by: StevenRS11 <stevenrs11@aol.com> 2013-02-18 00:51:35 -05:00
StevenRS11
0856edf56f Signed-off-by: StevenRS11 <stevenrs11@aol.com> 2013-02-18 00:45:44 -05:00
StevenRS11
448dbd125e Signed-off-by: StevenRS11 <stevenrs11@aol.com> 2013-02-18 00:25:32 -05:00
StevenRS11
25ac73286c Signed-off-by: StevenRS11 <stevenrs11@aol.com> 2013-02-17 23:00:39 -05:00