TotalFreedomMC/TF-PlotSquared
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-PlotSquared.git synced 2024-12-23 00:15:06 +00:00
Code Issues Projects Releases Wiki Activity
3682 commits 6 branches 12 tags 66 MiB
Commit graph

3682 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sauilitired
7e62094152 Flags :D 2014-10-18 10:57:45 +02:00
Sauilitired
5d73a2fd6a Merge remote-tracking branch 'origin/master' 2014-10-18 10:24:59 +02:00
Sauilitired
86a4dbded8 Some global settings :D 2014-10-18 10:24:48 +02:00
boy0001
b23d4f26e6 actually fixed purge 2014-10-18 18:45:07 +11:00
boy0001
441d4dde2e fixed purge command 2014-10-18 15:54:16 +11:00
boy0001
04e8c5a8c4 added startMerge to plotManager 2014-10-18 15:49:08 +11:00
boy0001
fc9a31cbf4 fixed NPE from teleport event 2014-10-18 13:36:30 +11:00
boy0001
cb8822cd6a bug fixes. 2014-10-18 13:24:47 +11:00
Jesse Boyd
9ba5e3f91b It's probably better to put it here actually. 2014-10-18 11:37:30 -07:00
Jesse Boyd
6c614d1eec Fixed duplicate users potentially being added 2014-10-18 11:33:48 -07:00
Jesse Boyd
96fb8cfab9 Reload now reloads a bit more. 2014-10-18 11:30:25 -07:00
Jesse Boyd
a64e4c9578 *console commands 
Added plot purge
 2014-10-18 11:24:18 -07:00
Jesse Boyd
0010b06afa Added support for console messages (untested) 2014-10-18 11:06:29 -07:00
Jesse Boyd
2435eab96a sendMessage now supports console 2014-10-18 10:22:08 -07:00
boy0001
eee4a44fcb it's working now. (so far at least) 2014-10-15 21:36:23 +11:00
boy0001
47d26531aa "borrowing" some jnbt code 2014-10-15 21:23:32 +11:00
boy0001
1c4100a612 Untested (should work) 2014-10-15 20:43:20 +11:00
boy0001
e7d44d5343 Forgot about unlinking 2014-10-15 19:53:28 +11:00
Sauilitired
0961671eaf Fixed the uuid saving functions, added ability to change caching methods. 2014-10-14 16:16:05 +02:00
Sauilitired
2bbcdb17bc Started working on functions that will allow for a saved UUID cache (i.e mysql, sqlite, txt file etc...) for faster reading and in-caching. 2014-10-13 21:22:19 +02:00
Sauilitired
4ba147b95f Fixed some translations. 2014-10-13 19:59:35 +02:00
Sauilitired
b85c2a3c76 Fail :P 2014-10-13 19:43:41 +02:00
Sauilitired
a19b13fded Clipboard command (for info...) 2014-10-13 19:40:30 +02:00
boy0001
2b22ebf3d8 Documenting some methods 2014-10-13 17:44:05 +11:00
boy0001
4403edf7ca Multiple bug fixes 
Plot clearing also now requires an unlink if mega.
Copy paste now requires an unlink if mega
*We should fix this at some later point
Plot merging now checks the entirety of both mega plots being merged
(rather that just the two adjacent)
 2014-10-13 17:33:37 +11:00
Sauilitired
9087d48d9a Copy and paste, doesn't work for mega plots. 2014-10-12 17:26:58 +02:00
boy0001
254b9d4053 close stream 2014-10-12 23:08:48 +11:00
Sauilitired
8bdbd3e628 Yer, forgot that :P 2014-10-12 10:48:08 +02:00
Jesse Boyd
05c1ed139c fixed sqlite somehow... 
and plot merging
 2014-10-12 12:44:59 -07:00
Jesse Boyd
9b6d3e2b14 config fixes 2014-10-12 10:53:36 -07:00
Sauilitired
8245db7a08 Pfft. 2014-10-12 01:18:47 +02:00
Jesse Boyd
1772002700 actually fixed it 2014-10-12 10:13:44 -07:00
Jesse Boyd
b5037fe878 Merge branch 'master' of http://git.intellectualsites.com/citymonstret/plot_new 2014-10-12 09:56:23 -07:00
Jesse Boyd
34dd6c8107 fixed plot home 2014-10-12 09:56:17 -07:00
Jesse Boyd
532cc72076 fixed plot merging not saving 2014-10-12 01:37:16 -07:00
Jesse Boyd
0f7b5a4526 bugs bugs and more bugs 2014-10-12 01:15:00 -07:00
Jesse Boyd
3ffb182a3c yo yo yo 
testing some new formatting rules + bug fixes
 2014-10-12 00:37:36 -07:00
Sauilitired
53878c1a66 You can't divide by 0, stupid... 2014-10-11 18:35:51 +02:00
Sauilitired
88fe47b7ee Yes, I am really stupid... -_- 2014-10-11 18:30:24 +02:00
Sauilitired
0160a39d9f I am stupid. 2014-10-11 18:24:50 +02:00
Sauilitired
446cd422e0 Well, some stuff... 2014-10-11 18:16:08 +02:00
boy0001
79e0459a3a jdoc 2014-10-11 19:51:48 +11:00
boy0001
6b028988b3 Bug fixes 2014-10-11 19:05:50 +11:00
Jesse Boyd
6c1527f41c Finished setup command. 2014-10-11 12:09:14 -07:00
Jesse Boyd
a6375796c0 No red files anymore. Some stuff still unfinished. 
+ weekly code cleanup
 2014-10-11 00:33:10 -07:00
Jesse Boyd
2f5f3ac8e2 Plugin compiles now (many commands don't work) 2014-10-10 22:29:20 -07:00
Jesse Boyd
b50dfcb423 I'm making progress 2014-10-10 22:19:33 -07:00
boy0001
882c427d2b Merge remote-tracking branch 'origin/master' 
Conflicts:
	PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java

	PlotSquared/src/com/intellectualcrafters/plot/generator/DefaultPlotWorld.java
 2014-10-10 18:37:44 +11:00
boy0001
3656ec5297 Breaking things... 
...
 2014-10-10 18:31:51 +11:00
Sauilitired
ef443cade3 Added money given on delete. 2014-10-08 19:31:59 +02:00