Commit Graph

1995 Commits

Author SHA1 Message Date
DroppingAnvil
4181ff539d Cleaned up unused imports 2019-09-15 23:03:58 -05:00
DroppingAnvil
b3eca15839 Added 2 new Faction Mission types! 2019-09-15 23:01:34 -05:00
Driftay
8df75a59d4 version change 2019-09-15 18:49:12 -04:00
Driftay
b0ca56fc71 Spelling POG 2019-09-15 18:48:47 -04:00
Driftay
338b062de0
Merge pull request #14 from DroppingAnvil/1.6.x
New F Upgrade!
2019-09-15 18:16:51 -04:00
DroppingAnvil
1e7bd8ff35 Removed 2 lines used for debug. 2019-09-15 17:10:15 -05:00
DroppingAnvil
26010c6ba2 Added a new F Upgrade type! 2019-09-15 17:08:36 -05:00
Driftay
570cb4e805
Merge pull request #13 from AigleDev/1.6.x
fix an NPE and other changes
2019-09-15 16:58:14 -04:00
Driftay
2fe4d29c0e Spelling POG 2019-09-15 16:33:22 -04:00
DroppingAnvil
f78290b63d
Merge from Driftay/1.6.x 2019-09-15 14:03:20 -05:00
AigleDev
fb3204ddb1 fix an NPE and other changes 2019-09-15 20:53:27 +02:00
Driftay
4f38bfa949 forgot i already added 1 to the level 2019-09-15 07:53:20 -04:00
Driftay
488eb78405 Forgot To Register Upgrade Listener xD 2019-09-15 07:52:29 -04:00
Driftay
82d2971b65 Added Warp, DamageIncrease & Reduction, and TNT F Upgrades 2019-09-15 07:51:12 -04:00
Driftay
7f988031ca Showing Dropping Anvil Something (Ignore) 2019-09-15 05:19:06 -04:00
Driftay
2feaed0aad Showing Dropping Anvil Something (Ignore) 2019-09-15 05:15:33 -04:00
Driftay
e7db7170d1 Showing Dropping Anvil Something (Ignore) 2019-09-15 05:14:14 -04:00
Driftay
2a1a8db554 Showing Dropping Anvil Something (Ignore) 2019-09-15 05:12:52 -04:00
Driftay
e07dc303ef Showing Dropping Anvil Something (Ignore) 2019-09-15 05:08:00 -04:00
Driftay
978bcbbb3b Merge remote-tracking branch 'origin/1.6.x' into 1.6.x
# Conflicts:
#	src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java
#	src/main/java/com/massivecraft/factions/missions/MissionHandler.java
2019-09-15 05:04:22 -04:00
Driftay
d98f5d9723 Showing Dropping Anvil Something (Ignore) 2019-09-15 05:02:53 -04:00
Driftay
7e9c6cead8
Merge pull request #12 from DroppingAnvil/1.6.x
Added new mission type + added an existing type that was missing from config + added ALL for all missions that use Material or EntityType
2019-09-15 04:55:59 -04:00
DroppingAnvil
8f013e13a4 Fixed a small config mistake I had made 2019-09-15 03:50:07 -05:00
DroppingAnvil
b1525601a0 Merge remote-tracking branch 'origin/1.6.x' into 1.6.x 2019-09-15 03:46:59 -05:00
DroppingAnvil
0d5e5dda73 Added tame mission type added "ALL" for all Missions that require Material or EntityType 2019-09-15 03:46:41 -05:00
DroppingAnvil
b4b226e4f0
Merge pull request #3 from Driftay/1.6.x
Update from base
2019-09-15 03:32:36 -05:00
Driftay
c4e81286b7 Deny Breaking Banners to avoid dupe glitches in enemy territory 2019-09-15 04:26:16 -04:00
DroppingAnvil
fcab9790b5
Merge!
Finally back on course and able to merge automatically with Driftay's SaberFactions!
2019-09-15 03:25:14 -05:00
DroppingAnvil
6f5ba4c11b Getting back on course... 2019-09-15 03:23:10 -05:00
DroppingAnvil
8e238e2b48 Merging branches 1 new mission type 2019-09-15 03:14:15 -05:00
Driftay
ed0e17e2a0 Missions Fix 2019-09-15 03:48:25 -04:00
Driftay
58efba39b0 Config Converter Added (DroppingAnvil) 2019-09-14 16:04:20 -04:00
Driftay
804160429d Fixed Fly Disable For People In Creative 2019-09-14 15:51:30 -04:00
Driftay
db9c951283 Version Change 2019-09-14 15:33:49 -04:00
Driftay
3c9b606bb9 Introduced Brigadier Command System. More Formatting Coming in next commit. 2019-09-14 15:14:28 -04:00
DroppingAnvil
c23d19435d Added check for gamemode when disabling flight as to not disable flight for players not using factions flight but minecraft flight 2019-09-14 10:22:58 -05:00
BuildTools
8035e26af0 Merge remote-tracking branch 'origin/1.6.x' into 1.6.x 2019-09-14 09:23:35 -05:00
BuildTools
2439e5258f Fixed WarBanner Persistence Error with Placement 2019-09-14 09:22:38 -05:00
DroppingAnvil
049ba10321
Update README.md 2019-09-12 19:32:58 -05:00
DroppingAnvil
ab9ce5649d
Update README.md 2019-09-12 19:04:49 -05:00
BuildTools
0530b67b77 Updated Factions.jar 2019-09-12 18:58:40 -05:00
BuildTools
baeb797c0d Updated configuration converted for new SaberFactions config. 2019-09-12 18:57:09 -05:00
Driftay
b06e6e0f04
Merge pull request #8 from AigleDev/patch
Fix an NPE
2019-09-12 18:50:58 -04:00
DroppingAnvil
679fbbf92f Fixed missing import for ConvertConfigHandler added convert perm to Admin kit 2019-09-12 17:28:15 -05:00
BuildTools
a58b28536b Changed role names added capitalization and a grammar fix. 2019-09-12 17:14:10 -05:00
BuildTools
8ede39413c Added configuration conversion! 2019-09-12 15:53:52 -05:00
AigleDev
0d8526372e change 2019-09-12 21:21:23 +02:00
AigleDev
ba86f28994 NPE fix 2019-09-12 21:20:20 +02:00
Driftay
a25e134f20 Version Change 2019-09-11 07:03:22 -04:00
Driftay
9b68687ef7 Code Reformat 2019-09-11 06:58:46 -04:00