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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						c31c4b4286 
					 
					
						
						
							
							More work  
						
						 
						
						
						
						
					 
					
						2020-08-07 18:52:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dordsor21 
							
						 
					 
					
						
						
							
						
						7f29b5d1e8 
					 
					
						
						
							
							ComponentPreset inventory to json  
						
						 
						
						
						
						
					 
					
						2020-08-07 13:22:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dordsor21 
							
						 
					 
					
						
						
							
						
						50cfecb3fd 
					 
					
						
						
							
							Several minor progress. Couple of bigger (inboxes and help)  
						
						 
						
						
						
						
					 
					
						2020-08-07 11:08:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dordsor21 
							
						 
					 
					
						
						
							
						
						1461804039 
					 
					
						
						
							
							Remove last reference to PlotMessage in Core  
						
						 
						
						
						
						
					 
					
						2020-08-07 10:20:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hannes Greule 
							
						 
					 
					
						
						
							
						
						6970dfa5f8 
					 
					
						
						
							
							More json progress  
						
						 
						
						
						
						
					 
					
						2020-08-07 02:53:05 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dordsor21 
							
						 
					 
					
						
						
							
						
						18f630ba15 
					 
					
						
						
							
							Bit more json  
						
						 
						
						
						
						
					 
					
						2020-08-06 14:06:19 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dordsor21 
							
						 
					 
					
						
						
							
						
						f68eb9c778 
					 
					
						
						
							
							update plot list  
						
						 
						
						
						
						
					 
					
						2020-08-06 13:36:15 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dordsor21 
							
						 
					 
					
						
						
							
						
						4a960d9f2c 
					 
					
						
						
							
							update pagination to new json  
						
						 
						
						
						
						
					 
					
						2020-08-06 12:23:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dordsor21 
							
						 
					 
					
						
						
							
						
						f1e3902fea 
					 
					
						
						
							
							Several more progress  
						
						 
						
						
						
						
					 
					
						2020-08-05 11:48:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						41a623a643 
					 
					
						
						
							
							More work towards json  
						
						 
						
						
						
						
					 
					
						2020-08-04 19:01:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dordsor21 
							
						 
					 
					
						
						
							
						
						d3fe1d3b2b 
					 
					
						
						
							
							Fix plot info, sign usage in Plot.class  
						
						 
						
						
						
						
					 
					
						2020-08-04 15:07:07 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						01e66f8833 
					 
					
						
						
							
							Readd skyblock template  
						
						 
						
						
						
						
					 
					
						2020-07-29 14:53:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						22a007b514 
					 
					
						
						
							
							Revert "Update zh-CN.yml"  
						
						 
						
						... 
						
						
						
						This reverts commit 240362a16d . 
						
						
					 
					
						2020-07-28 12:33:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NotMyFault 
							
						 
					 
					
						
						
							
						
						240362a16d 
					 
					
						
						
							
							Update zh-CN.yml  
						
						 
						
						
						
						
					 
					
						2020-07-26 17:08:58 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						603d1ee9bb 
					 
					
						
						
							
							Even more  
						
						 
						
						... 
						
						
						
						Ok seriously, I stop here 
						
						
					 
					
						2020-07-22 20:38:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						32e095ce15 
					 
					
						
						
							
							More progress  
						
						 
						
						... 
						
						
						
						I need a break, if something is missing, feel free to exchange that. K thx 🙏  
						
						
					 
					
						2020-07-22 19:42:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						8d04728ebc 
					 
					
						
						
							
							More work  
						
						 
						
						
						
						
					 
					
						2020-07-22 00:08:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						2aa5c276c9 
					 
					
						
						
							
							Some more work done towards json  
						
						 
						
						
						
						
					 
					
						2020-07-21 21:39:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alexander Söderberg 
							
						 
					 
					
						
						
							
						
						ed3eedd238 
					 
					
						
						
							
							Merge branch 'v6' into feature/v6/json  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
