Commit Graph

374 Commits

Author SHA1 Message Date
Brianna O'Keefe
ff2d771aab Fix for an issue where crop blocks are stacked. 2019-03-24 10:32:00 -04:00
Brianna O'Keefe
86464ce6d5 yaml 2019-03-18 14:42:24 -04:00
Brianna O'Keefe
520b2f9c3f Debug 2019-03-18 13:22:13 -04:00
Brianna O'Keefe
8f511a6f80 soft depend. 2019-03-12 02:00:45 -04:00
Brianna O'Keefe
445a4ef06d Fix 2019-03-11 23:58:29 -04:00
Brianna O'Keefe
a340306e9c Hooks 2019-03-11 23:51:07 -04:00
Brianna O'Keefe
a96ca65f59 Hooks 2019-03-11 23:50:50 -04:00
Brianna O'Keefe
1458ee22cb Version 2019-03-05 20:01:01 -05:00
Brianna O'Keefe
f772d46b57 pom 2019-03-05 19:53:52 -05:00
Brianna O'Keefe
971ac213fd pom 2019-03-05 19:50:10 -05:00
Brianna O'Keefe
20420bae21 Metrics 2019-03-05 19:36:56 -05:00
Brianna O'Keefe
ebdf066c7d Fix 2019-03-02 15:04:43 -05:00
Brianna O'Keefe
3d768a91b8 Hooks are now checked on farm break. 2019-03-02 15:02:36 -05:00
Brianna O'Keefe
f3e82097a8 Fix for mysql null issue. 2019-02-28 12:21:07 -05:00
Brianna O'Keefe
535e7e72dd Fixed an absolutely dumb issue made by one of our ex devs. 2019-02-28 12:14:53 -05:00
Brianna O'Keefe
ba55806a62 Version 2019-02-27 17:12:02 -05:00
Brianna O'Keefe
b647188485 Fixed the double restart issue. 2019-02-27 17:11:14 -05:00
Brianna O'Keefe
0ec97efbfd version 2019-02-18 09:42:06 -05:00
Brianna O'Keefe
bc594ab7f9 new storage system 2019-02-18 09:03:24 -05:00
Brianna O'Keefe
9cb14b9c51 plotsquared api update 2019-02-18 08:17:51 -05:00
Brianna O'Keefe
7151e13eef removed readme. 2019-02-04 00:07:43 -05:00
Brianna O'Keefe
81fddfa1a0 Auto stash before cherrypick of "fix" 2019-02-04 00:00:59 -05:00
Brianna O'Keefe
674abf314e fix 2019-02-03 23:19:38 -05:00
Brianna O'Keefe
6a10aacfb8 Fix. 2019-02-03 22:40:32 -05:00
Brianna O'Keefe
7de0be2a39 pom 2019-02-03 22:27:30 -05:00
Brianna O'Keefe
9f95d08b98 Songoda standards 2019-02-03 22:23:20 -05:00
TheCreeperCow
a3878a7adb Added explosion listener and melon and pumpkin seed warning 2019-02-03 22:22:48 -05:00
Brianna O'Keefe
97542eedb1 Removed Arconix. 2019-02-03 22:18:55 -05:00
Brianna O'Keefe
39bf64bea0 Removed setting definitions. 2018-12-29 12:11:09 -05:00
Brianna O'Keefe
53ae6760ef fixed farm limit perm 2018-12-29 12:08:11 -05:00
Brianna O'Keefe
4d28df97b0 placing farms and tilling farms will now respect region permissions. 2018-12-29 12:01:07 -05:00
Brianna O'Keefe
bd977b6f60 Fix for broadcast. 2018-12-29 11:56:20 -05:00
Brianna O'Keefe
b7dc8dcd93 Update .gitlab-ci.yml, EpicFarming-Plugin/src/main/resources/plugin.yml files 2018-12-07 23:21:16 -05:00
Lars Dormans
545297bc4c Merge branch 'loreTorch' into 'Legacy'
Added ability to set a lore message for the farming item

See merge request Songoda/EpicFarming!10

(cherry picked from commit 33c2d66e227aa2c8fc79c48a11840de54f7aafcd)

2b0eb9e0 Added ability to set a lore message for the farming item
2018-12-06 20:40:05 +00:00
Brianna O'Keefe
0467606d83 Update .gitlab-ci.yml 2018-11-16 20:44:53 +00:00
Brianna O'Keefe
a7c810bc38 Update pom.xml 2018-11-16 00:20:39 +00:00
Brianna O'Keefe
6bbfc6fb8b Update pom.xml 2018-11-16 00:15:44 +00:00
Brianna O'Keefe
b29dbf999c Merge branch 'patch-2' into 'master'
Update .gitlab-ci.yml

See merge request Songoda/EpicFarming!8
2018-11-15 23:50:02 +00:00
Xordac Prime
b866e6fdd5 Update .gitlab-ci.yml 2018-11-15 23:48:53 +00:00
Brianna O'Keefe
4fabab47e2 Merge branch 'master' into 'master'
new ci

See merge request Songoda/EpicFarming!6
2018-11-15 23:32:40 +00:00
Brianna O'Keefe
67a2d935aa Merge branch 'patch-1' into 'master'
Update .gitlab-ci.yml

See merge request Songoda/EpicFarming!5
2018-11-15 23:22:25 +00:00
Xordac Prime
56d3cdc369 new ci 2018-11-15 18:20:10 -05:00
Xordac Prime
1f169dea72 Update .gitlab-ci.yml 2018-11-15 20:28:25 +00:00
Brianna O'Keefe
4d4c43e006 fixed error regarding breeding of unbreedable entities 2018-11-14 17:54:12 -05:00
Brianna O'Keefe
615a23ab56 settings fixed 2018-11-09 17:11:03 -05:00
Brianna O'Keefe
f3bdb5ad1e version 2018-11-06 18:45:46 -05:00
Brianna O'Keefe
70041fcab0 performance bump 2018-11-06 18:40:31 -05:00
Brianna O'Keefe
32b71f0d78 null fix 2018-11-04 00:45:49 -05:00
Brianna O'Keefe
1a4e7e8635 beetroot fixed 2018-11-04 00:37:24 -05:00
Brianna O'Keefe
acd4f9e97a fix for caching issue 2018-11-04 00:32:49 -05:00