mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity
8,087 Commits 1 Branch 0 Tags 64 MiB
2b4681ea7b
Commit Graph

8087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Renovate Bot
9c8f3f5c46
Update dependency com.github.seeseemelk:MockBukkit-v1.18 to v1.15.0 2021-12-22 21:16:34 +00:00
Renovate Bot
02512f309d
Update actions/setup-java action to v2.5.0 2021-12-21 11:55:08 +00:00
TheBusyBiscuit
e755756dad
Merge pull request #3305 from Slimefun/feature/farmer_talisman 
Added Talisman of the Farmer (approved suggestion)
 2021-12-21 10:42:47 +01:00
TheBusyBiscuit
8229935b3a [CI skip] Fixed Unit Test 2021-12-21 10:32:39 +01:00
TheBusyBiscuit
230ea07ca1
[CI skip] Merge pull request #3381 from qwertyuioplkjhgfd/master 
make parachute class respect constructor recipetype parameter
 2021-12-21 10:25:12 +01:00
TheBusyBiscuit
281055b5a6
[CI skip] Merge pull request #3380 from Slimefun/renovate/me.clip-placeholderapi-2.x 
Update dependency me.clip:placeholderapi to v2.11.0
 2021-12-21 10:24:01 +01:00
qwertyuioplkjhgfd
9723d6af80 this is probably unintended? 2021-12-20 23:30:56 -08:00
Renovate Bot
c203aba874
Update dependency me.clip:placeholderapi to v2.11.0 2021-12-20 18:58:36 +00:00
Alessio Colombo
8116820a53 Bleh 2021-12-20 14:04:16 +01:00
Alessio Colombo
2d526f30b4 Moved double drops to helper method 2021-12-20 13:37:01 +01:00
Daniel Walsh
c580f296be
[CI Skip] Merge pull request #3377 from Slimefun/api/improve-biomemaps-api 2021-12-19 11:09:31 +00:00
Daniel Walsh
77aa308a76
Oops 2021-12-18 18:13:40 +00:00
Daniel Walsh
6bfc2a1a40
Remove SF only method 2021-12-18 17:55:51 +00:00
TheBusyBiscuit
377f262c05
[CI skip] Add jitpack configuration 2021-12-18 18:16:16 +01:00
Daniel Walsh
18665692b8
Improved the API for BiomeMap 2021-12-18 13:49:41 +00:00
TheBusyBiscuit
7052098678
[CI skip] Merge pull request #3346 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x 
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.206
 2021-12-18 14:00:50 +01:00
Renovate Bot
f3d91c5b87
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.206 2021-12-18 12:51:23 +00:00
TheBusyBiscuit
863b8d6425
Merge pull request #3369 from Slimefun/wip/1.18 
Added 1.18 support
 2021-12-18 13:01:49 +01:00
Daniel Walsh
de69f15db5
Updated dough to 1.1.1 2021-12-17 21:32:21 +00:00
TheBusyBiscuit
f0bf6f0d1d Encourage Java 17 (not required) 2021-12-17 17:57:21 +01:00
TheBusyBiscuit
076d8eb837 Run workflows on JDK 16 (Project still targets Java 8) 2021-12-17 17:54:36 +01:00
TheBusyBiscuit
f88e2c287d Update dough dependency 2021-12-17 17:54:06 +01:00
TheBusyBiscuit
827fd94559
[CI skip] Merge pull request #3374 from Slimefun/renovate/mockito-monorepo 
Update dependency org.mockito:mockito-core to v4.2.0
 2021-12-17 14:31:23 +01:00
Renovate Bot
bccf3086e4
Update dependency org.mockito:mockito-core to v4.2.0 2021-12-16 14:56:45 +00:00
TheBusyBiscuit
b90bbca2ad
[CI skip] Merge pull request #3370 from Slimefun/renovate/com.sk89q.worldedit-worldedit-bukkit-7.x 
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.8
 2021-12-13 16:12:55 +01:00