#	Core/src/main/java/com/plotsquared/core/PlotSquared.java
#	Core/src/main/java/com/plotsquared/core/command/Add.java
#	Core/src/main/java/com/plotsquared/core/command/Auto.java
#	Core/src/main/java/com/plotsquared/core/command/Buy.java
#	Core/src/main/java/com/plotsquared/core/command/Template.java
#	Core/src/main/java/com/plotsquared/core/generator/HybridPlotManager.java
#	Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java
#	Core/src/main/java/com/plotsquared/core/listener/PlotListener.java
#	Core/src/main/java/com/plotsquared/core/location/Location.java
#	Core/src/main/java/com/plotsquared/core/plot/Plot.java
#	Core/src/main/java/com/plotsquared/core/plot/PlotArea.java
#	Core/src/main/java/com/plotsquared/core/plot/PlotCluster.java
#	Core/src/main/java/com/plotsquared/core/plot/PlotId.java
#	Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java
#	Core/src/main/java/com/plotsquared/core/plot/flag/implementations/KeepFlag.java
#	Core/src/main/java/com/plotsquared/core/util/MainUtil.java
#	Core/src/main/java/com/plotsquared/core/util/PlayerManager.java
#	Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java
#	Core/src/main/java/com/plotsquared/core/util/query/PlotQuery.java
#	Core/src/main/java/com/plotsquared/core/util/query/SearchPlotProvider.java 
						
						
					 
					
						2020-07-19 14:32:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hannes Greule 
							
						 
					 
					
						
						
							
						
						7e0cdb12d7 
					 
					
						
						
							
							Replace some common messages  
						
						 
						
						
						
						
					 
					
						2020-07-18 15:06:51 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alexander Söderberg 
							
						 
					 
					
						
						
							
						
						e80ade65c7 
					 
					
						
						
							
							Clean up PlotId  
						
						 
						
						
						
						
					 
					
						2020-07-18 11:05:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alexander Söderberg 
							
						 
					 
					
						
						
							
						
						5478e70576 
					 
					
						
						
							
							Fix some more captions  
						
						 
						
						
						
						
					 
					
						2020-07-17 21:46:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alexander Söderberg 
							
						 
					 
					
						
						
							
						
						22bd2eb238 
					 
					
						
						
							
							Super minor issues from previous merges  
						
						 
						
						
						
						
					 
					
						2020-07-17 18:06:38 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alexander Söderberg 
							
						 
					 
					
						
						
							
						
						99be181aea 
					 
					
						
						
							
							Migrate some more captions  
						
						 
						
						
						
						
					 
					
						2020-07-14 16:31:58 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						f93714a44e 
					 
					
						
						
							
							Properly add prefixes to messages  
						
						 
						
						
						
						
					 
					
						2020-07-13 13:01:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hannes Greule 
							
						 
					 
					
						
						
							
						
						564efd77f7 
					 
					
						
						
							
							Fix some messages  
						
						 
						
						
						
						
					 
					
						2020-07-12 22:11:23 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						1881cdc9ab 
					 
					
						
						
							
							Revert "Add prefix"  
						
						 
						
						... 
						
						
						
						This reverts commit fb2aa44f78 . 
						
						
					 
					
						2020-07-12 21:28:38 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						fb2aa44f78 
					 
					
						
						
							
							Add prefix  
						
						 
						
						
						
						
					 
					
						2020-07-12 21:25:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hannes Greule 
							
						 
					 
					
						
						
							
						
						6bf5bc60d1 
					 
					
						
						
							
							Update messages_en.json with new placeholders  
						
						 
						
						
						
						
					 
					
						2020-07-04 18:57:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						600f757046 
					 
					
						
						
							
							Finish messages  
						
						 
						
						
						
						
					 
					
						2020-06-29 12:34:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						a2aaa3633a 
					 
					
						
						
							
							More work  
						
						 
						
						
						
						
					 
					
						2020-06-28 16:56:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						3b793929d8 
					 
					
						
						
							
							Initialize messages_en.json  
						
						 
						
						
						
						
					 
					
						2020-06-28 13:51:57 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Aurélien 
							
						 
					 
					
						
						
							
						
						be6910d5d9 
					 
					
						
						
							
							Reformated and update French translation  
						
						 
						
						... 
						
						
						
						Some of my translations used '' to represent ' but it's not needed. Also splited some long lines and translated new backup system and keep-inventory flag. 
						
						
					 
					
						2020-05-12 17:29:32 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NotMyFault 
							
						 
					 
					
						
						
							
						
						b136f44f12 
					 
					
						
						
							
							Merge branch 'v5' into remove-eol-translation-strings  
						
						 
						
						
						
						
					 
					
						2020-05-10 15:05:58 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Aurélien 
							
						 
					 
					
						
						
							
						
						503fc44208 
					 
					
						
						
							
							Updated according to new translations and old removed  
						
						 
						
						
						
						
					 
					
						2020-05-10 14:12:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Aurélien 
							
						 
					 
					
						
						
							
						
						d3bfaeb5a4 
					 
					
						
						
							
							Ready for merging !  
						
						 
						
						... 
						
						
						
						Removed useless space at the end of the file + precision of the date (latest edition) 
						
						
					 
					
						2020-05-10 14:12:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Aurélien 
							
						 
					 
					
						
						
							
						
						7adecd0808 
					 
					
						
						
							
							Last fix (removed unused translation + added the missing)  
						
						 
						
						
						
						
					 
					
						2020-05-10 14:12:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Aurélien 
							
						 
					 
					
						
						
							
						
						c99e081ae0 
					 
					
						
						
							
							Fiexed issues reported by CodeFactor  
						
						 
						
						
						
						
					 
					
						2020-05-10 14:12:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Aurélien 
							
						 
					 
					
						
						
							
						
						285b6bf62d 
					 
					
						
						
							
							Updated and corrected French translation  
						
						 
						
						... 
						
						
						
						Old translation has been reviewed and new v5 flags' translations has been added.
