MattBDev 
							
						 
					 
					
						
						
							
						
						bb21abb110 
					 
					
						
						
							
							Merge branch 'breaking' into paperstuff  
						
						... 
						
						
						
						# Conflicts:
#	Bukkit/build.gradle
#	Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
#	Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java
#	Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Relight.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java 
						
						
					 
					
						2019-08-03 23:11:02 -04:00 
						 
				 
			
				
					
						
							
							
								NotMyFault 
							
						 
					 
					
						
						
							
						
						59517647b5 
					 
					
						
						
							
							Remove old files  
						
						
						
						
					 
					
						2019-08-03 23:20:21 +02:00 
						 
				 
			
				
					
						
							
							
								NotMyFault 
							
						 
					 
					
						
						
							
						
						1eba425087 
					 
					
						
						
							
							Migrate Templates to new format  
						
						
						
						
					 
					
						2019-08-03 23:18:50 +02:00 
						 
				 
			
				
					
						
							
							
								NotMyFault 
							
						 
					 
					
						
						
							
						
						16fcb2f505 
					 
					
						
						
							
							Update DebugUUID.java  
						
						
						
						
					 
					
						2019-07-30 23:58:48 +02:00 
						 
				 
			
				
					
						
							
							
								NotMyFault 
							
						 
					 
					
						
						
							
						
						6d0849eb66 
					 
					
						
						
							
							Merge pull request  #2431  from IntellectualSites/kelp-grow  
						
						... 
						
						
						
						Add kelp-grow flag 
						
						
					 
					
						2019-07-27 21:55:39 +02:00 
						 
				 
			
				
					
						
							
							
								NotMyFault 
							
						 
					 
					
						
						
							
						
						dbf5084fa1 
					 
					
						
						
							
							Reformat debugpaste  
						
						... 
						
						
						
						And upgrade from IC -> IS 
						
						
					 
					
						2019-07-25 20:02:39 +02:00 
						 
				 
			
				
					
						
							
							
								MattBDev 
							
						 
					 
					
						
						
							
						
						d6779d977a 
					 
					
						
						
							
							Fixes   #2423  
						
						
						
						
					 
					
						2019-07-21 20:43:36 -04:00 
						 
				 
			
				
					
						
							
							
								MattBDev 
							
						 
					 
					
						
						
							
						
						e8df39d3c4 
					 
					
						
						
							
							Fixes   #2435  
						
						
						
						
					 
					
						2019-07-21 20:40:04 -04:00 
						 
				 
			
				
					
						
							
							
								NotMyFault 
							
						 
					 
					
						
						
							
						
						feda094273 
					 
					
						
						
							
							Add kelp-grow flag  
						
						... 
						
						
						
						Simply as the name says, add a controlled way to let kelp grow. 
						
						
					 
					
						2019-07-20 01:29:30 +02:00 
						 
				 
			
				
					
						
							
							
								Jesse Boyd 
							
						 
					 
					
						
						
							
						
						23b88a375d 
					 
					
						
						
							
							player interact ignore cancel  
						
						
						
						
					 
					
						2019-07-12 02:18:08 +10:00 
						 
				 
			
				
					
						
							
							
								dordsor21 
							
						 
					 
					
						
						
							
						
						095dccd30f 
					 
					
						
						
							
							Revert changes to intersection generation  
						
						
						
						
					 
					
						2019-06-28 13:59:57 +01:00 
						 
				 
			
				
					
						
							
							
								dordsor21 
							
						 
					 
					
						
						
							
						
						246845607f 
					 
					
						
						
							
							Let's first test against Material.matchMaterial for material matching (:  
						
						... 
						
						
						
						Also update some dependencies 
						
						
					 
					
						2019-06-27 15:18:54 +01:00 
						 
				 
			
				
					
						
							
							
								NotMyFault 
							
						 
					 
					
						
						
							
						
						3074e45d2c 
					 
					
						
						
							
							Fixed   #2325  
						
						... 
						
						
						
						The permission node does not exist on PlotMe anymore 
						
						
					 
					
						2019-06-25 11:43:28 +02:00 
						 
				 
			
				
					
						
							
							
								dordsor21 
							
						 
					 
					
						
						
							
						
						83d1f1d629 
					 
					
						
						
							
							1.14 id support ( #2404 )  
						
						... 
						
						
						
						* Plausible fix for 1.14 support.
- Allow 1.14 blocks to be specified in LegacyBlocks, but only saved if the server version is 1.14.
- No snazzy config conversion, but it seems most people managed to figure it out on their own anyway
* Ignore the "severe" output because of new 1.13/14 blocks
* fix oak_wall_sign for 1.14 
						
						
					 
					
						2019-06-24 13:37:59 +01:00 
						 
				 
			
				
					
						
							
							
								dordsor21 
							
						 
					 
					
						
						
							
						
						485415c551 
					 
					
						
						
							
							1.14 id support ( #2403 )  
						
						... 
						
						
						
						* Plausible fix for 1.14 support.
- Allow 1.14 blocks to be specified in LegacyBlocks, but only saved if the server version is 1.14.
- No snazzy config conversion, but it seems most people managed to figure it out on their own anyway
* Ignore the "severe" output because of new 1.13/14 blocks 
						
						
					 
					
						2019-06-23 14:17:44 +01:00 
						 
				 
			
				
					
						
							
							
								Alexander Krivács Schrøder 
							
						 
					 
					
						
						
							
						
						d6401d1638 
					 
					
						
						
							
							Allow running the road regeneration on a single region  
						
						... 
						
						
						
						The plot-based road regeneration from before does not have the same behavior as the real road regeneration code. This new debug operation will regenerate the roads within the region the player is standing using the same code that regenerates all roads. This makes it much easier to tell if things are working correctly and as expected. 
						
						
					 
					
						2019-06-16 11:57:35 -04:00 
						 
				 
			
				
					
						
							
							
								Alexander Krivács Schrøder 
							
						 
					 
					
						
						
							
						
						7f404e1cf5 
					 
					
						
						
							
							Fix plot walls after running regenallroads  
						
						... 
						
						
						
						Also clears whatever was above the plot wall, such as pieces of the road. 
						
						
					 
					
						2019-06-16 11:57:35 -04:00 
						 
				 
			
				
					
						
							
							
								Alexander Krivács Schrøder 
							
						 
					 
					
						
						
							
						
						a94c588a17 
					 
					
						
						
							
							Check if location has PlotArea to avoid NPE  
						
						
						
						
					 
					
						2019-06-03 16:26:20 -04:00 
						 
				 
			
				
					
						
							
							
								Alexander Krivács Schrøder 
							
						 
					 
					
						
						
							
						
						d106262454 
					 
					
						
						
							
							Have PlotAreas create their own PlotManager  
						
						... 
						
						
						
						Leads to cleaner code, less need for instanceof and casting, as a PlotArea knows which kind of PlotManager it needs to make 
						
						
					 
					
						2019-06-03 16:26:20 -04:00 
						 
				 
			
				
					
						
							
							
								Alexander Krivács Schrøder 
							
						 
					 
					
						
						
							
						
						c5bca66618 
					 
					
						
						
							
							Remove PlotArea parameter from PlotManager method calls  
						
						... 
						
						
						
						As per the previous commit, all PlotManagers now have a reference to their managed PlotArea. 
						
						
					 
					
						2019-06-03 16:26:20 -04:00 
						 
				 
			
				
					
						
							
							
								Alexander Krivács Schrøder 
							
						 
					 
					
						
						
							
						
						6b3960fc3f 
					 
					
						
						
							
							Pass the PlotArea into the PlotManager  
						
						
						
						
					 
					
						2019-06-03 16:26:20 -04:00 
						 
				 
			
				
					
						
							
							
								Alexander Krivács Schrøder 
							
						 
					 
					
						
						
							
						
						908a5784a1 
					 
					
						
						
							
							Cache conversions to BaseBlock and fix leaky abstraction  
						
						
						
						
					 
					
						2019-06-03 16:24:59 -04:00 
						 
				 
			
				
					
						
							
							
								Alexander Krivács Schrøder 
							
						 
					 
					
						
						
							
						
						bbff898073 
					 
					
						
						
							
							Extract air block into variable to reduce unnecessary function calls  
						
						
						
						
					 
					
						2019-06-03 16:24:59 -04:00 
						 
				 
			
				
					
						
							
							
								Alexander Krivács Schrøder 
							
						 
					 
					
						
						
							
						
						19f8704cb4 
					 
					
						
						
							
							Remove leftovers from getting rid of PlotBlocks in LocalChunk  
						
						
						
						
					 
					
						2019-06-03 16:24:59 -04:00 
						 
				 
			
				
					
						
							
							
								Alexander Krivács Schrøder 
							
						 
					 
					
						
						
							
						
						b366b0d261 
					 
					
						
						
							
							Set unspecified blocks from the schematic to air  
						
						... 
						
						
						
						If this isn't done, any blocks not specified in the schematic will remain after a clear, which is obviously undesirable. 
						
						
					 
					
						2019-06-03 16:24:59 -04:00 
						 
				 
			
				
					
						
							
							
								Alexander Krivács Schrøder 
							
						 
					 
					
						
						
							
						
						941821e453 
					 
					
						
						
							
							Convert all PlotBlocks to BaseBlocks in the BasicLocalBlockQueue  
						
						... 
						
						
						
						The `BukkitLocalQueue` only supports using one of the sets (the removed `baseBlocks` variable in `BasicLocalBlockQueue` was the deciding factor for which one won out) which led to issues with missing blocks when trying to use both types at the same time, such as in the `HybridPlotManager`s `clearPlot` method, where `PlotBlock` is used to fill in the various layers, while the`createSchemAbs` method uses `BaseBlock` for its data. 
						
						
					 
					
						2019-06-03 16:24:59 -04:00 
						 
				 
			
				
					
						
							
							
								MattBDev 
							
						 
					 
					
						
						
							
						
						427523644c 
					 
					
						
						
							
							Removed unused imports  
						
						
						
						
					 
					
						2019-05-31 12:04:38 -04:00 
						 
				 
			
				
					
						
							
							
								MattBDev 
							
						 
					 
					
						
						
							
						
						475e9b50e1 
					 
					
						
						
							
							Fixes   #2380  
						
						
						
						
					 
					
						2019-05-31 12:00:44 -04:00 
						 
				 
			
				
					
						
							
							
								MattBDev 
							
						 
					 
					
						
						
							
						
						812d41092e 
					 
					
						
						
							
							Merge branch 'breaking' of  https://github.com/IntellectualSites/PlotSquared  into breaking  
						
						
						
						
					 
					
						2019-05-31 11:57:18 -04:00 
						 
				 
			
				
					
						
							
							
								Alexander Krivács Schrøder 
							
						 
					 
					
						
						
							
						
						41299e6851 
					 
					
						
						
							
							Fix issue with plot border during merge  
						
						... 
						
						
						
						* `getExtendedTopAbs()` used wrong relative plot for calculating X position.
* Not running `finishPlotMerge()` after every merge led to broken roads during a `merge all` 
						
						
					 
					
						2019-05-29 23:28:16 -04:00 
						 
				 
			
				
					
						
							
							
								Alexander Krivács Schrøder 
							
						 
					 
					
						
						
							
						
						95cb0d84f0 
					 
					
						
						
							
							Fix issue with road generation during unlink  
						
						... 
						
						
						
						Roads should always be created with respect to `current`. 
						
						
					 
					
						2019-05-29 23:28:16 -04:00 
						 
				 
			
				
					
						
							
							
								zombachu 
							
						 
					 
					
						
						
							
						
						fb478de164 
					 
					
						
						
							
							Update outdated list of files to check on failed world load ( #2365 )  
						
						
						
						
					 
					
						2019-05-22 12:09:31 -04:00 
						 
				 
			
				
					
						
							
							
								MattBDev 
							
						 
					 
					
						
						
							
						
						1bd7c8ca5f 
					 
					
						
						
							
							Variable renames  
						
						
						
						
					 
					
						2019-05-21 18:50:52 -04:00 
						 
				 
			
				
					
						
							
							
								MattBDev 
							
						 
					 
					
						
						
							
						
						fe471c3571 
					 
					
						
						
							
							new library in gradle and another change I can't remember.  
						
						
						
						
					 
					
						2019-05-21 18:32:26 -04:00 
						 
				 
			
				
					
						
							
							
								MattBDev 
							
						 
					 
					
						
						
							
						
						8ff833de36 
					 
					
						
						
							
							Added Paper to Platform  
						
						
						
						
					 
					
						2019-05-17 18:50:24 -04:00 
						 
				 
			
				
					
						
							
							
								MattBDev 
							
						 
					 
					
						
						
							
						
						5dd2610b5e 
					 
					
						
						
							
							Misc. changes and removal of title manager  
						
						
						
						
					 
					
						2019-05-17 18:49:09 -04:00 
						 
				 
			
				
					
						
							
							
								MattBDev 
							
						 
					 
					
						
						
							
						
						4e3a927323 
					 
					
						
						
							
							Modifications to the generator code  
						
						
						
						
					 
					
						2019-05-17 16:21:03 -04:00 
						 
				 
			
				
					
						
							
							
								MattBDev 
							
						 
					 
					
						
						
							
						
						595a68ecba 
					 
					
						
						
							
							variable renames  
						
						
						
						
					 
					
						2019-05-17 15:32:05 -04:00 
						 
				 
			
				
					
						
							
							
								MattBDev 
							
						 
					 
					
						
						
							
						
						6f5cb30734 
					 
					
						
						
							
							Minor message changes and variable changes  
						
						
						
						
					 
					
						2019-05-17 14:38:57 -04:00 
						 
				 
			
				
					
						
							
							
								MattBDev 
							
						 
					 
					
						
						
							
						
						427504fd7c 
					 
					
						
						
							
							Commented out Multiverse-Core and Bump to 1.14.1  
						
						
						
						
					 
					
						2019-05-17 14:26:47 -04:00 
						 
				 
			
				
					
						
							
							
								MattBDev 
							
						 
					 
					
						
						
							
						
						b66734a472 
					 
					
						
						
							
							Misc. code changes  
						
						... 
						
						
						
						A lot of renaming
Some formatting
Narrowed scope of variables
Added annotations 
						
						
					 
					
						2019-05-13 21:57:41 -04:00 
						 
				 
			
				
					
						
							
							
								MattBDev 
							
						 
					 
					
						
						
							
						
						84911c1a8c 
					 
					
						
						
							
							Remove unused title classes  
						
						
						
						
					 
					
						2019-05-13 18:22:17 -04:00 
						 
				 
			
				
					
						
							
							
								MattBDev 
							
						 
					 
					
						
						
							
						
						adefe2eeef 
					 
					
						
						
							
							Titles can be used on Spigot and Paper now  
						
						
						
						
					 
					
						2019-05-13 18:20:58 -04:00 
						 
				 
			
				
					
						
							
							
								MattBDev 
							
						 
					 
					
						
						
							
						
						549a4df834 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/breaking' into breaking  
						
						
						
						
					 
					
						2019-05-13 15:56:41 -04:00 
						 
				 
			
				
					
						
							
							
								MattBDev 
							
						 
					 
					
						
						
							
						
						4daf1c7721 
					 
					
						
						
							
							Fixes   #2355  
						
						
						
						
					 
					
						2019-05-13 15:56:28 -04:00 
						 
				 
			
				
					
						
							
							
								dordsor21 
							
						 
					 
					
						
						
							
						
						728082723c 
					 
					
						
						
							
							Revert "Don't force metrics. Forcing metrics is against the precedent for all major Spigot plugins"  
						
						... 
						
						
						
						This reverts commit 4522d98934 
						
						
					 
					
						2019-05-12 12:53:25 +01:00 
						 
				 
			
				
					
						
							
							
								dordsor21 
							
						 
					 
					
						
						
							
						
						4522d98934 
					 
					
						
						
							
							Don't force metrics. Forcing metrics is against the precedent for all major Spigot plugins  
						
						
						
						
					 
					
						2019-05-11 14:31:13 +01:00 
						 
				 
			
				
					
						
							
							
								MattBDev 
							
						 
					 
					
						
						
							
						
						0d67c174aa 
					 
					
						
						
							
							Fix compatibility with 1.13 and 1.14  
						
						
						
						
					 
					
						2019-05-10 23:00:11 -04:00 
						 
				 
			
				
					
						
							
							
								MattBDev 
							
						 
					 
					
						
						
							
						
						a841b4ea86 
					 
					
						
						
							
							Titles are now exclusive to paper servers  
						
						
						
						
					 
					
						2019-05-10 22:42:07 -04:00 
						 
				 
			
				
					
						
							
							
								MattBDev 
							
						 
					 
					
						
						
							
						
						f232334bcc 
					 
					
						
						
							
							Various formatting tweaks as well as metrics changes.  
						
						
						
						
					 
					
						2019-05-10 21:18:28 -04:00