Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-09-15 08:28:33 +02:00
Code Issues Projects Releases Wiki Activity
864 Commits 7 Branches 8 Tags 4.9 MiB
f136290436
Commit Graph

864 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabrizio La Rosa
b181babdd4 Fix for permission check 
We should have both true, because overridingCheck() is usually true also when we don't have permission
 2020-06-16 21:05:01 +02:00
Fabrizio La Rosa
efdbe9d01f Merge remote-tracking branch 'upstream/development' 2020-06-16 19:45:58 +02:00
Fabrizio La Rosa
14b14016f4 Merge branch 'dev-upgrades' of https://gitlab.com/Fabrimat/fabledskyblock into dev-upgrades 2020-06-16 19:44:23 +02:00
Fabrizio La Rosa
c27a8b03ad Some comments 2020-06-16 19:42:25 +02:00
Fabrizio La Rosa
4b9f543b0a Initial work to add maxMembers upgrade 2020-06-16 19:17:28 +02:00
Fabrizio La Rosa
781b716783 Use block instead of material in CompatibleMaterial 2020-06-16 05:07:30 +02:00
Fabrizio La Rosa
fa5f34a889 Hotfix for island disappeared bug 2020-06-16 04:17:49 +02:00
Fabrizio La Rosa
0c1b75d222 1.8.8 compatibility (almost) 2020-06-16 01:39:26 +02:00
Brianna
e3b93209f7 Merge remote-tracking branch 'origin/master' into development 2020-06-15 14:47:22 -05:00
Brianna
7213d16884 Make banking functional on 1.8. 2020-06-15 14:43:22 -05:00
Fabrizio La Rosa
7bd6d5aa08 Updated readme 2020-06-15 20:50:36 +02:00
Fabrizio La Rosa
66ee4d4f5b Do not open challenge inventory if player doesn't have an island and per-island challenges are enabled 2020-06-15 16:30:44 +02:00
Fabrizio La Rosa
1d5463fed7 Unload players on logout, not load 2020-06-15 16:30:11 +02:00
Fabrizio La Rosa
69bcc7deca Fixed language 2020-06-15 16:12:39 +02:00
Fabrizio La Rosa
11c24c750f Finished deletion cooldown 2020-06-15 15:41:13 +02:00
Fabrizio La Rosa
0ebce83d77 Initial work for Deletion cooldown 2020-06-15 05:35:59 +02:00
Fabrizio La Rosa
0be81ba262 Added option to clear inventory and/or enderchest on island delete 2020-06-15 05:12:47 +02:00
Fabrizio La Rosa
977c599a10 Updated Readme 2020-06-15 05:07:52 +02:00
Fabrizio La Rosa
058e9bd20d Added option to define distance between islands 2020-06-15 04:05:04 +02:00
Fabrizio La Rosa
7fe0d4e72e Update .gitlab-ci.yml 2020-06-15 01:18:23 +00:00
Fabrizio La Rosa
3c602e84aa Update .gitlab-ci.yml 2020-06-15 01:16:31 +00:00
Fabrizio La Rosa
8ee7f0f21b Merge branch 'test-ci' into 'master' 
Add .gitlab-ci.yml

See merge request Fabrimat/fabledskyblock!2
 2020-06-15 01:12:39 +00:00
Fabrizio La Rosa
36987e636c Add .gitlab-ci.yml 2020-06-15 01:07:08 +00:00
Fabrizio La Rosa
6b5cc5a28d Removed another .DS_Store 2020-06-15 02:18:48 +02:00
Fabrizio La Rosa
6a8d883275 Merge from upstream 
# Conflicts:
#	pom.xml
#	src/main/java/com/songoda/skyblock/challenge/challenge/Challenge.java
 2020-06-15 02:18:33 +02:00
Fabrizio La Rosa
acba4483c4 Updated readme 2020-06-15 02:08:21 +02:00
Fabrizio La Rosa
b024299269 Cleanup code 2020-06-15 01:49:30 +02:00
Fabrizio La Rosa
f01afdfca2 Fixed wrong message address 2020-06-15 01:49:15 +02:00
Fabrizio La Rosa
66c4b5ecb7 Added more messages 2020-06-15 00:50:29 +02:00
Fabrizio La Rosa
ccba2db000 Added messages to language.yml and added the remove water on tp option 2020-06-15 00:50:22 +02:00
Fabrizio La Rosa
8c5be9bfe2 Merge branch 'Fabrimat-master-patch-01809' into 'master' 
Update README.md

See merge request Fabrimat/fabledskyblock!1
 2020-06-14 20:48:40 +00:00
Fabrizio La Rosa
0d5534eb21 Update README.md 2020-06-14 20:48:24 +00:00
Fabrizio La Rosa
0b97503c7e Permissions for WorldBorder colors 2020-06-14 22:42:17 +02:00
Fabrizio La Rosa
8bdb5805c6 Added permission to use Generators as Visitor 2020-06-14 22:10:35 +02:00
Fabrizio La Rosa
2e0031b116 Removed random variable in a random place 2020-06-14 21:29:21 +02:00
Fabrizio La Rosa
34df3066d8 Added challenge in IslandManager 2020-06-14 21:29:04 +02:00
Brianna
760e47bdd0 Merge branch 'development' 2020-06-14 14:05:48 -05:00
Brianna
77d5997d44 version 2.2.16 2020-06-14 14:05:41 -05:00
Brianna
1af2a4eadf Fix for overriding settings. 2020-06-14 13:59:27 -05:00
Giacomello Nathan
ea6befaada Try to fix Challenge 2020-06-14 13:38:37 -05:00
Brianna
00dc6c6ee7 Fix exit button. 2020-06-14 13:38:31 -05:00
Fabrizio La Rosa
b8819f3e59 Removed .DS_Store 2020-06-14 20:11:25 +02:00
Fabrizio La Rosa
a270ba06fc Removed double Songoda author 2020-06-14 20:06:10 +02:00
Fabrizio La Rosa
d948f92611 LaborPatch 0.0.3 2020-06-14 19:55:38 +02:00
Fabrizio La Rosa
199d7a0ca5 Fixed WorldBorder default value not always working 2020-06-14 19:55:11 +02:00
Fabrizio La Rosa
a3cea93d97 Fixed nullPointerException on logout 2020-06-14 19:53:53 +02:00
Fabrizio La Rosa
32b79e48a7 Fixed NullPointerException 2020-06-14 19:07:53 +02:00
Fabrizio La Rosa
cb7a442b50 Fix challenge item take algorithm 2020-06-14 18:43:17 +02:00
Fabrizio La Rosa
94e56d3b10 Allow placing certain blocks only if a dimension is unlocked 2020-06-14 18:20:28 +02:00
Fabrizio La Rosa
8f3bcd8ad7 Fixed Slime split detection 2020-06-14 17:33:46 +02:00