58 Commits

Author SHA1 Message Date
53bfd54fb3 Merge branch 'master' into dev 2013-11-25 03:49:34 -07:00
df4a0b905a Revert "Fire modifications. Move of tick code."
This reverts commit 35c249bc8fd3861966df8794126c3638ba7fdb2b.
2013-11-25 03:49:12 -07:00
b9d1039844 Add in new fire mechanics. Increase Recycling Center numbers. 2013-11-25 03:47:40 -07:00
35c249bc8f Fire modifications. Move of tick code. 2013-11-25 03:29:50 -07:00
0a4bde3866 Merge branch 'master' into dev
Conflicts:
	BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
2013-11-24 21:07:46 -07:00
Nonoriri
5a9dd42345 Fixed dye colors being displayed incorrectly. Added high efficiency
recipes for coloring wool (8 white wool around dye). Vanilla recipes for
coloring wool disabled.
2013-11-24 02:28:04 -05:00
287328e29a Wither fix for Nether / other worlds. 2013-11-23 16:53:36 -07:00
abb39330a7 Builder Job Buffs complete. 2013-11-23 14:32:06 -07:00
c9e27397c0 Builder job buffs Lv5&10. 2013-11-23 12:06:26 -07:00
1bf0f549f4 Merge branch 'dev'
Conflicts:
	BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
2013-11-23 05:34:44 -07:00
1d48d639e8 Fixed some issues with the Wither boss. 2013-11-23 04:11:29 -07:00
80957a8788 Blocking provides 'Sturdy III' for players. 2013-11-23 03:31:40 -07:00
3e0c2d0f29 Charge Zombie new behavior. 1)Does not wreck chunks that are under a
certain air density. 2)Only destroys natural blocks when players are
nearby. 3)Has old block destroying behavior when fighting players.
2013-11-23 02:42:34 -07:00
a59c956c81 Starting Builder job buff updates. 2013-11-23 02:09:20 -07:00
32cde13d79 Miner job buffs completed. Moved account saving to a periodic interval
to increase speed.
2013-11-22 05:00:00 -07:00
979e0c497d Implement all Woodcutter job buffs. 2013-11-21 20:17:31 -07:00
6c5729447a All irrelevant old job buffs have been removed and are inactive. 2013-11-21 04:23:29 -07:00
6387e121a2 Whoops, missed a few things. Now Farmer is officially gone. Mwahaha. 2013-11-21 03:58:43 -07:00
8d2fb9268c Merge branch 'newjobs' into dev 2013-11-21 03:40:07 -07:00
0588c76871 Finished all job descriptions. Farmer is not a valid job anymore. 2013-11-21 03:39:18 -07:00
999788db6e Added '/jobs members' function. 2013-11-21 02:59:07 -07:00
2898e12506 Fixed all references of string names for account configs to have
.toLowerCase() so that everything is consistent and the functions come
out properly.
2013-11-21 01:28:39 -07:00
38e9321c1a Job description updates. 2013-11-20 15:39:09 -07:00
2aabd4c801 Merge branch 'jobs_2.1' into newjobs 2013-11-20 15:22:36 -07:00
d92a25ab33 Fix issues with Boss causing disconnects. 2013-11-20 02:05:51 -07:00
575780c200 Give some leniency for hunger color bar for player list / name tags. Fix
armor penetration causing a showing of 0 damage for no armor targets in
system damage messages.
2013-11-20 00:24:42 -07:00
e9c4ff2317 Fatal Survivor fix. Equipment that drops gets re-equipped on you when
the Fatal Survivor buff is used.
2013-11-19 17:20:32 -07:00
5623d4995d Fixed the accidental deletion of getting cube type. Added a function to
return the cube type of a viewing Item Cube.
2013-11-19 14:14:53 -07:00
c0efc8e9c8 Fixed the accidental deletion of ID setting for Item Cubes. Added a
function to get the ID of the viewing item cube.
2013-11-19 14:11:05 -07:00
e00f04bf30 Some Item Cube null fixes. 2013-11-19 14:08:44 -07:00
b315a5a3eb Fix Revive bug. Make boss healthbar less glitchy, hopefully fixing
random disconnecting as well. Fix issues with boss not spawning
immediately.
2013-11-19 12:31:15 -07:00
c935896d60 Added is_PermanentProperty() to contain all lore phrases where the
property should not be removed in cases where items need to remove other
lore "bonuses".
2013-11-19 04:04:46 -07:00
e11780cebc Final hotfixes to Recycling Center. Modify Charge Zombie block
destruction behavior to reduce lag and prevent them from destroying
actual structures, only normal blocks. Fix Item Cube block inserting
bugs. Fix beds not setting the time properly.
2013-11-18 22:02:56 -07:00
f3994f0269 Fix Chainmail boots recipe. 2013-11-18 04:00:23 -07:00
246205d3f5 Add some descriptions for the new Jobs. 2013-11-18 03:07:17 -07:00
be149f3252 Fix more side-related things to combat. 2013-11-17 22:21:40 -07:00
ea3b087fe6 Placed "ticktime" command back in. Fixed double length days and nights.
Separate tick time from game tick. Added temporary Chainmail values to
EnchantLevelDatabase until real values are added.
2013-11-17 05:07:31 -07:00
beabe96e39 Merged with remote dev branch. 2013-11-17 02:50:59 -07:00
bdd6e6c0cd Pushing dev to master. 2013-11-16 21:08:52 -07:00
903dbfa91a r261. Propogating changes. 2013-11-11 14:28:42 -07:00
1a418e7650 r261. Finally fixed Super-mobs. Other bugfixes to improve stability. 2013-11-10 04:11:55 -07:00
255c3c3ef4 Warnings added. 2013-11-10 00:55:05 -07:00
84e20c4f3f r270. Fixed a few bugs. Not ready for release. Unknown max health bug. 2013-11-09 23:48:22 -07:00
1382c3d4dc r270. Bugfix to fix Halloween items Item Duping. 2013-11-09 20:54:12 -07:00
7e82f339b5 r270. Bugfixes! 2013-11-09 05:47:40 -07:00
23ff12f9b7 r259 with Halloween ending updates! Polymorph wand! WHOO! 2013-11-08 09:38:41 -07:00
06d924c5bc r259 bugfixes and patches. We still have some work to do here. 2013-11-08 07:08:34 -07:00
303e6d9739 r259. Many fixes and changes yet again. 2013-11-06 03:29:11 -07:00
89377ecaf0 r258. Many tweaks to jobs, bugfixes. 2013-11-05 00:50:22 -07:00
ab0800643d r257 with all bugfixes! It's finally out! 2013-11-03 23:07:18 -07:00