Some mistakes could now remain, I will fix them if needed ;)
Enjoy ! 
						
						
					 
					
						2020-05-10 14:12:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						198c7ca58d 
					 
					
						
						
							
							Remove dead translations  
						
						 
						
						
						
						
					 
					
						2020-05-09 14:04:08 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								N0tMyFaultOG 
							
						 
					 
					
						
						
							
						
						4780fcd534 
					 
					
						
						
							
							Fixes   #2782  
						
						 
						
						... 
						
						
						
						Thanks for the contribution :) 
						
						
					 
					
						2020-04-21 15:53:38 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alexander Söderberg 
							
						 
					 
					
						
						
							
						
						6f052f0001 
					 
					
						
						
							
							Remove extra line from HEADER  
						
						 
						
						
						
						
					 
					
						2020-04-16 05:05:58 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alexander Söderberg 
							
						 
					 
					
						
						
							
						
						ba40a56c32 
					 
					
						
						
							
							Add GPLv3 License headers to all source files.  
						
						 
						
						
						
						
					 
					
						2020-04-16 04:52:39 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NotMyFault 
							
						 
					 
					
						
						
							
						
						24b6b23d25 
					 
					
						
						
							
							Bind update notifications to spigot resource updates  
						
						 
						
						... 
						
						
						
						The notification permission could be moved back into the other class, but well 
						
						
					 
					
						2020-02-16 01:33:43 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NotMyFault 
							
						 
					 
					
						
						
							
						
						118adb42b9 
					 
					
						
						
							
							add hungarian translation  
						
						 
						
						
						
						
					 
					
						2020-01-14 12:27:23 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NotMyFault 
							
						 
					 
					
						
						
							
						
						05ef076ef0 
					 
					
						
						
							
							Remove unnecessary spaces  
						
						 
						
						
						
						
					 
					
						2019-09-12 04:01:47 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NotMyFault 
							
						 
					 
					
						
						
							
						
						d20d95d29b 
					 
					
						
						
							
							Remove schematic test command  
						
						 
						
						
						
						
					 
					
						2019-09-12 03:53:29 +02:00