Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 11:55:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,213 Commits 14 Branches 69 Tags 89 MiB
e8f4eae6f7
Commit Graph

113 Commits

Author SHA1 Message Date
MattBDev
e8f4eae6f7 Merge remote-tracking branch 'origin/3.4.5' into 3.4.5 
# Conflicts:
#	Sponge/build.gradle
#	Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSetupUtils.java
 2016-07-29 21:45:34 -04:00
MattBDev
610e204d12 Fix #1281 , Fix #1282 , and Sponge gradle 2016-07-29 12:47:42 -04:00
MattBDev
1f341e6ba9 Merge remote-tracking branch 'origin/master' into 3.4.5 
# Conflicts:
#	Sponge/src/main/java/com/plotsquared/sponge/SpongeMain.java
#	Sponge/src/main/java/com/plotsquared/sponge/generator/SpongeAugmentedGenerator.java
#	Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSetupUtils.java
#	Sponge/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java
#	Sponge/src/main/java/com/plotsquared/sponge/util/block/GenChunk.java
#	build.gradle
 2016-07-29 12:25:11 -04:00
Jesse Boyd
ffddf5c187 Fix sponge generator cast 2016-07-29 12:12:28 +10:00
MattBDev
b5ec6232f9 Sponge Fixes and minor changes. 2016-07-25 22:25:15 -04:00
MattBDev
34c2da55ca Change Sponge method behavior 2016-07-25 22:25:15 -04:00
MattBDev
33ec80c2cb Fix Sponge generation casting 2016-07-25 22:25:15 -04:00
Jesse Boyd
d23d8c2fd8 *should use this cause instead 2016-07-25 22:25:15 -04:00
Jesse Boyd
3498f309e8 Minor sponge fixes 2016-07-25 22:24:31 -04:00
Jesse Boyd
0b5177f192 Minor uuid cache changes 2016-07-25 22:23:49 -04:00
MattBDev
b2fdcad317 Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared into 3.4.5 
# Conflicts:
#	Sponge/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java
#	Sponge/src/main/java/com/plotsquared/sponge/util/block/GenChunk.java
 2016-07-25 22:08:54 -04:00
MattBDev
80ea3e9ce7 Sponge Fixes and minor changes. 2016-07-25 20:00:59 -04:00
MattBDev
5f8c77a6cd Change Sponge method behavior 2016-07-25 18:43:11 -04:00
MattBDev
290e5c68dc Fix Sponge generation casting 2016-07-25 18:42:31 -04:00
Jesse Boyd
30d18c917d *should use this cause instead 2016-07-25 09:54:35 +10:00
Jesse Boyd
b91eab2f0c Minor sponge fixes 2016-07-25 09:47:49 +10:00
Jesse Boyd
770b9be160 Minor uuid cache changes 2016-07-25 09:23:20 +10:00
MattBDev
2b9c2959cf Merge branch '3.4.5' of https://github.com/IntellectualSites/PlotSquared into 3.5.0 2016-07-24 17:45:34 -04:00
MattBDev
dda6849412 Fix sponge compile 2016-07-24 17:42:03 -04:00
MattBDev
8538170cba Metrics 2016-07-16 22:51:49 -04:00
MattBDev
8b0e59209c Remove getServerName() 2016-07-05 23:43:08 -04:00
MattBDev
ca8b82dcbe Version Bump 2016-07-05 23:39:38 -04:00
MattBDev
cf5d2a5e86 Entity Fix and Gradle changes 2016-07-01 17:13:49 -04:00
MattBDev
5b9dc59abf Updates to docs, code style tweaks, and some code optimizations 2016-06-23 20:12:17 -04:00
Jesse Boyd
f5e7d08ace Allow duplicates after 5s 2016-06-19 16:14:13 +10:00
Jesse Boyd
c2f10a7065 Update desc for debugpaste 2016-06-19 13:44:14 +10:00
Jesse Boyd
600d060b6e Fix sponge compile issue 2016-06-17 22:05:06 +10:00
Jesse Boyd
b2997b7c7b Don't send duplicate messages 2016-06-16 10:31:33 +10:00
Sauilitired
5b103d49c0 Fixes #1171 2016-06-16 02:08:01 +02:00
Jesse Boyd
4f0ede646e Chat / Merge blocks placer / generator 2016-06-13 14:47:50 +10:00
MattBDev
482f4d6815 Modify Setting and Storage class names. 2016-06-10 13:00:34 -04:00
MattBDev
8fe381d098 Fix SpongeCommand 2016-06-08 19:06:07 -04:00
Jesse Boyd
237a0d8b6b Always cache * uuid 2016-06-05 20:11:02 +10:00
Jesse Boyd
951a6b82a2 simplify config / multiple expiry tasks / block cache fix 2016-06-05 17:28:43 +10:00
MattBDev
70aaa984e2 Documentation and Flag Changes. 2016-06-04 17:19:37 -04:00
Jesse Boyd
ca5d3a818b PlotBlock cache / events / flags 2016-06-04 06:20:13 +10:00
MattBDev
0147690eba Make Sponge compile 
It doesn't work but it allows the project to compile.
 2016-06-02 19:38:35 -04:00
MattBDev
da58c7b411 Beautify code 2016-06-02 11:38:47 -04:00
MattBDev
f21d159911 Various fixes and tweaks. 2016-06-01 16:50:35 -04:00
Jesse Boyd
85055320c2 Merge pull request #1134 from manuelgu/feature/componentevent 
[WIP] Implement PlotComponentSetEvent
 2016-05-28 09:13:04 +10:00
Jesse Boyd
b5cc6eeb0c Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Sponge/src/main/java/com/plotsquared/sponge/SpongeMain.java
 2016-05-28 08:45:35 +10:00
manuelgu
4078f0708b Proper javadoc for event 2016-05-28 00:29:27 +02:00
Jesse Boyd
28a5c9f597 Remove pre-init logging 2016-05-28 02:01:50 +10:00
MattBDev
cc2d99849b Optimizations and javadoc tweaks 2016-05-26 09:19:38 -04:00
manuelgu
ceb8fb9fa3 Implement PlotComponentSetEvent 2016-05-25 21:49:55 +02:00
MattBDev
e2182260d9 Fix Sponge Errors 2016-05-21 12:55:06 -04:00
MattBDev
6f26e42251 Fix Sponge Errors 2016-05-21 12:54:50 -04:00
MattBDev
13b7a798e6 ignored exception 2016-05-21 11:54:00 -04:00
Jesse Boyd
4ceb54b566 Add logger 2016-05-22 00:47:14 +10:00
MattBDev
dc4776d16b Sponge changes. 2016-05-21 10:39:06 -04:00