SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,419 Commits 8 Branches 34 Tags
90a5f53e217fd3fbe04a958338bdecd59e0c0080
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ProSavage 0a41d15a0b Merge branch '1.6.x' of https://github.com/ProSavage/SavageFactions into 1.6.x 2019-03-11 02:29:29 -05:00
ProSavage 95840bdfce -1 slots dont place. 2019-03-11 02:29:12 -05:00
ProSavage c4594682fc Added another balance set to 0.... 2019-03-11 00:12:25 -05:00
ProSavage e4899e4d8d Fix conf startup error. 2019-03-04 17:35:20 -06:00
ProSavage 5a63e71054 Merge branch '1.6.x' of https://github.com/ProSavage/SavageFactions into 1.6.x 
# Conflicts:
#	src/main/java/com/massivecraft/factions/SavageFactions.java
 2019-03-04 15:46:39 -06:00
ProSavage 4b7d0889ea Made a static boolean so plugins hooking in can check if completely enabled. 2019-03-04 15:39:29 -06:00
NamanandGitHub 0abada3708 Merge pull request #113 from ProSavage/ident-fixes 
Indent Fixes - Liz
 2019-03-02 21:58:55 -06:00
ProSavage 52c1966fb8 Use different vault repo for rapid compiling. 2019-02-25 13:39:27 -06:00
ProSavage 62639722e8 1.6-RC 2019-02-19 21:03:44 -05:00
ProSavage cfd1879466 Merge branch '1.6.x' of https://github.com/ProSavage/SavageFactions into 1.6.x 2019-02-19 21:00:27 -05:00
ProSavage a01e4d03a8 1.6 STABLE 2019-02-19 20:59:25 -05:00
NamanandGitHub 4915e68139 Merge pull request #104 from Drc-DEV/patch-3 
Fix misleading comment on title time
 2019-02-19 21:17:07 -04:00
NamanandGitHub 8b90488e4c Merge pull request #102 from Drc-DEV/patch-2 
Fixes NPC, BONE_MEAL and Essentials related exceptions
 2019-02-18 12:02:55 -04:00
NamanandGitHub 23df43cce3 Merge pull request #101 from Drc-DEV/patch-1 
Fix NoSuchFieldError (GRASS_BLOCK) on <1.13
 2019-02-17 16:33:24 -04:00
NamanandGitHub 83b6b0c3b7 Merge pull request #100 from FlowZz99/1.6.x 
Fix Max-Relation bug

Thanks for the help, Ive been sick so I havent had time to work on this stuff!
 2019-02-17 16:33:09 -04:00
ProSavage 707b7796c6 Quick rounding implementation added into /f top. 2019-02-12 07:54:58 -04:00
ProSavage 25ac8f026e More sorting cleanup & lambda functions in F Top Command. 2019-02-12 07:51:59 -04:00
ProSavage c2a90e857f Converted more Collection sorts to internal sorting methods. 2019-02-12 07:50:40 -04:00
ProSavage 8ee1b1da52 Removed duplicate condition check in Ftop Command. 2019-02-12 07:48:51 -04:00
ProSavage 69c698f6f2 Changed sorting from collections sort, into the internal call. 2019-02-12 07:48:18 -04:00
NamanandGitHub ce98d68518 Merge pull request #86 from GenialJerome/1.6.x 
Protection, Placeholder and fix
 2019-02-09 02:50:06 -06:00
NamanandGitHub d89c35b1bb Merge pull request #82 from James-Frowen/1.6.x 
Allowing warps to be replaced at max warps
 2019-01-30 03:28:02 +00:00
