Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-01-29 22:51:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
7687d7705b
PlotSquared/Bukkit/src/main
History
Alexander Söderberg 21ad9a36c8
Merge branch 'v6' into feature/v6/platform 
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java
#	Core/src/main/java/com/plotsquared/core/PlotSquared.java
#	Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java
#	Core/src/main/java/com/plotsquared/core/location/Location.java
2020-07-10 18:37:18 +02:00
..
java/com/plotsquared/bukkit Merge branch 'v6' into feature/v6/platform 2020-07-10 18:37:18 +02:00
resources Remove access to PlotSquared#IMP and rename IPlotMain to PlotPlatform, then rename PlotSquared#imp() to PlotSquared#platform() 2020-07-07 12:56:43 +02:00