Jesse Boyd 
							
						 
					 
					
						
						
							
						
						dee8072d83 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/IntellectualSites/PlotSquared  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_9.java 
						
						
					 
					
						2016-05-13 03:04:43 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						63c7041a34 
					 
					
						
						
							
							Flag tweaks  
						
						 
						
						
						
						
					 
					
						2016-05-13 02:55:57 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MattBDev 
							
						 
					 
					
						
						
							
						
						3be0f74498 
					 
					
						
						
							
							Fix   #1098  
						
						 
						
						
						
						
					 
					
						2016-05-10 13:41:59 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MattBDev 
							
						 
					 
					
						
						
							
						
						e63b436edd 
					 
					
						
						
							
							Possible build everywhere fix.  
						
						 
						
						
						
						
					 
					
						2016-05-06 22:05:31 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MattBDev 
							
						 
					 
					
						
						
							
						
						1535c5e2f5 
					 
					
						
						
							
							Fix test file  
						
						 
						
						
						
						
					 
					
						2016-05-05 13:41:11 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MattBDev 
							
						 
					 
					
						
						
							
						
						894524f998 
					 
					
						
						
							
							Fix test file  
						
						 
						
						
						
						
					 
					
						2016-05-05 13:39:54 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MattBDev 
							
						 
					 
					
						
						
							
						
						8925c66b6e 
					 
					
						
						
							
							Fix file name  
						
						 
						
						
						
						
					 
					
						2016-05-05 13:19:15 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matt 
							
						 
					 
					
						
						
							
						
						e4350feb2a 
					 
					
						
						
							
							Fixed missing type change  
						
						 
						
						
						
						
					 
					
						2016-05-05 13:17:17 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paulomart 
							
						 
					 
					
						
						
							
						
						5d8492b675 
					 
					
						
						
							
							Fixes cast exception  
						
						 
						
						
						
						
					 
					
						2016-05-05 13:13:55 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MattBDev 
							
						 
					 
					
						
						
							
						
						421203a27d 
					 
					
						
						
							
							Bug Fix and Cleanup  
						
						 
						
						
						
						
					 
					
						2016-04-29 18:14:12 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MattBDev 
							
						 
					 
					
						
						
							
						
						8f3d35bca3 
					 
					
						
						
							
							Bug Fix and Cleanup  
						
						 
						
						
						
						
					 
					
						2016-04-28 16:38:51 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MattBDev 
							
						 
					 
					
						
						
							
						
						669359cd37 
					 
					
						
						
							
							General changes  
						
						 
						
						
						
						
					 
					
						2016-04-26 10:14:22 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MattBDev 
							
						 
					 
					
						
						
							
						
						2c16c767e7 
					 
					
						
						
							
							Fix flag values being loaded as strings  
						
						 
						
						
						
						
					 
					
						2016-04-26 08:40:52 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						d8849f718c 
					 
					
						
						
							
							Fix plotworld get  
						
						 
						
						
						
						
					 
					
						2016-04-26 09:32:16 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						8c56affb2f 
					 
					
						
						
							
							Fix for paint  
						
						 
						
						
						
						
					 
					
						2016-04-25 03:58:47 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MattBDev 
							
						 
					 
					
						
						
							
						
						1bce69d288 
					 
					
						
						
							
							Merge flags to master  
						
						 
						
						
						
						
					 
					
						2016-04-22 23:54:53 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MattBDev 
							
						 
					 
					
						
						
							
						
						c266b1a428 
					 
					
						
						
							
							Merge flags to master  
						
						 
						
						
						
						
					 
					
						2016-04-22 23:54:19 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MattBDev 
							
						 
					 
					
						
						
							
						
						e57af63af4 
					 
					
						
						
							
							Possible remove fix.  
						
						 
						
						
						
						
					 
					
						2016-04-22 23:46:16 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MattBDev 
							
						 
					 
					
						
						
							
						
						3e4dbe0fbf 
					 
					
						
						
							
							fix compile error  
						
						 
						
						
						
						
					 
					
						2016-04-22 23:46:16 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MattBDev 
							
						 
					 
					
						
						
							
						
						74ed10c376 
					 
					
						
						
							
							Completed and ready to test  
						
						 
						
						
						
						
					 
					
						2016-04-22 23:46:16 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MattBDev 
							
						 
					 
					
						
						
							
						
						aaf9511673 
					 
					
						
						
							
							Start implementing new Flag system.  
						
						 
						
						
						
						
					 
					
						2016-04-22 23:46:16 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						d3dd88eb8d 
					 
					
						
						
							
							Fixes   #1062  
						
						 
						
						
						
						
					 
					
						2016-04-22 23:45:19 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						9b22f38ff0 
					 
					
						
						
							
							Fix plot download/done  
						
						 
						
						
						
						
					 
					
						2016-04-22 23:45:19 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						7c12a20a2b 
					 
					
						
						
							
							perm requirement for add/trust *  
						
						 
						
						
						
						
					 
					
						2016-04-22 23:45:19 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						40e063e702 
					 
					
						
						
							
							Fixes   #1050  
						
						 
						
						
						
						
					 
					
						2016-04-22 23:45:19 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						1c04b1a0e0 
					 
					
						
						
							
							Fixes   #1062  
						
						 
						
						
						
						
					 
					
						2016-04-19 15:32:31 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						02d17b363d 
					 
					
						
						
							
							Fix plot download/done  
						
						 
						
						
						
						
					 
					
						2016-04-17 03:55:55 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						30a2c5d881 
					 
					
						
						
							
							perm requirement for add/trust *  
						
						 
						
						
						
						
					 
					
						2016-04-13 03:35:14 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						76c3879c1f 
					 
					
						
						
							
							Fixes   #1050  
						
						 
						
						
						
						
					 
					
						2016-04-13 02:41:40 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						588f5d7ebc 
					 
					
						
						
							
							Fixes   #1047  
						
						 
						
						
						
						
					 
					
						2016-04-09 22:48:27 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						45b6950111 
					 
					
						
						
							
							Fixes chat error / plot deny *  
						
						 
						
						
						
						
					 
					
						2016-04-07 03:33:49 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						8b10b7109c 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_8_3.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_9.java 
						
						
					 
					
						2016-04-07 02:33:23 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						f7810860da 
					 
					
						
						
							
							Re-add WorldEdit check  
						
						 
						
						
						
						
					 
					
						2016-04-07 02:14:50 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MattBDev 
							
						 
					 
					
						
						
							
						
						d49de5297b 
					 
					
						
						
							
							Tweaks  
						
						 
						
						
						
						
					 
					
						2016-04-05 23:50:04 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MattBDev 
							
						 
					 
					
						
						
							
						
						3df772aa4e 
					 
					
						
						
							
							Fixed   #852  and small changes  
						
						 
						
						... 
						
						
						
						Hid updater error when debugging is not enabled.