ProSavage 7b55a80744 Italian Language Globalization :D 2019-01-18 19:06:50 -06:00
ProSavage e1a1c630ad Fixed the elusive interact bug 2019-01-18 18:38:46 -06:00
ProSavage a47e06a34e Added factions.showclaims to the plugin.yml. 2019-01-13 10:36:36 -06:00
ProSavage f0c438270c I seem to have committed the wrong file. 2019-01-13 10:36:15 -06:00
ProSavage 5ca6b7d2d4 Fixed warzone tab autocomplete issue. 2019-01-13 10:23:02 -06:00
ProSavage 18e53d2a91 Merge remote-tracking branch 'origin/1.6.x' into 1.6.x 2019-01-06 21:04:46 -06:00
ProSavage 7ecc09f64d Fixed /f reload issue, with /f perms 2019-01-06 21:04:38 -06:00
NamanandGitHub f6c9bb0419 Update README.md 2019-01-03 21:28:24 -06:00
ProSavage 909c2b9a9f Merge remote-tracking branch 'origin/1.6.x' into 1.6.x 2019-01-02 23:12:09 -06:00
ProSavage d6a0be7ac2 Conf is now editable without having to stop server. 2019-01-02 23:12:02 -06:00
NamanandGitHub 90582c846a Update README.md 2018-12-27 11:54:37 -06:00
NamanandGitHub 5d58081f78 Update README.md 2018-12-27 11:53:36 -06:00
ProSavage bdd547309a First Wave of Skript Support. 2018-12-26 19:22:06 -06:00
ProSavage 7be48b5942 Fixed disband exploit 2018-12-23 18:20:54 -06:00
ProSavage 266c598b76 Fixed the spam issue with a real fix. 2018-12-21 15:46:10 -06:00
ProSavage ee3c5446e2 Version change. 2018-12-21 12:14:06 -06:00
ProSavage 8bf62ca659 Temporary Fix to command autocomplete spam. 2018-12-21 12:13:51 -06:00
ProSavage f2b5b8ccb5 Merge remote-tracking branch 'origin/1.6.x' into 1.6.x 2018-12-20 20:21:36 -06:00
ProSavage 0907798df5 Changed versioning of jar file to timestamp ( this is for CI ). 2018-12-20 20:15:43 -06:00
ProSavage d19b321438 New deploy & some javadoc fixes 2018-12-20 20:15:10 -06:00
NamanandGitHub 0eeba05845 Changed from rawgit to jsdeliver. 2018-12-19 22:30:26 -06:00
NamanandGitHub 9f26dd7bc2 Added instructions for maven dependency 2018-12-19 22:14:52 -06:00
NamanandGitHub c37617e5cb Update README.md 2018-12-16 11:47:09 -06:00
ProSavage 4d9ad85b54 Deployed new artifact with Upgrade Enum 2018-12-15 23:05:57 -06:00
ProSavage 02ae1af144 Added a deploy configuration to the pom for maven. 2018-12-15 23:05:13 -06:00
ProSavage 90c583f4df Disabled logging on 1.13 material replacements (again) 2018-12-15 23:04:49 -06:00
ProSavage cc1714b757 Made an Upgrade Enum, the code in /f upgrades is horrible, will be working on improving it. 2018-12-15 23:04:23 -06:00
NamanandGitHub 70bc5b5d6c Update README.md 2018-12-15 10:41:16 -06:00
NamanandGitHub 0ea3ef62f2 Update README.md 2018-12-15 10:40:40 -06:00
NamanandGitHub c3ca246563 Update README.md 2018-12-15 10:38:16 -06:00
NamanandGitHub 4ae9f7f19e Update README.md 2018-12-15 10:37:34 -06:00
NamanandGitHub ab36f94811 Update README.md 2018-12-15 10:37:20 -06:00
ProSavage 9962a9c527 Merge branch '1.6.x' of https://github.com/ProSavage/SavageFactions into 1.6.x 
:
 2018-12-15 09:37:18 -06:00
ProSavage 4e46184ab7 Added Maven Repository 2018-12-15 09:37:07 -06:00
NamanandGitHub c68047b498 Merge pull request #68 from GenialJerome/1.6.x 
Faction Disband Reason & Auto-Completion
 2018-12-08 22:56:23 -06:00
ProSavage d510e7ba50 Disabled Logging for material replacement in 1.13 versions as its just spammy. 2018-12-08 20:35:26 -06:00
ProSavage c58ed305a8 Merge remote-tracking branch 'origin/1.6.x' into 1.6.x 2018-12-06 16:11:32 -06:00
ProSavage e3f3f2a471 Compiled fresh javadocs. 2018-12-06 16:11:20 -06:00
ProSavage 9ed7fb0302 Moved version handling to pom.xml from plugin.yml 2018-12-06 16:07:48 -06:00
ProSavage 0584fa98bb Removed Debug from time hologram method. 2018-12-06 16:07:19 -06:00
ProSavage 7bf5def899 Fixed FactionTop Plugin detection. 2018-12-06 16:06:46 -06:00
NamanandGitHub 0c626e74cd Merge pull request #63 from Vankka/master 
Fix chat (2nd attempt)
 2018-11-24 23:04:59 -06:00
NamanandGitHub eee6a014e2 Merge pull request #60 from GenialJerome/1.6.x 
PowerRegenEvent and optimization
 2018-11-21 03:22:41 -06:00
