Commit Graph

1838 Commits

Author SHA1 Message Date
MattBDev
bb4700aa5a More cleaning 2016-03-23 13:09:13 -04:00
MattBDev
9e2c6f2182 Major code reformatting 2016-03-22 21:41:39 -04:00
Matt
e18e1d4816 Merge pull request #995 from manuelgu/master
Cleanup
2016-03-22 14:36:41 -04:00
manuelgu
35c7c20874 Track renamed Music.java file 2016-03-22 18:53:56 +01:00
manuelgu
84188f6557 Cleanup 2016-03-22 18:53:17 +01:00
Matt
09ee7f3048 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Core/src/main/java/com/intellectualcrafters/plot/commands/Area.java
#	Core/src/main/java/com/intellectualcrafters/plot/commands/Auto.java
#	Core/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
#	Core/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java
#	Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java
#	Core/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java
2016-03-20 23:03:31 -04:00
Matt
029241912b Code Style Cleanup 2016-03-20 22:52:16 -04:00
MattBDev
0e49dd6f62 Merge branch 'manuelgu-feature/rm-redundant-methods' 2016-03-20 19:54:46 -04:00
MattBDev
cb0b59fdb4 Merge branch 'feature/rm-redundant-methods' of https://github.com/manuelgu/PlotSquared into manuelgu-feature/rm-redundant-methods 2016-03-20 19:52:11 -04:00
MattBDev
bb4ecb94a1 Cleanup 2016-03-20 19:35:40 -04:00
manuelgu
df12e53d40 Remove redundant .s() methods 2016-03-20 23:19:37 +01:00
MattBDev
274d819f8c Use Metrics as dependency in Sponge
Unlike Bukkit, we can support Sponge Metrics as a dependency.
2016-03-20 14:00:39 -04:00
Jesse Boyd
2e4f4d0064 Merge pull request #986 from SynergyMC/testing
A small change to /p weanywhere's behavior
2016-03-20 21:50:17 +11:00
zomb
712ce74af6 /p weanywhere change
Allows players with "WorldEdit Anywhere" toggled to use the wand
anywhere
2016-03-20 00:26:45 -10:00
zomb
015dda21f2 Merge remote-tracking branch 'IntellectualSites/master' into testing 2016-03-19 18:11:36 -10:00
Matt
19b6df8268 Cleanup 2016-03-19 14:07:55 -04:00
zomb
f16affabcc Merge remote-tracking branch 'IntellectualSites/master' into testing 2016-03-18 23:28:49 -10:00
Jesse Boyd
8074d041b8 Fix "Cleaner reflection" breaking plugin.
Also add method to sort plots by modification date.
2016-03-19 17:32:05 +11:00
Matt
d30626d11f Cleaner reflection 2016-03-19 00:39:42 -04:00
Jesse Boyd
f26278f72e Fixes #950 2016-03-19 13:01:10 +11:00
Matt
79864d269a Extremely minor text change to LICENSE 2016-03-18 16:50:43 -04:00
Jesse Boyd
ab40d97327 Try this? 2016-03-18 05:08:09 +11:00
Jesse Boyd
fe43143bdb Fixes #972 2016-03-18 03:33:31 +11:00
Jesse Boyd
9e32ce9885 Automatically drop unique_alias for MySQL 2016-03-18 03:05:36 +11:00
Jesse Boyd
3921fdfc3f Fixes #967 2016-03-18 02:18:18 +11:00
Jesse Boyd
e1e5497558 Fixes #871 2016-03-18 02:06:06 +11:00
Jesse Boyd
f9db269813 Various
Close #966
Close #953
(duplicates)
Changes to chunk copying etc to interfere less with world generation
2016-03-18 01:22:51 +11:00
Jesse Boyd
16dac99fed Any reason for breaking it in the last commit? 2016-03-17 20:33:47 +11:00
Jesse Boyd
98c4483535 Various
some sponge stuff
schematic/mca/bo3 uploading rework
fix minor issue with plot visit
fix #956
2016-03-17 20:11:07 +11:00
Matt
75bf01c13f Fixed casting issue in FastQueue_1_9 2016-03-16 19:18:09 -04:00
Matt
7bbd359be8 Fixed #957 2016-03-16 18:50:55 -04:00
Matt
58eeeb16d4 Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2016-03-16 10:16:19 -04:00
Matt
65ddb12701 Beginning rewrite of Flags and various cleanups 2016-03-16 10:15:38 -04:00
Jesse Boyd
1f42ee6744 Merge pull request #969 from SynergyMC/testing
Implements fire-related flags
2016-03-17 01:06:00 +11:00
zomb
4a1c206f98 Revert "Fixed bukkit dependency in maven"
This reverts commit e6f33e7150.
2016-03-15 22:25:31 -10:00
zomb
a297d505f8 Pulled files from official repository 2016-03-15 22:15:47 -10:00
zomb
a26db46242 Pyromania
Adds block-ignition, which allows fire being set by players,
dispensers, explosions, and fireballs (if their origin is the same as
the plot that they land in)

Adds fire-spread, which allows fire to spread from lava and fire
spreading in general

Adds block-burn, which allows blocks to burn away
2016-03-15 21:59:01 -10:00
Matt
3fb64d9811 Added snow-melt flag 2016-03-15 01:16:29 -04:00
Matt
bb8883dfaf Added snow-melt flag 2016-03-14 11:01:52 -04:00
Matt
bee6f83e79 Various changes 2016-03-14 02:18:04 -04:00
Matt
ae885eafca Various changes and Merge Economy Fix 2016-03-13 22:44:59 -04:00
Jesse Boyd
8739f3ef78 Horses aren't hostile. 2016-03-14 12:34:58 +11:00
Matt
dfd29f6713 Various changes
Plot class is now more reliable as most fields are private
Cleanup some classes.
Fixes #955
makes progress on #953
2016-03-13 14:09:48 -04:00
zomb
e6f33e7150 Fixed bukkit dependency in maven 2016-03-12 23:37:45 -10:00
Jesse Boyd
3fb686608b Merge pull request #951 from Gabscap/fix-static
Make WorldEvents method non-static
2016-03-13 04:00:40 +11:00
Jesse Boyd
a8fd1b49ca Various
sponge changes / documentation / cleanup / event tweak
2016-03-13 03:57:36 +11:00
Gabscap
4c40268e8f Make WorldEvents method non-static 2016-03-12 16:27:03 +01:00
Matt
edc43bd53b Update README.md 2016-03-11 09:05:42 -05:00
Jesse Boyd
66da71bc9f Various
Fixes a few typos
Fixes #943
Fixes #944
Fixes metrics (broke in b69e31129d)
Fixes plot setup issue
Fixes some lighting issues
Fixes ChunkListener + cauldron
Tweak some  schematic stuff
2016-03-11 15:33:39 +11:00
Matt
c979be2994 Add missing permission to plugin.yml file 2016-03-10 17:12:56 -05:00