647 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
CannibalVox	7dc51a8e56	Fixed some merge issues.	2013-12-06 21:14:20 -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	7687a77332	Chunkloader fixes	2013-11-12 13:56:52 -05:00
StevenRS11	b818038fd6	Chunkloader fixes	2013-11-12 13:49:43 -05:00
StevenRS11	b18fe877de	Fixed commands and rift orientation	2013-11-12 13:16:54 -05:00
StevenRS11	8fbb41a588	fixed commands and rift orientation	2013-11-12 13:08:05 -05:00
StevenRS11	a1628ff341	Fixed monoliths	2013-11-11 22:05:11 -05:00
StevenRS11	8dd1d85e6e	Fixed chunkloaders and loading bug	2013-11-11 21:49:47 -05:00
StevenRS11	9b6aefa6ad	Fixed assets	2013-11-11 21:42:40 -05:00
StevenRS11	9907ce1ce8	removed debug	2013-11-11 21:40:28 -05:00
StevenRS11	c48e2307c7	Fixed chunk loaders and dim loading bug	2013-11-11 21:39:11 -05:00
StevenRS11	c2bab6cc93	Build 2	2013-11-11 19:19:53 -05: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	51f7e10834	Fixed more packet issues	2013-11-11 17:33:00 -05:00
StevenRS11	5cd5a323e0	Fixed Packet issues	2013-11-11 17:24:20 -05:00
StevenRS11	20ea00a0a7	Fixed packet issue	2013-11-11 16:36:35 -05:00
StevenRS11	841fcffcb1	fixes	2013-11-11 03:41:14 -05:00
StevenRS11	0f49c8c28f	Small Fixes	2013-11-11 03:07:55 -05:00
StevenRS11	da608462d7	fixed monolith texture	2013-11-07 00:47:23 -05:00
StevenRS11	6b3b2d6471	Fixed Chunk Loading crash	2013-11-07 00:32:04 -05:00
StevenRS11	bb7cd95dcc	Various fixes	2013-11-07 00:28:40 -05:00
StevenRS11	f2f1ee7af9	Finished Sounds	2013-11-06 22:46:55 -05:00
StevenRS11	4a6d166ba5	Finished Textures, starting sound	2013-11-06 22:16:56 -05:00
StevenRS11	51ee6d9c5e	Finishing Textures	2013-11-06 19:30:39 -05:00
StevenRS11	bef91e2ce6	Merge pull request #93 from skyboy/master ... Fix warnings and most texture things	2013-11-06 15:24:57 -08: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
StevenRS11	d849071e8e	All non-texture changes made	2013-11-06 16:40:49 -05:00
StevenRS11	52fcfdaf49	Starting update to 1.6.2	2013-11-06 16:01:31 -05:00
StevenRS11	e4ee4a3cee	crafting change	2013-11-06 15:46:43 -05:00
StevenRS11	a3b38a2c05	Merge pull request #92 from StevenRS11/master ... Merging changes	2013-11-06 12:45:39 -08:00
StevenRS11	e271dd2fda	Texture work	2013-11-06 15:43:26 -05:00
StevenRS11	59489f290f	Finished Server mode ... Also added World Thread	2013-11-06 15:16:07 -05:00
StevenRS11	e3df3cad08	Finished Loading blacklist & forced chunks	2013-11-06 14:27:55 -05:00
StevenRS11	d4fc43482d	Fixed possible savedata import bug	2013-11-05 23:06:21 -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	6383c4f5ff	Merge remote-tracking branch 'origin/DevBranch'	2013-11-05 18:23:15 -05:00
StevenRS11	a04a266c17	THE UPDATE ... Merging months of dev work into master. The update is playable, but untested.	2013-11-05 18:15:23 -05:00
StevenRS11	df79aafd14	importing old savedata	2013-11-05 18:09:06 -05:00
StevenRS11	1bfc3f2eea	Merged Devbranch into master	2013-11-05 13:49:45 -05:00
StevenRS11	a204cbd04e	Implemented Loading and Saving	2013-11-05 13:44:24 -05:00
StevenRS11	a0224e8f14	Finished loading savedata	2013-11-05 13:38:16 -05:00
StevenRS11	5873d20f91	Finished Packing DungeonData	2013-11-05 03:34:15 -05:00
StevenRS11	58842048d4	Added dungeonData shell for saving	2013-11-05 02:36:12 -05:00
StevenRS11	69809df4c3	Added versioning to savedata	2013-11-05 00:36:38 -05:00