dordsor21 
							
						 
					 
					
						
						
							
						
						8cd54929e7 
					 
					
						
						
							
							Merge branch 'master' into breaking  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotRateEvent.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEventUtil.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/GameModeFlag.java
#	Core/src/main/java/com/intellectualcrafters/plot/commands/Clear.java
#	Core/src/main/java/com/intellectualcrafters/plot/commands/PluginCmd.java
#	Core/src/main/java/com/intellectualcrafters/plot/commands/Relight.java
#	Core/src/main/java/com/intellectualcrafters/plot/commands/SetHome.java
#	Core/src/main/java/com/intellectualcrafters/plot/config/C.java
#	Core/src/main/java/com/intellectualcrafters/plot/config/Configuration.java
#	Core/src/main/java/com/intellectualcrafters/plot/config/Settings.java
#	Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java
#	Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitEventUtil.java
#	README.md
#	Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotRateEvent.java
#	Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeSchematicHandler.java
#	Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/block/SpongeLocalQueue.java
#	Sponge/src/main/java/com/plotsquared/sponge/util/SpongeEventUtil.java 
						
						
					 
					
						2018-11-14 14:44:07 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sauilitired 
							
						 
					 
					
						
						
							
						
						8df7f63931 
					 
					
						
						
							
							Refactor PS (and rename to PlotSquared)  
						
						 
						
						
						
						
					 
					
						2018-11-14 14:19:57 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dordsor21 
							
						 
					 
					
						
						
							
						
						ea5ffbeb77 
					 
					
						
						
							
							Cancel plot chat if message event is cancelled to allow for swear block/etc  
						
						 
						
						
						
						
					 
					
						2018-10-25 10:51:18 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dordsor21 
							
						 
					 
					
						
						
							
						
						9e9b21779c 
					 
					
						
						
							
							Add PlotChangeOwner Event  
						
						 
						
						
						
						
					 
					
						2018-09-19 16:57:33 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sauilitired 
							
						 
					 
					
						
						
							
						
						01a927ccad 
					 
					
						
						
							
							Allow PlotRateEvent to be cancelled.  Fixes   #2017  
						
						 
						
						
						
						
					 
					
						2018-08-19 23:12:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sauilitired 
							
						 
					 
					
						
						
							
						
						b0348cfc34 
					 
					
						
						
							
							Update packages. This will not be appreciated  🐱  
						
						 
						
						
						
						
					 
					
						2018-08-10 17:53:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sauilitired 
							
						 
					 
					
						
						
							
						
						1646cd0f5a 
					 
					
						
						
							
							Reformat code  
						
						 
						
						
						
						
					 
					
						2018-08-10 17:01:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						645c5fb529 
					 
					
						
						
							
							Fix nukkit augmented generator  
						
						 
						
						
						
						
					 
					
						2018-07-27 13:25:46 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						2d98da47cf 
					 
					
						
						
							
							Debug generator error  
						
						 
						
						
						
						
					 
					
						2018-07-27 10:57:34 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						9897890e6a 
					 
					
						
						
							
							*Add console sender to nukkit chat  
						
						 
						
						
						
						
					 
					
						2018-06-09 15:49:54 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						ce3e3be59e 
					 
					
						
						
							
							Tweak nukkit plot chat  
						
						 
						
						
						
						
					 
					
						2018-06-09 15:37:49 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						39084be791 
					 
					
						
						
							
							Fix nukkit compile  
						
						 
						
						
						
						
					 
					
						2018-03-19 16:05:12 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						c98f2b4261 
					 
					
						
						
							
							update to latest nukkit  
						
						 
						
						
						
						
					 
					
						2018-02-13 02:16:13 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						d9a17bd379 
					 
					
						
						
							
							Fixes   #1872  
						
						 
						
						
						
						
					 
					
						2018-02-08 19:48:40 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						73d0068d07 
					 
					
						
						
							
							Update to latest nukkit  
						
						 
						
						
						
						
					 
					
						2018-02-02 15:19:58 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						02b358133e 
					 
					
						
						
							
							Better idea, send the packet.  Closes   #1837  
						
						 
						
						
						
						
					 
					
						2018-01-10 17:39:12 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						17e4c1ec60 
					 
					
						
						
							
							Update NukkitMain.java  
						
						 
						
						
						
						
					 
					
						2018-01-10 16:45:41 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Josh 
							
						 
					 
					
						
						
							
						
						b9a4f2256e 
					 
					
						
						
							
							Update NukkitMain.java  
						
						 
						
						
						
						
					 
					
						2018-01-10 00:44:38 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Langel 
							
						 
					 
					
						
						
							
						
						7d39d09317 
					 
					
						
						
							
							fix: remove plot-alias with "/p alias" ( #1779 )  
						
						 
						
						... 
						
						
						
						* fix: remove plot-alias with "/p alias"
remove plot-alias with "/p alias" #1718 
* Apply requested Review Changes
Restored the original Permisson to keep backwards compatibility
Clean unused imports.
* added some improvements after testing
added some improvements after testing 
						
						
					 
					
						2017-12-03 17:59:36 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						b280644661 
					 
					
						
						
							
							Delete build  
						
						 
						
						
						
						
					 
					
						2017-08-09 15:01:16 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						73318f23a1 
					 
					
						
						
							
							Fixes   #1660  
						
						 
						
						
						
						
					 
					
						2017-07-08 21:56:15 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						9037b74720 
					 
					
						
						
							
							Closes   #1659  
						
						 
						
						
						
						
					 
					
						2017-07-07 16:11:46 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						022372e9b7 
					 
					
						
						
							
							Fixes   #1534  + various  
						
						 
						
						... 
						
						
						
						Auto world loading/unloading
Auto player teleporting on login 
						
						
					 
					
						2017-04-04 07:59:36 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						5d6f4c6668 
					 
					
						
						
							
							Some plot area restructuring  
						
						 
						
						
						
						
					 
					
						2017-03-23 11:10:29 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						35ebc8c830 
					 
					
						
						
							
							Permission check fix  
						
						 
						
						
						
						
					 
					
						2017-01-13 07:22:28 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						7a1417dc56 
					 
					
						
						
							
							Fixes   #1415  
						
						 
						
						
						
						
					 
					
						2016-11-30 15:45:28 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						c97544d083 
					 
					
						
						
							
							Minor fixes  
						
						 
						
						
						
						
					 
					
						2016-10-14 15:14:08 +11:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						6074fc8033 
					 
					
						
						
							
							Nukkit generator fixes  
						
						 
						
						
						
						
					 
					
						2016-09-30 14:26:20 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						12f8861d07 
					 
					
						
						
							
							Various  
						
						 
						
						... 
						
						
						
						externalize strings
plotme conversion fixes 
						
						
					 
					
						2016-09-26 18:31:08 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						86b776f742 
					 
					
						
						
							
							Nukkit perms  
						
						 
						
						
						
						
					 
					
						2016-09-25 16:49:51 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						9e5af7a642 
					 
					
						
						
							
							Possible fix for redstone in merged plots  
						
						 
						
						
						
						
					 
					
						2016-09-20 23:49:22 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						264114332b 
					 
					
						
						
							
							Let generator be up to the implementation  
						
						 
						
						
						
						
					 
					
						2016-09-17 16:02:05 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						0286a7b046 
					 
					
						
						
							
							Fixes   #1131  
						
						 
						
						
						
						
					 
					
						2016-09-14 10:12:53 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MattBDev 
							
						 
					 
					
						
						
							
						
						b6dac54677 
					 
					
						
						
							
							Code cleaning and Gradle Update  
						
						 
						
						... 
						
						
						
						Updated gradle wrapper to 3.0
Updated Gradle files for Nukkit
Added/cleaned minor Nukkit code
Removed duplicate TitleManagement code
Signed-off-by: MattBDev <mattbdev@outlook.com > 
						
						
					 
					
						2016-09-13 18:10:01 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						85ff8bf639 
					 
					
						
						
							
							Minor tweaks  
						
						 
						
						
						
						
					 
					
						2016-09-07 00:28:01 +10:00