Javadoc changes 
						
						
					 
					
						2016-04-05 19:10:26 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MattBDev 
							
						 
					 
					
						
						
							
						
						9c81dfa5c3 
					 
					
						
						
							
							Cleanup and Optimizations  
						
						 
						
						... 
						
						
						
						Abstracted TitleManagers
Removed a lot of Statics.
ETC. 
						
						
					 
					
						2016-04-05 12:53:40 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						fab60a0d53 
					 
					
						
						
							
							Fix schematic on claim/auto  
						
						 
						
						
						
						
					 
					
						2016-04-05 11:07:37 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MattBDev 
							
						 
					 
					
						
						
							
						
						95c9fd01dd 
					 
					
						
						
							
							Merged  
						
						 
						
						
						
						
					 
					
						2016-04-04 12:49:11 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								manuelgu 
							
						 
					 
					
						
						
							
						
						6ab3a029b2 
					 
					
						
						
							
							Add teleport on death feature  
						
						 
						
						
						
						
					 
					
						2016-04-04 11:31:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								manuelgu 
							
						 
					 
					
						
						
							
						
						4da38a6f9c 
					 
					
						
						
							
							Add bypass permission to breaking blocks at y0  
						
						 
						
						
						
						
					 
					
						2016-04-04 00:09:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						dffa00858d 
					 
					
						
						
							
							More than 2 lines  
						
						 
						
						
						
						
					 
					
						2016-04-02 17:15:36 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MattBDev 
							
						 
					 
					
						
						
							
						
						4ebd778c62 
					 
					
						
						
							
							Optimizations and a purge fix  
						
						 
						
						
						
						
					 
					
						2016-04-02 01:30:26 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MattBDev 
							
						 
					 
					
						
						
							
						
						8243e0118a 
					 
					
						
						
							
							Optionals introduced, code cleaned, potential purge fix  
						
						 
						
						
						
						
					 
					
						2016-04-01 19:14:46 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						b909792d6a 
					 
					
						
						
							
							typo in disable titles  
						
						 
						
						
						
						
					 
					
						2016-04-01 06:54:28 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						4a7112a0a5 
					 
					
						
						
							
							Various  
						
						 
						
						... 
						
						
						
						Add some 1.9 blocks to chest content with schematic paste
Restructure tileentity placement from schematic (will soon add signs
etc)
Prepare for release 3.3.3 
						
						
					 
					
						2016-04-01 04:23:26 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						edd18a7178 
					 
					
						
						
							
							Various  
						
						 
						
						... 
						
						
						
						- Fix some block change issues (for some reason sending a chunk would
sometimes reset any recent changes)
- Send chunk changes for relight command
- Have kick cmd kick the player from the server if they are kicked from
the spawn plot
- Plot size checks for downloading
- Fix some potential integer overflow issues for large plots (>64K x
64K)
- Fix some edge cases for plot move/copy 
						
						
					 
					
						2016-03-31 20:49:00 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								manuelgu 
							
						 
					 
					
						
						
							
						
						25dfc34695 
					 
					
						
						
							
							Comma-separate plot area list again  
						
						 
						
						
						
						
					 
					
						2016-03-30 15:25:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								manuelgu 
							
						 
					 
					
						
						
							
						
						ea17ba8e46 
					 
					
						
						
							
							Fix sponge conflicts  
						
						 
						
						
						
						
					 
					
						2016-03-30 15:09:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								manuelgu 
							
						 
					 
					
						
						
							
						
						6fc8bf587b 
					 
					
						
						
							
							Comma-separate list of plot worlds  
						
						 
						
						
						
						
					 
					
						2016-03-30 14:43:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								manuelgu 
							
						 
					 
					
						
						
							
						
						429fed2ab3 
					 
					
						
						
							
							Fix target command  
						
						 
						
						... 
						
						
						
						Threw an exception when you didnt pass an argument 
						
						
					 
					
						2016-03-30 14:43:04 +02:00