EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-23 05:36:45 +01:00
Code Issues Projects Releases Wiki Activity
3,402 Commits 231 Branches 71 Tags 86 MiB
f2aa9dccd1
Commit Graph

3402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
matt
cf1764723f Fixes #2291 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-03-12 16:56:51 -04:00
matt
7b788c07b8 Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking 2019-03-09 00:05:49 -05:00
dordsor21
dffbaf89a3 Fix for offhandedness 2019-03-09 00:28:21 +00:00
matt
578069b3c9 Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking 2019-03-08 19:26:06 -05:00
matt
ed3cadd439 Formatting fixes and minor performance improvement 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-03-08 19:25:59 -05:00
dordsor21
aa894b8ad9 Fixes #2245 
Also some minor fixes to PlayerInteractEvent main/off hand logic
 2019-03-09 00:12:21 +00:00
dordsor21
ed10877431 Should fix IndexOutOfBoundsException when copying 
fixes#2290
 2019-03-08 23:04:38 +00:00
matt
1d327ec346 Fixes an issue with boats 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-03-07 18:38:21 -05:00
matt
56c24a6a56 Type weakening and Direction changes 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-03-06 12:47:38 -05:00
matt
4c8457ad14 OCD 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-22 11:54:13 -05:00
dordsor21
f93cfb9f8b
Update build offset 2019-02-22 16:53:11 +00:00
matt
1755272f81 Merge remote-tracking branch 'origin/breaking' into breaking 2019-02-22 11:51:22 -05:00
matt
25530ed7f0 Doc Updates, Renaming, Reformatting, and a Test 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-22 11:51:06 -05:00
dordsor21
53e732b4fe Make replacing wall on merge configurable 
In case people are doing fun things with road schematics etc :)
 2019-02-22 15:21:44 +00:00
dordsor21
7aebd9b74b Set wall filling on merge 2019-02-22 15:11:35 +00:00
dordsor21
be51d8e159 Correct artifact id for maven 2019-02-22 14:38:18 +00:00
matt
bfc6b62213 Stupid docs 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-21 21:31:12 -05:00
matt
a9bebb10da Merge remote-tracking branch 'origin/breaking' into breaking 
# Conflicts:
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java
 2019-02-21 21:18:03 -05:00
matt
2f18ef6828 Critical bug fixes, reformatting, and cleaning 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-21 21:14:48 -05:00
dordsor21
f2d68642f9 Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking 2019-02-20 14:51:01 +00:00
dordsor21
350e151214 Don't use streams as they're lower performance for our use cases. 
Some minor reformating too.
 2019-02-20 14:50:49 +00:00
dordsor21
72b031e3e5
Update offset to match CI 2019-02-20 11:59:39 +00:00
dordsor21
d0a4465985 Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking 2019-02-20 11:55:50 +00:00
dordsor21
0ef8b4ad14 Update to WorldEdit's *breaking* Biome handling changes 2019-02-20 11:55:39 +00:00
matt
c5d9412c6c Cleaning and API Addition 
Begins the process of removing "magic values" for directions in the plugin.

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-19 22:57:35 -05:00
matt
92718a5ec8 Merge branch 'consumers' into breaking 2019-02-19 22:29:59 -05:00
matt
099a807ce0 CLeaning of code 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-19 22:29:27 -05:00
matt
df47697ca6 CLeaning of code 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-19 19:00:37 -05:00
matt
b7aeeb151d Replace RunnableVal with java Consumer 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-19 18:39:43 -05:00
dordsor21
2e22dfe056
Update offset to match CI 2019-02-16 22:06:31 +00:00
matt
a64d764cc1 New API method, more 1.13 entity support, and cleanup. 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-15 12:50:43 -05:00
dordsor21
4f27abb4a0 Merge branch 'breaking' of https://github.com/IntellectualSites/PlotSquared into breaking 2019-02-14 17:39:01 +00:00
dordsor21
b999cb4195 Fix players being able to place boats, armorstands etc using offhand 2019-02-14 17:38:36 +00:00
dordsor21
745fd58e2e
* 2019-02-13 21:54:13 +00:00
dordsor21
57981a870e
Update version offset to match ci 2019-02-13 21:53:11 +00:00
dordsor21
130e1b6300 Fix armorstands, boats etc being placeable on players plots with "use 0" flag 2019-02-13 21:47:54 +00:00
dordsor21
477e698f7e Reformat 2019-02-13 17:13:57 +00:00
matt
11c4a90cc9 Merge remote-tracking branch 'origin/breaking' into breaking 2019-02-13 12:05:42 -05:00
matt
35493662da Cleanup 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-13 12:05:28 -05:00
dordsor21
8710f2f83b Fix NPE when right-clicking a >1.13 block 2019-02-13 13:43:22 +00:00
dordsor21
3e8308ecd7 Catch statement already being null 2019-02-13 13:35:19 +00:00
dordsor21
dae7bbdf9d Fix dropped items being removed from plots 2019-02-13 13:26:19 +00:00
dordsor21
d0994f1b4b Fixes to EntityTask 2019-02-10 23:03:14 +00:00
dordsor21
cae95343ca
Update build offset 2019-02-10 22:51:21 +00:00
matt
17027e6292 Javadoc changes and cleaning of old unused code 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-08 14:49:37 -05:00
matt
e891873d28 Cleaning and scope changes 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-08 11:21:53 -05:00
matt
b39ea1b68b Cleaning and API clarifications 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-06 21:29:51 -05:00
matt
3d8179a4e6 Small tweaks 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-06 17:30:25 -05:00
matt
9101cb9218 PlotComment API tweaks. 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-06 12:33:14 -05:00
matt
6ec6c26a10 Guava needs to be in sync with Minecraft 
Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
 2019-02-06 12:02:20 -05:00