Upstream/EpicFarming
1
0
Fork 0
mirror of https://github.com/songoda/EpicFarming.git synced 2024-12-02 15:33:28 +01:00
Code Issues Projects Releases Wiki Activity
94 Commits 2 Branches 5 Tags 990 KiB
4d28df97b0
Commit Graph

94 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brianna O'Keefe
be31a1ce5f Mysql speed improved. 
Data file will now periodically back up to prevent data loss.
To be saved data is now cached before executed all at once as to prevent the possibility of data loss.
 2018-11-01 02:03:46 -04:00
Brianna O'Keefe
e79cc9552a version 2018-10-30 23:15:14 -04:00
Brianna O'Keefe
3751c60c8e issue with natural end rods. 2018-10-30 23:05:27 -04:00
Brianna O'Keefe
857247ba86 Merge branch 'mysql' 2018-10-27 13:27:18 -04:00
Brianna O'Keefe
48bdc44b09 touch ups 2018-10-27 13:26:55 -04:00
The_Creeper_Cow
a0da2bbbf8 MySQL 2018-10-27 12:50:11 +02:00
Brianna O'Keefe
ef2ed38246 Added a crop cache to crops to massively improve performance 2018-10-26 18:05:40 -04:00
Brianna O'Keefe
5c5cf6838c Merge remote-tracking branch 'origin/master' 2018-10-24 22:44:36 -04:00
Brianna O'Keefe
4cc56bd023 Made it so that with "Main.Allow Non Command Issued Farm Items" enabled end rods are able to be broken in the end. 2018-10-24 22:43:34 -04:00
Brianna O'Keefe
d458ea43b4 Removed massive 2018-10-21 17:27:36 -04:00
Brianna O'Keefe
c5956775ba Removed massive 2018-10-21 13:33:09 -04:00
Brianna O'Keefe
159bc9a8f2 Changed the version. 2018-10-21 13:31:55 -04:00
Brianna O'Keefe
56a89b4b42 check for chunk loaded before running. 2018-10-21 13:29:32 -04:00
lars dormans
71314f41db Update .gitlab-ci.yml 2018-10-18 22:25:17 +00:00
lars dormans
60659f8eef Upload New File 2018-10-18 22:24:46 +00:00
The_Creeper_Cow
314be7f7f2 Bypassing vault repo 2018-10-18 21:03:38 +02:00
The_Creeper_Cow
2944b78eed Updated pom again 2018-10-18 20:58:01 +02:00
The_Creeper_Cow
829ba82b02 Wrong naming again 2018-10-18 20:54:12 +02:00
The_Creeper_Cow
57f084dee2 Updated POM and added CI Runner 2018-10-18 20:52:09 +02:00
Brianna O'Keefe
82790e962c Code cleanup. 2018-10-17 17:13:52 -04:00
Brianna O'Keefe
fb3d6742f0 Fixed issue with auto tilling. 
Added a feature where you can set permissions for the amount of farms a player can have.
 2018-10-11 22:30:31 -04:00
Brianna O'Keefe
5f97cc646c This should be like this. 2018-10-07 10:37:49 -04:00
Brianna O'Keefe
1a136125f9 Added option to disable auto tiling of land. 2018-10-02 22:54:02 -04:00
Brianna O'Keefe
c466e64d20 language 2018-10-01 19:01:08 -04:00
Brianna O'Keefe
fdb98950c4 Patch 2018-09-30 20:06:10 -04:00
Brianna O'Keefe
246c7e430f yaml 2018-09-28 17:03:00 -04:00
Brianna O'Keefe
a9197b1b58 Added auto breeding. 
Added Sheep and Chicken support.
Added Animation.
 2018-09-27 22:54:43 -04:00
Brianna O'Keefe
cdbb63fe0c Added boosting system. 
Fixed some gross code.
 2018-09-26 20:03:48 -04:00
Brianna O'Keefe
b8a6ee3e32 Farms will now use bone meal in its inventory to add additional crops on harvest. 2018-09-19 14:41:50 -04:00
Brianna O'Keefe
076e762f4e Removed unused event. 
Fixed sound issue on levelup.
Crops on a lower level will now work just as well as crops on a higher level.
Version increment.
Hoppers now function with farms as designed.
 2018-09-19 12:42:09 -04:00