apex/DimDoors
1
1
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects Releases Wiki Activity

1.6.2 code #121

Merged
StevenRS11 merged 78 commits from 1.6.2-code into master 2014-01-03 07:15:09 +00:00
Conversation 0 Commits 78 Files Changed 365 +2633 -1970

78 Commits

Author SHA1 Message Date
StevenRS11
72bf14cc70 Merge pull request #120 from SenseiKiwi/master 
Added Dungeon: The Nexus
 2014-01-02 20:12:27 -08:00
SenseiKiwi
e5da1754c5 Added Dungeon: The Nexus 
Added a new dungeon.
 2014-01-02 21:24:40 -04:00
StevenRS11
cd432c532f Rift balance change 2013-12-29 01:05:40 -06:00
StevenRS11
a0d0f6e19b Fixed chunk loading causing crash 
Also might have increased pocket generation time
 2013-12-27 01:08:50 -06:00
StevenRS11
180720c04b Merge pull request #116 from SenseiKiwi/master 
Fixed Saving Log Spam
 2013-12-25 23:33:09 -08:00
StevenRS11
8a7761aa7c not quite 2013-12-26 00:13:25 -06:00
StevenRS11
cf8be344c9 Fixed! 2013-12-26 00:06:50 -06:00
StevenRS11
ef367847da take3 2013-12-26 00:02:35 -06:00
StevenRS11
3924d6d1d6 finally? 2013-12-25 23:49:03 -06:00
StevenRS11
56d40aec1f mostbuild 2013-12-25 23:46:25 -06:00
StevenRS11
9a0ee7c210 Build 2013-12-25 23:43:35 -06:00
StevenRS11
d45a257edc more build 2013-12-25 23:25:05 -06:00
StevenRS11
2355c92102 build 2013-12-25 23:14:13 -06:00
StevenRS11
c3b3db4ca0 Lots of changes 
Rerworked rift growth
Fixed teleport command
Fixed deleteRifts command
Fixed Rift rendering
 2013-12-25 14:16:10 -06:00
SenseiKiwi
72196c6afd Fixed Saving Log Spam 
Removed the code from PocketManager that would output messages about
saving dim data every so often since it was causing log spam.
 2013-12-24 00:58:23 -04:00
SenseiKiwi
65ed1de6ee Merge remote-tracking branch 'upstream/1.6.2-code' into 1.6-fixes 2013-12-24 00:36:32 -04:00
SenseiKiwi
6d2c645ce9 Minor Changes 
No changes to functionality
 2013-12-24 00:36:02 -04:00
StevenRS11
06d2dcaa74 build 2013-12-22 17:19:06 -06:00
StevenRS11
6d64a54b75 Revert "build" 
This reverts commit e7dcc20fad.
 2013-12-22 17:18:16 -06:00
StevenRS11
399bb0ea9e Merge pull request #115 from SenseiKiwi/1.6-fixes 
More Dungeons
 2013-12-22 15:09:36 -08:00
SenseiKiwi
b929724781 Merge remote-tracking branch 'upstream/1.6.2-code' into 1.6-fixes 2013-12-22 19:06:12 -04:00
SenseiKiwi
b6669183bc More Dungeons 
More dungeons for the Ruins pack. You'll never see it coming.
 2013-12-22 19:05:04 -04:00
StevenRS11
82a17a2981 Merge pull request #114 from SenseiKiwi/1.6-fixes 
Overhauled Loot
 2013-12-22 14:44:14 -08:00
SenseiKiwi
f40f42298f Merge remote-tracking branch 'upstream/1.6.2-code' into 1.6-fixes 2013-12-22 18:39:46 -04:00
StevenRS11
e7dcc20fad build 2013-12-22 17:33:02 -05:00
SenseiKiwi
cfb370ad1f Minor Change 
Removed a pointless SupressWarning annotation
 2013-12-22 18:30:41 -04:00
SenseiKiwi
a6048c6c29 Overhauled Loot 
Changed our loot generation. Instead of relying on Minecraft's built-in
loot categories, we now have our own static loot category. There are two
types of chests now. Regular chests contain randomly-picked coal, iron,
gold, diamonds, emeralds, quartz, enchanted books, and golden apples
(very rare). We also have a function for filling out "grave chests",
which occur in 1 out of every 7 chests. Those contain rotten flesh,
bones, and some armor pieces and equipment that are assigned random
damage values and occasionally also get level 1 enchantments. Small
changes were made to various files to incorporate this update.
 2013-12-22 18:30:16 -04:00
