Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-10-29 08:10:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,708 Commits 13 Branches 68 Tags 88 MiB
302fe0c2c8
Commit Graph

1708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sauilitired
cf6ca67ce7 Add persistent meta, and added plot grants 2016-01-16 17:07:42 +01:00
Sauilitired
dc22514809 Implements #752 and gives credits to manuelgu :) 2016-01-16 13:14:18 +01:00
Sauilitired
c6f087fd50 Fixes #774 and allows for similar features in the future 2016-01-16 13:03:51 +01:00
Jesse Boyd
ad1272b0e5 Minor fixes 
Fixes #797
Fixes #794
 2016-01-12 23:13:47 +11:00
Jesse Boyd
af79100f7d Update README / pom / merge with 8629c4a6f5 
closes #809
 2016-01-11 07:00:56 +11:00
Jesse Boyd
00b6158181 Use plot metadata to track tasks 2015-12-20 06:40:42 +11:00
Jesse Boyd
f70e2248e7 Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2015-12-20 06:30:16 +11:00
Jesse Boyd
cf517d5be0 Cleanup 2015-12-20 06:30:06 +11:00
Jesse Boyd
9b990faa47 Merge pull request #792 from manuelgu/master 
fix typo
 2015-12-20 06:15:46 +11:00
Jesse Boyd
2aab349c4b Merge pull request #796 from MattBDev/spongeFix 
Fix Sponge Generator
 2015-12-20 06:15:33 +11:00
Jesse Boyd
dc799ecc26 Merge pull request #795 from MattBDev/cleanup 
Fixes javadoc errors
 2015-12-20 06:15:28 +11:00
MattBDev
d65bd7a704 Fixes javadoc errors 
It does not improve upon the existing documentation but instead removes all broken documentation and has minor changes to some existing. More work will need to be done later to documentation.
 2015-12-19 12:23:32 -05:00
MattBDev
8ddecce75b Fix Sponge Generator 2015-12-19 12:05:00 -05:00
manuelgu
5e33c175ab Typo in "ice-melt" flag 
The flag doesnt seem to be used anyways, so not much of a deal.
 2015-12-17 18:11:50 +01:00
manuelgu
abc2681f97 fix typo 2015-12-17 18:07:57 +01:00
Jesse Boyd
ce387333d2 Plot deny / kick bypass 
Fixes #777
 2015-12-17 17:51:12 +11:00
Jesse Boyd
c32cfc62fa Various 
Fix sethome/home for mega plots
Minor tweaks
 2015-12-16 16:38:53 +11:00
Jesse Boyd
dd4a1faede Fixes #772 2015-12-15 03:32:59 +11:00
Jesse Boyd
163ccc9eae Fixes 
Fixes #783
Fixes #780
 2015-12-15 03:15:30 +11:00
Jesse Boyd
35589dcc5f Fixe 
Fixes #753
 2015-12-04 20:00:30 +11:00
Jesse Boyd
c72edc40f0 Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2015-12-03 02:43:05 +11:00
Jesse Boyd
f102b2b448 Fixes 
Fixes #768 (Plot clearing with given plot id)
 2015-12-03 02:42:50 +11:00
Jesse Boyd
2cdb279528 Merge pull request #769 from XxCoolGamesxX/patch-1 
Added Spanish Translation
 2015-12-03 02:42:21 +11:00
Charles
08e3876b01 Added Spanish Translation 
We translation in Spanish so the people can read it.

Thank to my team of Mega Planet (www.megaplanet.net).
 2015-12-02 00:09:22 +01:00
Jesse Boyd
1b7a58b720 Merge pull request #766 from swan201/master 
Update Korean Translation File
 2015-11-30 13:55:33 +11:00
swan201
b71b0aa46e Update Korean Translation 2015-11-30 05:59:14 +09:00
swan201
dcefa95278 Merge pull request #1 from IntellectualSites/master 
Merge
 2015-11-30 05:56:40 +09:00
Alexander Söderberg
60406812ee Merge pull request #764 from manuelgu/patch-3 
remove website link
 2015-11-29 21:42:20 +01:00
Jesse Boyd
82ccca8f63 . 2015-11-30 02:24:01 +11:00
manuelgu
1fcb4ea705 remove website link 2015-11-29 12:49:20 +01:00
Jesse Boyd
9118f111e4 Fixes 
fixes #763
 2015-11-29 19:21:32 +11:00
Jesse Boyd
c2b781da98 Deny negative ratings 2015-11-28 23:27:36 +11:00
Jesse Boyd
1ee13ff96c Fix commands being case sensitive. 2015-11-28 22:56:12 +11:00
Jesse Boyd
d1ac355e58 Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 
# Conflicts:
#	src/main/java/com/intellectualcrafters/plot/config/C.java
 2015-11-28 22:49:42 +11:00
Jesse Boyd
94b0fbb266 Stuff 
Fixes #748
Fixes #759
 2015-11-28 22:46:10 +11:00
Jesse Boyd
ef327434cd Merge pull request #751 from Aaron1011/update-spongeapi 
git@github.com:Aaron1011/PlotSquared.gitUpdate for SpongeAPI changes
 2015-11-26 14:45:39 +11:00
Aaron Hill
e0e2756b95 Update for SpongeAPI changes 2015-11-25 22:40:22 -05:00
Alexander Söderberg
7d494fef16 Merge pull request #749 from manuelgu/patch-1 
fixed importing
 2015-11-25 23:12:00 +01:00
manuelgu
7bbf549221 fixed importing 
related to #733
 2015-11-25 23:05:08 +01:00
Alexander Söderberg
a0c93bb3e7 Merge pull request #747 from manuelgu/patch-2 
formatting in german file
 2015-11-25 22:51:18 +01:00
Alexander Söderberg
46989faee6 Merge pull request #746 from manuelgu/patch-1 
formatting
 2015-11-25 22:51:06 +01:00
manuelgu
f80a833689 formatting in german file 2015-11-25 22:30:35 +01:00
manuelgu
eba75363c8 formatting 2015-11-25 22:29:20 +01:00
Alexander Söderberg
cc10c52230 Update README.md 2015-11-25 22:04:16 +01:00
Alexander Söderberg
8a1dfe46c9 Merge pull request #733 from manuelgu/patch-1 
fix color formatting
 2015-11-22 22:01:28 +01:00
manuelgu
d56b4da7c2 fix color formatting 2015-11-22 12:04:24 +01:00
Jesse Boyd
7db30590c6 Fixes 
Fixes #701
Fixes set components for other plots
Add setowner uuid.
Probably some other stuff
 2015-11-20 17:28:33 +11:00
Jesse Boyd
7ed693dfc8 Fix populator random seed / algorithm differing from chunk generator 2015-11-18 16:42:19 +11:00
Jesse Boyd
1e1259b81d Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2015-11-18 10:39:52 +11:00
Jesse Boyd
452efc4b08 Fix 
Fixes #724
Fixes flag remove for non list based flags when player lacks permission.
 2015-11-18 10:39:44 +11:00