ProSavage fb64d06e2d Fixed compile errors. 2018-11-19 01:37:26 -06:00
ProSavage 7a59ad4a66 Fixed all javadoc errors and regenerated them. 2018-11-19 01:34:31 -06:00
ProSavage ff6a3b2b1a Merge remote-tracking branch 'origin/1.6.x' into 1.6.x 2018-11-18 11:25:07 -06:00
ProSavage d039086397 Option to toggle MassiveStats 2018-11-18 11:24:52 -06:00
NamanandGitHub a611ca23c6 Merge pull request #59 from Vankka/1.6.x 
Clear recipient list instead of canceling the chat message
 2018-11-18 11:17:51 -06:00
ProSavage dd1b6d76c8 Worldborder check fixed. 2018-11-17 13:00:14 -06:00
ProSavage 2178dac54f Add migrator for players.json file, so leaders will not be lost when upgrading to new version 2018-11-11 20:05:57 -06:00
ProSavage 1ccf419294 Changed access modifier for itemIDChecker 2018-11-07 10:20:58 -06:00
ProSavage 84f1d354eb Fixed spacing in code around ! operator. 2018-11-07 10:14:42 -06:00
ProSavage 7f1785e152 Fixed disband issue. 2018-11-06 23:38:59 -06:00
ProSavage b1b9bd1b73 Reformatted Code 2018-11-06 23:38:44 -06:00
ProSavage cd09e77b42 Fixed internal name problems with leader 2018-11-06 23:16:11 -06:00
ProSavage 9d21df9c63 Fixed faction chat mode switch to public, IntelliJ refactor broke it. 2018-11-06 23:01:08 -06:00
ProSavage 23c83a43ec Version change. 2018-11-02 14:13:16 -05:00
ProSavage 2bc80a8383 Fixed issue with faction names not being able to have the letter 'p' in it. (lowercase) 2018-11-02 14:11:40 -05:00
ProSavage b2b94cea41 Fixed issue with faction names not being able to have the letter 'P' in it. 2018-11-02 14:08:40 -05:00
ProSavage 32ec804a54 1.7 spectator fix. 2018-10-26 15:10:50 -05:00
ProSavage a0add5668f Added website tag to plugin.yml 2018-10-24 14:46:49 -05:00
ProSavage 85035822a9 Added paypal perm nodes to plugin.yml 2018-10-24 14:35:06 -05:00
ProSavage 1c5185d06a Added the claimat permission to plugin.yml along with a version change to 1.4-RC-4 2018-10-24 14:33:35 -05:00
ProSavage 91c512bd7f Changed vault check method to not turn off plugin before it actually sends the message that vault is not present. 2018-10-24 10:50:35 -05:00
ProSavage ffc4812be9 Edited tpBanner to work correctly 2018-10-24 10:48:08 -05:00
ProSavage ebe80a0749 Made banner locations public 2018-10-24 10:46:31 -05:00
ProSavage 9689e79d86 Added ability to configure where warbanners are placed. 
Basically now you can disable the warbanner placement in enemy territory or vice versa.
 2018-10-24 10:30:29 -05:00
ProSavage 18140eee75 Moved banners to FactionsBlockListener 2018-10-24 10:25:05 -05:00
ProSavage 35b158a585 Removed PlayerVaultx.jar binary along with the dependency from pom.xml as the plugin no longer uses it. 2018-10-24 10:18:37 -05:00
ProSavage 558b7bcd2c Added a null check to deserialize & serialize method for the LocationTypeAdapter. 2018-10-23 13:20:20 -05:00
ProSavage 9aeb70404d Renamed Main Class of plugin from 'P' to 'SavageFactions', along with the plugin field from 'p' to 'plugin' 2018-10-22 18:43:02 -05:00
ProSavage 80e66d7d6c Changed the enum for Leader to actually be leader and not admin. 2018-10-18 19:39:48 -05:00
ProSavage 713aab8bfa Fixed backward compatibility on 1.12 for particles. 2018-10-18 11:55:21 -05:00
ProSavage 4075c33ef5 javadocs 2018-10-17 16:48:50 -05:00
ProSavage 4c89fff7de Version change 2018-10-17 16:32:47 -05:00
ProSavage f425663563 Buttons added to territory deny materials 2018-10-17 16:29:16 -05:00
ProSavage f8c52285c1 Door permission fixed ( relationally ) 2018-10-17 16:16:49 -05:00
ProSavage 705a370d31 Build/Destroy permission fixed ( relationally ) 2018-10-17 16:05:26 -05:00