mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity
7,467 Commits 1 Branch 0 Tags 64 MiB
eff4bf133d
Commit Graph

7467 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TerslenK
88a496a0f1
Merge branch 'Slimefun:master' into master 2021-11-01 16:36:43 +03:00
TerslenK
62f43bfca6
Update src/main/resources/tags/gravity_affected_blocks.json 
Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com>
 2021-11-01 16:34:33 +03:00
svr333
29585eb1a1
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-10-28 13:07:43 +02:00
TheBusyBiscuit
1ef99aac68
[CI skip] Merge pull request #3331 from Slimefun/renovate/com.github.lonedev6-itemsadder-api-2.x 
Update dependency com.github.LoneDev6:itemsadder-api to v2.4.20
 2021-10-28 13:04:39 +02:00
TheBusyBiscuit
b569ad6c73
[CI skip] Merge pull request #3332 from Slimefun/chore/update-changelog 
Update changelog with PR #3326
 2021-10-28 13:04:09 +02:00
svr333
0f176694a6
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2021-10-28 12:24:59 +02:00
Daniel Walsh
a0dade18c3
Update CHANGELOG.md 
Co-authored-by: Varian Anora <variananora@outlook.com>
 2021-10-28 08:26:01 +01:00
Daniel Walsh
82978f7d5b
Merge pull request #3326 from guizhanss/fix/smithing-table-listener 2021-10-28 02:31:17 +01:00
Daniel Walsh
5eab8072fa
Update changelog with PR #3326 2021-10-28 02:30:55 +01:00
Daniel Walsh
52cec21e29
[CI Skip] Merge pull request #3327 from Slimefun/renovate/com.konghq-unirest-java-3.x 2021-10-28 02:21:00 +01:00
Renovate Bot
a0767b034c
Update dependency com.github.LoneDev6:itemsadder-api to v2.4.20 2021-10-25 15:31:24 +00:00
Daniel Walsh
b8f7dc5d7b
[CI Skip] Merge pull request #3329 from Slimefun/renovate/com.sk89q.worldedit-worldedit-bukkit-7.x 2021-10-25 10:14:18 +01:00
Daniel Walsh
b3f3818ec7
[CI Skip] Merge pull request #3330 from Slimefun/renovate/com.sk89q.worldedit-worldedit-core-7.x 2021-10-25 10:13:49 +01:00
Renovate Bot
863de0ad72
Update dependency com.sk89q.worldedit:worldedit-core to v7.2.7 2021-10-24 14:32:49 +00:00
Renovate Bot
36a6f65012
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.7 2021-10-24 14:32:45 +00:00
Renovate Bot
b51d7c0f88
Update dependency com.konghq:unirest-java to v3.13.2 2021-10-23 12:54:33 +00:00
Senne
cd76f924d0
Make field static 2021-10-23 14:05:40 +02:00
ybw0014
4ea652960b
Fix smithing table listener on 1.15 and below 2021-10-22 07:22:57 +08:00
TheBusyBiscuit
a9c330d6a3 [CI skip] Fixed javadocs 2021-10-21 11:59:22 +02:00
Daniel Walsh
4a9124b1e3
Merge pull request #3321 from Slimefun/feature/data-backup-toggle 2021-10-18 20:52:20 +01:00
Daniel Walsh
5675f00e53
[CI Skip] Merge pull request #3322 from Slimefun/renovate/actions-checkout-2.x 2021-10-18 13:46:15 +01:00
Renovate Bot
93d466b65b
Update actions/checkout action to v2.3.5 2021-10-15 16:20:10 +00:00
Sfiguz7
b23a907053
Revert requested change as it breaks it :NotLikeThis: 2021-10-15 15:33:45 +02:00
Sfiguz7
15e6578cd6
Update CHANGELOG.md 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2021-10-15 15:33:06 +02:00
Sfiguz7
0f7f48647b
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/Slimefun.java 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2021-10-15 15:30:46 +02:00
Alessio Colombo
f63502bf42 Updated changelog 2021-10-15 15:03:51 +02:00
Alessio Colombo
258f375357 Added toggle to data zip backup 2021-10-15 15:02:12 +02:00
Daniel Walsh
bafaf135a6
Merge pull request #3319 from Slimefun/fix/enderlump_recipe 2021-10-12 15:47:36 +01:00
Alessio Colombo
5f27e968b3 Removed unused recipe from GrindStone 2021-10-12 16:26:19 +02:00
Alessio Colombo
1ea5281b27 Updated changelog 2021-10-12 16:23:52 +02:00
Alessio Colombo
5817494b2a Recipe fix 2021-10-12 16:19:29 +02:00
Daniel Walsh
ab13980f13
[CI Skip] Merge pull request #3318 from Slimefun/renovate/com.github.lonedev6-itemsadder-api-2.x 2021-10-12 14:21:12 +01:00
Renovate Bot
c82e02db43
Update dependency com.github.LoneDev6:itemsadder-api to v2.4.8 2021-10-12 11:51:49 +00:00
TheBusyBiscuit
008090cc6f [CI skip] Added unit test for new debugging tool 2021-10-11 01:37:54 +02:00
TerslenK
8ba3e35f0e
Merge branch 'Slimefun:master' into master 2021-10-10 23:32:46 +03:00
Daniel Walsh
ee43db9388
Merge pull request #3311 from Slimefun/feature/debug-command 2021-10-10 20:50:37 +01:00
TheBusyBiscuit
5883a84158
Merge branch 'master' into feature/debug-command 2021-10-10 19:45:40 +02:00
TheBusyBiscuit
b68ecf55d5
Update CHANGELOG.md 2021-10-10 19:45:08 +02:00
Daniel Walsh
9d222ec49c
peepoPog wow 2021-10-10 18:42:08 +01:00
TerslenK
2c2042de82
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2021-10-10 20:38:43 +03:00
Daniel Walsh
3f00777db3
Fix import 2021-10-10 18:29:01 +01:00
Daniel Walsh
cdf5142f8b
Improved message and removed tab completion 2021-10-10 17:58:09 +01:00
Daniel Walsh
13a7b5effb
[CI Skip] Merge pull request #3316 from Slimefun/renovate/ibiqlik-action-yamllint-3.x 2021-10-10 16:53:56 +01:00
Renovate Bot
8da712453f
Update ibiqlik/action-yamllint action to v3.1.0 2021-10-10 15:11:34 +00:00
terslenk
7e3774ecd1 adding gravity_affected_blocks.json and adding "GRAVITY_AFFECTED_BLOCKS" into SlimefunTag.java 2021-10-10 14:32:54 +03:00
terslenk
4b652ca485 Merge remote-tracking branch 'origin/master' 2021-10-10 14:20:54 +03:00
terslenk
75b298ed18 adding gravity_affected_blocks.json and adding "GRAVITY_AFFECTED_BLOCKS" into SlimefunTag.java 2021-10-10 14:20:35 +03:00
TerslenK
76b82b8fbe
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java 
Co-authored-by: Sfiguz7 <37039432+Sfiguz7@users.noreply.github.com>
 2021-10-10 14:15:36 +03:00
terslenk
af9c61904d adding gravity_affected_blocks.json and adding "GRAVITY_AFFECTED_BLOCKS" into SlimefunTag.java 2021-10-10 14:06:49 +03:00
Daniel Walsh
c18ce123c0
Add "disable" to tab complete 2021-10-09 18:02:22 +01:00