nossr50
							
						 
					 | 
					
						
						
							
						
						a53c8d5c64
					 | 
					
						
						
							
							Completed Excavation ?
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-03 12:58:16 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						94a02c9a2e
					 | 
					
						
						
							
							Manual merging commence... Merge branch 'master' of github.com:mcMMO-Dev/mcMMO
						
						
						
						
						
						
						
						Conflicts:
	src/main/resources/locale/locale_en_us.properties 
						
						
							
						
					 | 
					
						2012-03-03 12:45:57 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						07699fa651
					 | 
					
						
						
							
							Excavation ? WIP
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-03 12:43:50 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								GJ
							
						 
					 | 
					
						
						
							
						
						0aaf02f208
					 | 
					
						
						
							
							LOCALE ALL THE THINGS!
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-03 14:48:40 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								GJ
							
						 
					 | 
					
						
						
							
						
						0dd9bc1cda
					 | 
					
						
						
							
							Cleaned out more traces of old event system.
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-03 14:13:33 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						ccfce843be
					 | 
					
						
						
							
							Updated changelog. for loops > while loops
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-03 10:39:18 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								GJ
							
						 
					 | 
					
						
						
							
						
						cb3bc755a6
					 | 
					
						
						
							
							Remove MySpawn info from locale files.
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-03 13:35:01 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								GJ
							
						 
					 | 
					
						
						
							
						
						719081a77e
					 | 
					
						
						
							
							Removed some unneeded imports.
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-03 13:30:08 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						d1c4efa30d
					 | 
					
						
						
							
							Finalized page system. Moved grabbing pages to Page.java.
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-03 10:24:47 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						12fbaa4361
					 | 
					
						
						
							
							Wip of Skill Help pages, code is ugly but it works.
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-03 09:54:16 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						abcd586daa
					 | 
					
						
						
							
							Merge pull request #190 from bm01/master
						
						
						
						
						
						
						
						Taming prevent damage fix 
						
						
							
						
					 | 
					
						2012-03-03 07:08:16 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								bm01
							
						 
					 | 
					
						
						
							
						
						2f0a3eaadd
					 | 
					
						
						
							
							Taming prevent damage fix
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-03 15:15:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								GJ
							
						 
					 | 
					
						
						
							
						
						1814d52680
					 | 
					
						
						
							
							Starting work on skill help pages. (Excavation)
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-03 01:22:52 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						d3ed6bb139
					 | 
					
						
						
							
							break; break; break;
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 17:34:15 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								GJ
							
						 
					 | 
					
						
						
							
						
						8eaa58040e
					 | 
					
						
						
							
							Fixed ShakeMob ability not working.
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 20:04:15 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						04e2a212d1
					 | 
					
						
						
							
							Silly git
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 16:55:54 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						fe7ca65f22
					 | 
					
						
						
							
							dealDamage() will now send fake EntityDamageEvent which mcMMO will ignore
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 16:53:35 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						89ab87b6dd
					 | 
					
						
						
							
							Fixed Greater Impact not dealing damage, nerf'd Axes critical chance.
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 16:46:38 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						e933fbe1bd
					 | 
					
						
						
							
							Removing debug message
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 16:36:31 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						cb9a9282dd
					 | 
					
						
						
							
							Moving the FakeEntityDamageByEntity event to the top of the listener
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 16:34:35 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						14f1a91eeb
					 | 
					
						
						
							
							Fixed PVE experience gains not leveling up skills
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 16:24:28 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						1756031eda
					 | 
					
						
						
							
							Changed pom ver # to 1.3.02 removed ocelots from Taming xp gain
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 15:58:40 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						bccb321ce1
					 | 
					
						
						
							
							Fixing isInvincible() thanks bm01!
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 15:52:33 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						920f091a85
					 | 
					
						
						
							
							Merge branch 'master' of github.com:mcMMO-Dev/mcMMO
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 15:39:14 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						c1103a52f0
					 | 
					
						
						
							
							Too many exploits, need to finalize this as a bugfix 1.3.02
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 15:38:50 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						4f128ebbef
					 | 
					
						
						
							
							Merge pull request #189 from bm01/master
						
						
						
						
						
						
						
						Impact fix 
						
						
							
						
					 | 
					
						2012-03-02 15:22:19 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								bm01
							
						 
					 | 
					
						
						
							
						
						3f5b2bdcee
					 | 
					
						
						
							
							Impact fix
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 23:22:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						288e82fbc3
					 | 
					
						
						
							
							Setup locale for Axe Splintering message
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 12:39:18 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						feb073d159
					 | 
					
						
						
							
							Damage from failed Tree Feller is now random (but never kills)
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 12:35:12 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						505df87014
					 | 
					
						
						
							
							Finalized durability stuff in tree feller. XP nerf only for jungle now.
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 12:31:53 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						f6221c1c34
					 | 
					
						
						
							
							More tweaks to durability stuff in tree feller
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 12:19:57 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						0a97c1dc62
					 | 
					
						
						
							
							Updating Tree Feller to use .getMaxDurability() API calls
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 11:31:30 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						05cea84dcc
					 | 
					
						
						
							
							Can only seem to make the axe splinter some of the time..
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 11:22:29 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						1ac544511c
					 | 
					
						
						
							
							Added updateInventory() to Tree Feller
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 11:07:20 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						292f14bf87
					 | 
					
						
						
							
							Updated changelog about tree feller
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 11:02:55 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						ef17ea6231
					 | 
					
						
						
							
							Merge branch 'master' of github.com:mcMMO-Dev/mcMMO
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 11:02:05 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						75c49497ac
					 | 
					
						
						
							
							Nerf tree feller XP. You need durability to use tree feller now.
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 11:01:09 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								GJ
							
						 
					 | 
					
						
						
							
						
						f9b9dddbc8
					 | 
					
						
						
							
							Updates to Taming
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 13:55:53 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								GJ
							
						 
					 | 
					
						
						
							
						
						5a8b9fc344
					 | 
					
						
						
							
							Changes to Blast Mining method calls.
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 13:55:53 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						e9dae0d633
					 | 
					
						
						
							
							Changelog update
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 10:30:10 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						1c866a52e5
					 | 
					
						
						
							
							Reworking our invincibility checks to accomodate for vanilla mc behaviour
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 10:18:23 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						2f5edb6329
					 | 
					
						
						
							
							Removing redundancy
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 09:40:04 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						30e5410906
					 | 
					
						
						
							
							Adding break; to switch in onEntityDamage
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 09:37:55 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						4f2a0b8260
					 | 
					
						
						
							
							Updating onEntityDamageByEntity event listener
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 09:35:52 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								GJ
							
						 
					 | 
					
						
						
							
						
						882a457484
					 | 
					
						
						
							
							Listen to EntityDamageByEntity subevents
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 12:19:53 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								GJ
							
						 
					 | 
					
						
						
							
						
						ed5531d44b
					 | 
					
						
						
							
							Cleanup EntityListener.java
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 12:13:35 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								GJ
							
						 
					 | 
					
						
						
							
						
						b2989a8bab
					 | 
					
						
						
							
							Added Ocelots to Taming XP tables.
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 10:43:08 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								GJ
							
						 
					 | 
					
						
						
							
						
						c032a27d63
					 | 
					
						
						
							
							Changed Ignition to add fire ticks rather than replace them. (Thanks
						
						
						
						
						
						
						
						bm01!) 
						
						
							
						
					 | 
					
						2012-03-02 10:11:54 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								GJ
							
						 
					 | 
					
						
						
							
						
						353ceefd4e
					 | 
					
						
						
							
							Changed POM to use latest build.
						
						
						
						
						
						
							
						
					 | 
					
						2012-03-02 10:04:20 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nossr50
							
						 
					 | 
					
						
						
							
						
						9a7ea3b6d0
					 | 
					
						
						
							
							Fixed bug where Tree Feller had no cooldown whatsoever. GJJJJ!!!!
						
						
						
						
						
						
							
 1.3.01
						
					 | 
					
						2012-03-01 15:52:21 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |