Hannes Greule 
							
						 
					 
					
						
						
							
						
						77eb75fcc6 
					 
					
						
						
							
							Adapt adventure changes  
						
						 
						
						
						
						
					 
					
						2020-08-20 23:28:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hannes Greule 
							
						 
					 
					
						
						
							
						
						55211907f2 
					 
					
						
						
							
							Use command descriptions from translations  
						
						 
						
						
						
						
					 
					
						2020-08-20 23:16:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alexander Söderberg 
							
						 
					 
					
						
						
							
						
						e1e7cd1479 
					 
					
						
						
							
							Add missing license headers  
						
						 
						
						
						
						
					 
					
						2020-08-20 17:11:12 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alexander Söderberg 
							
						 
					 
					
						
						
							
						
						2d3c729215 
					 
					
						
						
							
							Extract plot modifications to external class  
						
						 
						
						
						
						
					 
					
						2020-08-20 17:10:50 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alexander Söderberg 
							
						 
					 
					
						
						
							
						
						f391cfd432 
					 
					
						
						
							
							Extract comment logic from the plot class  
						
						 
						
						
						
						
					 
					
						2020-08-20 16:03:06 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						352136f0c6 
					 
					
						
						
							
							Cleanup logging system  
						
						 
						
						
						
						
					 
					
						2020-08-18 15:50:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						b6e7f90f6a 
					 
					
						
						
							
							Fix logger.info format  
						
						 
						
						
						
						
					 
					
						2020-08-18 15:34:43 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						86cfeb76b6 
					 
					
						
						
							
							More json stuff  
						
						 
						
						
						
						
					 
					
						2020-08-18 12:22:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NotMyFault 
							
						 
					 
					
						
						
							
						
						d91357a807 
					 
					
						
						
							
							Update messages_en.json  
						
						 
						
						
						
						
					 
					
						2020-08-18 10:59:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						3c8d7a808b 
					 
					
						
						
							
							Prefix changes and others  
						
						 
						
						
						
						
					 
					
						2020-08-17 23:21:18 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						d6a80c7ea5 
					 
					
						
						
							
							More json stuff, fixes and enhancements  
						
						 
						
						
						
						
					 
					
						2020-08-17 22:26:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						05a15ac689 
					 
					
						
						
							
							Fix a few typos and spaces  
						
						 
						
						
						
						
					 
					
						2020-08-17 19:39:43 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						580cc359e5 
					 
					
						
						
							
							fabb9b6fd7 (r41530745) 
						
						 
						
						
						
						
					 
					
						2020-08-17 18:56:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						630284e7ae 
					 
					
						
						
							
							More json fixes  
						
						 
						
						
						
						
					 
					
						2020-08-17 18:42:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						cc562033e7 
					 
					
						
						
							
							Fix console requirement  
						
						 
						
						
						
						
					 
					
						2020-08-17 18:29:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						fabb9b6fd7 
					 
					
						
						
							
							More json stuff  
						
						 
						
						
						
						
					 
					
						2020-08-17 18:15:29 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hannes Greule 
							
						 
					 
					
						
						
							
						
						aacf15757f 
					 
					
						
						
							
							Use less confusing variable name  
						
						 
						
						
						
						
					 
					
						2020-08-17 15:32:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hannes Greule 
							
						 
					 
					
						
						
							
						
						4789327378 
					 
					
						
						
							
							Encapsulate fields  
						
						 
						
						
						
						
					 
					
						2020-08-17 15:17:40 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						c6a368d6f2 
					 
					
						
						
							
							More json fixes  
						
						 
						
						
						
						
					 
					
						2020-08-17 13:24:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dependabot-preview[bot] 
							
						 
					 
					
						
						
							
						
						869a579655 
					 
					
						
						
							
							Bump annotations from 19.0.0 to 20.0.0  
						
						 
						
						... 
						
						
						
						Bumps [annotations](https://github.com/JetBrains/java-annotations ) from 19.0.0 to 20.0.0.
- [Release notes](https://github.com/JetBrains/java-annotations/releases )
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md )
- [Commits](https://github.com/JetBrains/java-annotations/compare/19.0.0...20.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com > 
						
						
					 
					
						2020-08-17 09:08:30 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alexander Söderberg 
							
						 
					 
					
						
						
							
						
						7cd1e8ea76 
					 
					
						
						
							
							Fix command registration  
						
						 
						
						
						
						
					 
					
						2020-08-17 04:39:59 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alexander Söderberg 
							
						 
					 
					
						
						
							
						
						351ae1b2c7 
					 
					
						
						
							
							Synchronize auto queries  
						
						 
						
						
						
						
					 
					
						2020-08-17 01:27:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hannes Greule 
							
						 
					 
					
						
						
							
						
						457f3e25cc 
					 
					
						
						
							
							resolve rebase issue  
						
						 
						
						
						
						
					 
					
						2020-08-17 01:10:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hannes Greule 
							
						 
					 
					
						
						
							
						
						41c670450b 
					 
					
						
						
							
							Remove PlotFilter  
						
						 
						
						
						
						
					 
					
						2020-08-17 01:10:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hannes Greule 
							
						 
					 
					
						
						
							
						
						f636db49f7 
					 
					
						
						
							
							Remove SetupObject  
						
						 
						
						
						
						
					 
					
						2020-08-17 01:10:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hannes Greule 
							
						 
					 
					
						
						
							
						
						505bba7612 
					 
					
						
						
							
							Fix recursive call  
						
						 
						
						
						
						
					 
					
						2020-08-17 00:53:39 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hannes Greule 
							
						 
					 
					
						
						
							
						
						9b086b3f2a 
					 
					
						
						
							
							Insert missing keys into message files  
						
						 
						
						
						
						
					 
					
						2020-08-17 00:29:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						f9d7d2d1dd 
					 
					
						
						
							
							Fix clickable messages  
						
						 
						
						
						
						
					 
					
						2020-08-16 19:43:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						e9efa3f2d3 
					 
					
						
						
							
							Fix some translation issues  
						
						 
						
						
						
						
					 
					
						2020-08-16 18:24:54 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dordsor21 
							
						 
					 
					
						
						
							
						
						665a72a08f 
					 
					
						
						
							
							Fill out a lot more JavaDoc.  
						
						 
						
						... 
						
						
						
						I've left DB stuff alone 
						
						
					 
					
						2020-08-16 13:22:49 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alexander Söderberg 
							
						 
					 
					
						
						
							
						
						a4c9ed90b7 
					 
					
						
						
							
							Fix startup issues and make messages send properly  
						
						 
						
						
						
						
					 
					
						2020-08-16 13:49:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dordsor21 
							
						 
					 
					
						
						
							
						
						12def37194 
					 
					
						
						
							
							clean up some javadoc stuff  
						
						 
						
						
						
						
					 
					
						2020-08-16 11:34:08 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alexander Söderberg 
							
						 
					 
					
						
						
							
						
						ed2302e545 
					 
					
						
						
							
							Remove illegal import  
						
						 
						
						
						
						
					 
					
						2020-08-16 12:10:19 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						618adb913d 
					 
					
						
						
							
							Update license and remove dead module entries  
						
						 
						
						
						
						
					 
					
						2020-08-15 19:17:29 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						4a220f9bfb 
					 
					
						
						
							
							Update license header  
						
						 
						
						
						
						
					 
					
						2020-08-15 14:59:29 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NotMyFault 
							
						 
					 
					
						
						
							
						
						300abd868a 
					 
					
						
						
							
							Merge pull request  #2888  from IntellectualSites/fix-conversion  
						
						 
						
						... 
						
						
						
						Fix problem with config creation 
						
						
					 
					
						2020-08-14 18:36:57 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alexander Söderberg 
							
						 
					 
					
						
						
							
						
						87f0b1fc97 
					 
					
						
						
							
							Add service system and rewrite Auto to use the service system  
						
						 
						
						
						
						
					 
					
						2020-08-14 17:24:34 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NotMyFault 
							
						 
					 
					
						
						
							
						
						5b27b652e7 
					 
					
						
						
							
							Fix color tag  
						
						 
						
						
						
						
					 
					
						2020-08-14 12:52:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						5e20c871a5 
					 
					
						
						
							
							Fix metrics setting  
						
						 
						
						
						
						
					 
					
						2020-08-14 11:36:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NotMyFault 
							
						 
					 
					
						
						
							
						
						56fb892818 
					 
					
						
						
							
							Fix brackets  
						
						 
						
						
						
						
					 
					
						2020-08-14 00:37:06 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						7f104c249a 
					 
					
						
						
							
							Permission cleanup  
						
						 
						
						... 
						
						
						
						- Removed plotme perms
- Fixed incorrect permission for "/plot flag remove"
- Fixed incorrect administrative unlink node
- Removed compat alias from "/plot set alias" command
I've documented all removed permission packages and fixed permissions in detail on the v6 page. So it's easy to go-by when updating. 
						
						
					 
					
						2020-08-13 23:32:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						0eeface374 
					 
					
						
						
							
							Remove old translations  
						
						 
						
						
						
						
					 
					
						2020-08-13 21:37:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						ffe1e1e40d 
					 
					
						
						
							
							Core is Core  
						
						 
						
						
						
						
					 
					
						2020-08-13 21:25:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						5efdef19cf 
					 
					
						
						
							
							Remove dead asset setting  
						
						 
						
						
						
						
					 
					
						2020-08-13 21:16:30 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						c9fae6a070 
					 
					
						
						
							
							Remove old translation setup and move commands to templates  
						
						 
						
						
						
						
					 
					
						2020-08-13 21:11:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						2b17f730d4 
					 
					
						
						
							
							Merge v5 into v6  
						
						 
						
						
						
						
					 
					
						2020-08-12 18:20:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Luca 
							
						 
					 
					
						
						
							
						
						64181c6ab8 
					 
					
						
						
							
							Update de-DE.yml  
						
						 
						
						... 
						
						
						
						adjusted grammar 
						
						
					 
					
						2020-08-11 19:29:40 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JunTVDE 
							
						 
					 
					
						
						
							
						
						987d9a267c 
					 
					
						
						
							
							added german translation for flag-descriptions to de-DE.yml  
						
						 
						
						
						
						
					 
					
						2020-08-09 13:05:40 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								EinDev 
							
						 
					 
					
						
						
							
						
						b46a19f5ca 
					 
					
						
						
							
							Keep player names, so they don't have to be looked up again.  
						
						 
						
						... 
						
						
						
						That way the lookup function MainUtil#getName won't get called which would throw an exception if called in the Bukkit Thread.
As the player enters the Name, we don't have to look it up again.
Fixes PS-96 
						
						
					 
					
						2020-08-08 18:07:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dordsor21 
							
						 
					 
					
						
						
							
						
						7bad242944 
					 
					
						
						
							
							Merge branch 'v6' into feature/v6/json. It builds!  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	Bukkit/build.gradle
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/inject/BukkitModule.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/queue/ChunkCoordinator.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
#	Core/src/main/java/com/plotsquared/core/PlotSquared.java
#	Core/src/main/java/com/plotsquared/core/command/Area.java
#	Core/src/main/java/com/plotsquared/core/command/Clear.java
#	Core/src/main/java/com/plotsquared/core/command/Debug.java
#	Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java
#	Core/src/main/java/com/plotsquared/core/command/Relight.java
#	Core/src/main/java/com/plotsquared/core/command/Set.java
#	Core/src/main/java/com/plotsquared/core/command/Template.java
#	Core/src/main/java/com/plotsquared/core/command/Trim.java
#	Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java
#	Core/src/main/java/com/plotsquared/core/generator/ClassicPlotManager.java
#	Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java
#	Core/src/main/java/com/plotsquared/core/plot/Plot.java
#	Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java
#	Core/src/main/java/com/plotsquared/core/queue/AreaBoundDelegateQueueCoordinator.java
#	Core/src/main/java/com/plotsquared/core/queue/ChunkQueueCoordinator.java
#	Core/src/main/java/com/plotsquared/core/queue/LocalBlockQueue.java
#	Core/src/main/java/com/plotsquared/core/util/ChunkUtil.java
#	Core/src/main/java/com/plotsquared/core/util/EntityUtil.java
#	Core/src/main/java/com/plotsquared/core/util/RegionManager.java
#	Core/src/main/java/com/plotsquared/core/util/WorldUtil.java
#	Core/src/main/java/com/plotsquared/core/uuid/UUIDPipeline.java
#	build.gradle 
						
						
					 
					
						2020-08-08 13:20:30 +01:00