StevenRS11
b3349ac3e3 build 2013-12-22 17:13:16 -05:00
StevenRS11
9bd9cfb700 Fixed rendering, simplified netcode 2013-12-22 16:53:13 -05:00
StevenRS11
4e0b7fa977 Fixed crashbug, now to fix rendering 2013-12-22 02:02:07 -05:00
StevenRS11
f88c314922 TESTING 2013-12-22 00:33:58 -05:00
StevenRS11
9f2d1b1109 more building 2013-12-21 23:32:48 -05:00
StevenRS11
2cc0b7e2ca Buildserver 2013-12-21 16:53:19 -05:00
SenseiKiwi
75e103aa65 Merge remote-tracking branch 'upstream/1.6.2-code' 2013-12-20 17:28:50 -04:00
StevenRS11
51bd96dbe4 Merge pull request #111 from deathrat/1.6.2-code 
1.6.2 code
 2013-12-17 16:59:51 -08:00
deathrat
3e7ffe0d79 Updated gradlew permissions 
Signed-off-by: deathrat <deathrat43@gmail.com>
 2013-12-17 19:31:34 -05:00
deathrat
2ec43fc7d0 Fixed archive naming 
Signed-off-by: deathrat <deathrat43@gmail.com>
 2013-12-17 19:20:27 -05:00
StevenRS11
b83a766695 Merge pull request #110 from deathrat/1.6.2-code 
Fixed problems with buildscript
 2013-12-17 16:10:07 -08:00
deathrat
8d19d71d8a Fixed problems with buildscript 
Signed-off-by: deathrat <deathrat43@gmail.com>
 2013-12-17 19:09:53 -05:00
StevenRS11
f28f071095 Merge pull request #109 from deathrat/1.6.2-code 
Added Gradle Wrapper and set build path for jar
 2013-12-17 00:52:57 -08:00
deathrat
a8baba9430 Set jar path for Gradle Script 
Signed-off-by: deathrat <deathrat43@gmail.com>
 2013-12-17 03:51:25 -05:00
deathrat
6eedb45ded Added Gradle Wrapper 
Signed-off-by: deathrat <deathrat43@gmail.com>
 2013-12-17 03:48:27 -05:00
StevenRS11
31fc929170 Merge pull request #108 from deathrat/1.6.2-code 
Support for ForgeGradle
 2013-12-17 00:41:56 -08:00
deathrat
505b182af9 Created build.gradle 
Restructured folder structure for ForgeGradle

Signed-off-by: deathrat <deathrat43@gmail.com>
 2013-12-17 03:36:38 -05:00
StevenRS11
602b55111f one more time 2013-12-17 00:56:22 -06:00
StevenRS11
fd01d4e198 Fixing buildscript 2013-12-16 21:14:28 -06:00
StevenRS11
1931f7988c Merge pull request #107 from CannibalVox/master 
Merging Canvox's patch
 2013-12-16 18:58:44 -08:00
CannibalVox
81cc7053de Clarified network code & set linkdata to always be written to network 
together.
 2013-12-07 02:16:50 -06:00
CannibalVox
d9609ea60b Fix SMP issue in DD 1.6.4 2013-12-07 01:18:44 -06:00
CannibalVox
1205e85861 Remove unnecessary watcher value set command. 2013-12-07 00:36:54 -06:00
CannibalVox
1e6a4a8b4a A few build fixes 2013-12-06 21:48:16 -06:00
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
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
a1628ff341 Fixed monoliths 2013-11-11 22:05:11 -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
20ea00a0a7 Fixed packet issue 2013-11-11 16:36:35 -05:00
StevenRS11
841fcffcb1 fixes 2013-11-11 03:41:14 -05:00
StevenRS11
da608462d7 fixed monolith texture 2013-11-07 00:47:23 -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
a3b38a2c05 Merge pull request #92 from StevenRS11/master 
Merging changes
 2013-11-06 12:45:39 -08:00