TheBusyBiscuit
39a0c25d7e
[CI skip] Merge pull request #3371 from Slimefun/renovate/com.sk89q.worldedit-worldedit-core-7.x 
Update dependency com.sk89q.worldedit:worldedit-core to v7.2.8
 2021-12-13 16:12:47 +01:00
TheBusyBiscuit
687d43d2fa
[CI skip] Merge pull request #3372 from Slimefun/renovate/com.github.lonedev6-itemsadder-api-2.x 
Update dependency com.github.LoneDev6:itemsadder-api to v2.5.0
 2021-12-13 16:12:39 +01:00
Renovate Bot
2266647519
Update dependency com.github.LoneDev6:itemsadder-api to v2.5.0 2021-12-13 11:33:00 +00:00
Renovate Bot
f35ed0a438
Update dependency com.sk89q.worldedit:worldedit-core to v7.2.8 2021-12-11 07:53:26 +00:00
Renovate Bot
88c1d0323f
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.8 2021-12-11 07:53:22 +00:00
TheBusyBiscuit
a838a73d49
Bump to Spigot 1.18.1 2021-12-11 00:53:39 +01:00
TheBusyBiscuit
6c66818f39 Updated changelog and readme 2021-12-10 23:05:21 +01:00
TheBusyBiscuit
2ab59393a6 Added 1.18 biome-maps 2021-12-10 23:03:17 +01:00
TheBusyBiscuit
93775e36b4 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
wip/1.18

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/OilResource.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/SaltResource.java
	src/test/java/io/github/thebusybiscuit/slimefun4/api/geo/TestResourceRegistration.java
 2021-12-10 22:45:00 +01:00
TheBusyBiscuit
250fe4c901
Merge pull request #3367 from Slimefun/api/biome-maps 
(API) Added Biome Maps [1.18 preparation]
 2021-12-10 22:38:36 +01:00
TheBusyBiscuit
2296ae3aff
[CI skip] Merge pull request #3297 from svr333/WikiUpdate 
Update wiki.json
 2021-12-10 19:39:11 +01:00
TheBusyBiscuit
8e73ef9287
Update CHANGELOG.md 2021-12-10 19:39:00 +01:00
TheBusyBiscuit
3a52496980
Update CHANGELOG.md 2021-12-10 19:03:06 +01:00
TheBusyBiscuit
4daa5d6475
[CI skip] Merge pull request #3315 from TerslenK/master 
Re-adding gravity_affected_blocks.json and adding "GRAVITY_AFFECTED_BLOC…
 2021-12-10 19:01:38 +01:00
TheBusyBiscuit
224049431e
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/PatternUtils.java 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2021-12-10 18:57:28 +01:00
TheBusyBiscuit
50310fd2ce
Apply suggestions from code review 
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
 2021-12-10 18:21:04 +01:00
TheBusyBiscuit
796193207e
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/biomes/BiomeDataConverter.java 
Co-authored-by: Sfiguz7 <37039432+Sfiguz7@users.noreply.github.com>
 2021-12-09 16:25:47 +01:00
TheBusyBiscuit
b58fff602e Finished configuration 2021-12-09 15:28:10 +01:00
TheBusyBiscuit
6e60e94031 Updated Nether Ice biome map 2021-12-09 13:40:12 +01:00
TheBusyBiscuit
829a7d6bf6 Added version compat tests 2021-12-09 13:31:04 +01:00
TheBusyBiscuit
5ba049d29c Added lenient parsing and more documentation 2021-12-09 12:42:02 +01:00
TheBusyBiscuit
db5e4ffa2e Refactoring and documentation 2021-12-08 20:25:04 +01:00
TheBusyBiscuit
4136615c67 shhhh, this wasn't copy-pasted at all 👀 2021-12-08 18:44:36 +01:00
TheBusyBiscuit
ecc8505d46 Updated changelog 2021-12-08 18:39:05 +01:00
TheBusyBiscuit
9c938df2d5 Fixed unit test 2021-12-08 18:37:56 +01:00