162 Commits

Author SHA1 Message Date
Nonoriri
64fb7e6e02 Added recipe for crafting a nether star from wither skeleton skulls,
using an existing nether star, soul sand, and diamonds. Added recipe for
crafting water source blocks using buckets and a nether star. Added
pocket crafting table.
2013-11-25 20:56:53 -05:00
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
28255ca10a Push changes for anvil. 2013-11-25 00:30:47 -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
61ed29266b Fixed a bug that was making the application of item bonuses cost less XP
than intended.
2013-11-24 19:39:20 -05:00
Nonoriri
ca8de45ef8 Fixed Trader's Enchanted Books not being properly multiplied. 2013-11-24 16:53:56 -05:00
Nonoriri
52dc2d0e7a Fixed a merging error that somehow slipped through. Disenchanting will
now properly keep items a percentage of the time.
2013-11-24 16:14:42 -05:00
Nonoriri
6a152d0204 Fixed error due to getEnchantmentNumb being called for halloween item
lore.
2013-11-24 14:07:47 -05:00
Nonoriri
8007ddb83e Fixed leather armor being not disenchantable due to LeatherArmorMeta
being a separate class that cannot be applied to enchanted books.
2013-11-24 13:23:48 -05:00
Nonoriri
00e5df5718 Fixed rounding error due to using int instead of double. Bonuses are now
inserted at the beginning of the item lore instead of at the end.
2013-11-24 12:54:31 -05:00
Nonoriri
d409918bd6 Properly capped unenchanting cost to 60. 2013-11-24 12:11:49 -05: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
Nonoriri
8ccb4c4c26 Fixed nullpointerexception causing unenchanted items to be unrepairable. 2013-11-24 01:22:57 -05:00
Nonoriri
84c305dd9c Anvil changes added to master. 2013-11-23 20:19:13 -05:00
287328e29a Wither fix for Nether / other worlds. 2013-11-23 16:53:36 -07:00
5013b49ae1 Starting work on Digger job. 2013-11-23 16:45:46 -07:00
abb39330a7 Builder Job Buffs complete. 2013-11-23 14:32:06 -07:00
271c40553b Merge branch 'newdev' into dev 2013-11-23 12:37:23 -07:00
Nonoriri
2c7883ebc3 Re-added deleted anvil code. 2013-11-23 14:35:47 -05:00
703542f531 Merge branch 'devcolor' into dev 2013-11-23 12:15:00 -07:00
c9e27397c0 Builder job buffs Lv5&10. 2013-11-23 12:06:26 -07:00
Nonoriri
8f47621a2a Fixed dye color copy-paste error. 2013-11-23 13:52:10 -05:00
b8f9274fbb Merge lost new Functions. 2013-11-23 05:52:27 -07:00
1bf0f549f4 Merge branch 'dev'
Conflicts:
	BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
2013-11-23 05:34:44 -07:00
8da2eb1f43 Traders now can give really good enchantments on tools and weapons. 2013-11-23 05:25:07 -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
4f7ad5a62f Fix Charge Zombie III's not starting with full health. 2013-11-23 02:56:42 -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
c02eee252b Merge branch 'newdev' into dev 2013-11-21 20:33:13 -07:00
b188407559 Forgot HP boost part of the woodcutter buff. 2013-11-21 20:32:50 -07:00
979e0c497d Implement all Woodcutter job buffs. 2013-11-21 20:17:31 -07:00
Nonoriri
d14ee534b7 Trivial logic fixing for harrowing item disabling 2013-11-21 18:50:58 -05: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
4f2fd3f962 Added Lv30 A & B Buff listings. 2013-11-21 03:53:25 -07:00
8d2fb9268c Merge branch 'newjobs' into dev 2013-11-21 03:40:07 -07:00
d961bb9bbe Merge branch 'temp' into dev 2013-11-21 03:39:44 -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
Nonoriri
4f21929012 Enchanting fully implemented. Unenchanting no longer buggy. Added check
for halloween items so they only can be repaired by blocks at full XP
cost.
2013-11-21 01:38:51 -05:00
2b64b6ba3d Merge branch 'master' into dev 2013-11-20 16:39:08 -07:00
8166be6614 Fix an error with the Haste buff not being applied right when getting
the 5th stat point.
2013-11-20 16:33:50 -07:00
38e9321c1a Job description updates. 2013-11-20 15:39:09 -07:00