Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-09 09:59:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,581 Commits 14 Branches 68 Tags 88 MiB
85a75ad868
Commit Graph

3581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
boy0001
b58b6f5963 feedback 2015-01-02 00:28:57 +11:00
boy0001
a6d6c34902 Schematic export + Administrator plot merging 2015-01-02 00:22:59 +11:00
boy0001
7a558b34da disk reading should be disabled 2014-12-31 00:17:35 +11:00
boy0001
6dca7cf170 Incremented version number 2014-12-31 00:11:33 +11:00
boy0001
d505329134 Finish updating UUID system 2014-12-31 00:09:11 +11:00
boy0001
bb4e91e943 . 2014-12-30 17:52:34 +11:00
boy0001
fef01de974 . 2014-12-30 17:51:20 +11:00
boy0001
84bb45a88d Temporary fix to the UUID system. (Sorry) 2014-12-30 17:50:55 +11:00
boy0001
52f05f3dfb increment version number 2014-12-29 12:02:55 +11:00
boy0001
3035bd46d2 Removing entity listener (Can't figure out how to finish it) 2014-12-29 01:33:40 +11:00
boy0001
7522184a34 safety 2014-12-29 00:57:09 +11:00
boy0001
a3c8ba84ab Fixed purge command 2014-12-29 00:56:01 +11:00
boy0001
bcd113146b fixes 2014-12-29 00:47:35 +11:00
boy0001
85c638362b Update tests 2014-12-29 00:12:22 +11:00
boy0001
24954744cb New "createRoadSchematic" command 2014-12-29 00:09:37 +11:00
boy0001
5d0bb50ea8 UUID wrapper + commands 2014-12-28 23:55:02 +11:00
boy0001
f8ca152300 Upgraded to new generator 2014-12-28 23:02:30 +11:00
boy0001
7580b0ea82 minor Schematic changes 2014-12-28 21:38:11 +11:00
boy0001
5e5e46eef0 . 2014-12-28 11:14:54 +11:00
Sauilitired
a742dd7192 Fixed an NPE 2014-12-27 13:28:10 +01:00
boy0001
8a95231587 Remove debug messages 2014-12-23 03:06:41 +11:00
boy0001
2dff41fa53 Claiming new plot 2014-12-23 03:04:56 +11:00
boy0001
5c4f1332d6 Fixed null pointers for getName 2014-12-23 02:44:13 +11:00
boy0001
e0adcb3b60 Fixed null pointers for getUUID 2014-12-23 02:39:17 +11:00
boy0001
d0876c60b0 Option to not use UUIDFetcher for the time being. 2014-12-23 02:12:40 +11:00
boy0001
8e03638d8d plot setup. 2014-12-22 18:05:23 +11:00
boy0001
a4afba181c Version checking + Config flag setting 2014-12-22 01:59:35 +11:00
boy0001
2e85dded3d We're going to try Async conversion again... 2014-12-21 20:25:57 +11:00
boy0001
e6d682fd5a Another temporary fix. 2014-12-21 18:54:22 +11:00
boy0001
2d1761f807 Temporary fix... 2014-12-21 15:03:59 +11:00
boy0001
3d07375cff formatting 2014-12-20 20:23:27 +11:00
boy0001
6bfc0aaf9d More setup info 2014-12-20 15:46:22 +11:00
boy0001
702e2bf975 Fixed setup command 2014-12-20 15:44:24 +11:00
boy0001
5e2313a6cb *Will resolve later. 2014-12-20 11:51:34 +11:00
boy0001
e1dea5a450 Fixed purge command 2014-12-20 11:24:29 +11:00
Alexander Söderberg
9775ad3dd2 Update README.md 2014-12-19 01:46:52 +01:00
Sauilitired
8e0d8a8b25 removed that damned folder 2014-12-19 01:43:44 +01:00
Sauilitired
7334d5f4f7 Minor Fixes to PlotMain 2014-12-19 01:42:47 +01:00
Sauilitired
ec3d24876e Fix after merge... 2014-12-18 12:40:30 +01:00
Sauilitired
8650525d2b Merge branch 'drtshock-master' 
Conflicts:
	PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java
	PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldEditListener.java
 2014-12-18 12:37:22 +01:00
Sauilitired
a04e207724 Merge branch 'master' of git://github.com/drtshock/PlotSquared into drtshock-master 
Conflicts:
	PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java
	PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldEditListener.java
 2014-12-18 12:35:08 +01:00
Sauilitired
7feddad853 Merge branch 'master' of git://github.com/drtshock/PlotSquared 
Conflicts:
	PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotMain.java
	PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java
	PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldEditListener.java
 2014-12-18 12:32:20 +01:00
Sauilitired
555e8aaa6e Some minor stuff 2014-12-18 12:30:28 +01:00
boy0001
5140d472ff Unclaim 2014-12-18 19:23:41 +11:00
boy0001
d777b42a48 wall sign issue 2014-12-18 18:45:26 +11:00
boy0001
4f7f439a2a Fixed minor WorldEdit quirk 2014-12-18 13:36:49 +11:00
drtshock
73e92b8341 Reformat. 2014-12-17 20:15:11 -06:00
boy0001
59be72aefe Weekly code cleanup 2014-12-16 16:03:20 +11:00
boy0001
ffc7a5c7b7 delete 2014-12-16 15:59:27 +11:00
boy0001
37367adfcf Just moving a few things. 2014-12-16 15:58:54 +11:00