TheBusyBiscuit
6e65d653ea
Merge pull request #3230 from Slimefun/renovate/pascalgn-automerge-action-0.x
...
Update pascalgn/automerge-action action to v0.14.3
2021-09-05 10:13:46 +02:00
TheBusyBiscuit
488d83fcd6
Merge pull request #3234 from Slimefun/renovate/thollander-actions-comment-pull-request-1.x
...
Update thollander/actions-comment-pull-request action to v1.0.3
2021-09-05 10:13:36 +02:00
Renovate Bot
798b5b8b47
Update thollander/actions-comment-pull-request action to v1.0.3
2021-09-04 22:00:12 +00:00
Renovate Bot
b7b24dca44
Update pascalgn/automerge-action action to v0.14.3
2021-09-03 20:20:49 +00:00
TheBusyBiscuit
3fbb6884fb
New changelog cycle
2021-09-03 14:05:20 +02:00
TheBusyBiscuit
6951251394
Some additional cleanup
2021-09-03 14:01:55 +02:00
TheBusyBiscuit
9451e256e5
Merge pull request #3229 from Bencey/patch-1
...
Fixed ender lump guide entry
2021-09-03 13:43:01 +02:00
TheBusyBiscuit
7b4c9d93fa
Merge pull request #3139 from Slimefun/breaking-changes/class-relocation
...
⚠️ BREAKING CHANGES ⚠️ - Relocation of important API classes.
2021-09-03 13:42:33 +02:00
Benjamin Durham
50b6377d5d
Fixed broken import
2021-09-03 11:16:45 +12:00
TheBusyBiscuit
72cbdf8bcc
Merge branch 'master' into breaking-changes/class-relocation
2021-09-02 17:28:31 +02:00
TheBusyBiscuit
d2fe1c3d67
[CI skip] Updated changelog
2021-09-02 17:15:03 +02:00
Daniel Walsh
02cc920109
Fix the other instances of Inventory#isEmpty
2021-09-02 16:14:12 +01:00
Daniel Walsh
ffdf9c8ea6
Forgot the util class reee
2021-09-02 16:08:55 +01:00
Daniel Walsh
42d6d259a8
Merge master
2021-09-02 16:07:35 +01:00
Daniel Walsh
8a0587a111
Merge pull request #3228 from Slimefun/fix/issue-3206
...
Fixes #3206
2021-09-02 16:06:38 +01:00
Daniel Walsh
43280f9801
Update CHANGELOG
2021-09-02 14:29:46 +01:00
Daniel Walsh
535c7f47f9
Fixes #3206
2021-09-02 14:07:38 +01:00
Daniel Walsh
39d0080fe7
Fix compilation
2021-09-02 13:41:33 +01:00
Daniel Walsh
2519e884fa
Merge branch 'master' of github.com:Slimefun/Slimefun4 into breaking-changes/class-relocation
2021-09-02 13:39:54 +01:00
Daniel Walsh
f95dd9a6e3
Merge pull request #3227 from variananora/add-1.17-blocks-to-electric-press
...
Add some new 1.17 blocks to electric press
2021-09-02 13:39:26 +01:00
Daniel Walsh
8f2aef65d5
Merge pull request #3226 from Slimefun/fix/issue-3225
2021-09-02 11:07:22 +01:00
Varian Anora
7b37663f47
Add new 1.17 blocks to electric press
...
Added 4 Amethyst Shard -> Amethyst Block
Added 9 Copper Ingot -> Copper Block
Added 9 Raw Iron -> Raw Iron Block
Added 9 Raw Gold -> Raw Gold Block
Added 9 Raw Copper -> Raw Copper Block
2021-09-02 12:40:25 +07:00
Daniel Walsh
1513b01f85
Fix tests
2021-09-01 21:15:42 +01:00
Daniel Walsh
0841e1ef14
Fix naming of setCategory -> setItemGroup
2021-09-01 21:14:25 +01:00
Daniel Walsh
aa9e7a49d9
Fix compilation
2021-09-01 21:13:58 +01:00
Daniel Walsh
d64f2bba3f
Merge branch 'master' into breaking-changes/class-relocation
2021-09-01 21:03:22 +01:00
Daniel Walsh
72573eebcd
Remove unused var
2021-09-01 19:05:50 +01:00
Daniel Walsh
1ba0062ab2
Fixes #3225 and chunk data not being saved on shutdown
...
We had a `chunksLoaded` boolean, not sure why this was here but removing it did not cause any unexpected changes.
We have a world name check so this in theory should not be required. If there was a reason which is still valid, we will find out soon and should do a proper fix rather than this.
I also fixed the chunk data not saving on normal shutdown
2021-09-01 19:03:19 +01:00
Benjamin Durham
832da8f146
Guide shows wrong machine
...
Enderlump 1 is made with grindstone not the enhanced crafting table
2021-09-01 17:16:01 +12:00
Daniel Walsh
d6be483a32
Merge pull request #3196 from ItchyDitchy/master
2021-08-30 12:43:15 +01:00
Daniel Walsh
b1b87580ec
[CI Skip] Merge pull request #3219 from Slimefun/renovate/devmasx-merge-branch-1.x
...
Update devmasx/merge-branch action to v1.4.0
2021-08-30 12:02:00 +01:00
Daniel Walsh
0c134ee778
[CI Skip] Merge pull request #3216 from Slimefun/renovate/thollander-actions-comment-pull-request-1.x
...
Update thollander/actions-comment-pull-request action to v1.0.2
2021-08-30 12:01:23 +01:00
Renovate Bot
eebe7a3ee2
Update devmasx/merge-branch action to v1.4.0
2021-08-30 10:59:31 +00:00
Renovate Bot
8b004058af
Update thollander/actions-comment-pull-request action to v1.0.2
2021-08-30 10:59:28 +00:00
Daniel Walsh
7272154e20
[CI Skip] Merge pull request #3217 from Slimefun/renovate/com.konghq-unirest-java-3.x
...
Update dependency com.konghq:unirest-java to v3.11.13
2021-08-30 11:58:42 +01:00
Daniel Walsh
0c18841ac6
[CI Skip] Merge pull request #3222 from Slimefun/Sfiguz7-patch-1
2021-08-30 11:57:59 +01:00
Sfiguz7
0a49e5fd0b
Update maven-compiler.yml
2021-08-30 12:15:17 +02:00
Renovate Bot
85f62a6688
Update dependency com.konghq:unirest-java to v3.11.13
2021-08-27 16:53:12 +00:00
TheBusyBiscuit
2f24df1a04
[CI skip] Merge pull request #3212 from Slimefun/renovate/actions-setup-java-2.x
...
Update actions/setup-java action to v2.3.0
2021-08-26 20:41:55 +02:00
Daniel Walsh
f1180d6419
[CI Skip] Merge pull request #3213 from Slimefun/renovate/org.mockito-mockito-core-3.x
...
Update dependency org.mockito:mockito-core to v3.12.4
2021-08-26 10:10:18 +01:00
Renovate Bot
9178fa7505
Update dependency org.mockito:mockito-core to v3.12.4
2021-08-25 21:28:35 +00:00
Daniel Walsh
3b1a5d02e2
Merge pull request #3200 from svr333/ChangeSfGuideMsg
...
Update message to show category
2021-08-24 08:45:36 +01:00
Renovate Bot
269350cfb2
Update actions/setup-java action to v2.3.0
2021-08-23 12:51:29 +00:00
Daniel Walsh
d3bde94a7d
[CI Skip] Merge pull request #3210 from Slimefun/renovate/com.sk89q.worldedit-worldedit-bukkit-7.x
...
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.6
2021-08-22 11:13:15 +01:00
Daniel Walsh
f7dbb9dffc
[CI Skip] Merge pull request #3211 from Slimefun/renovate/com.sk89q.worldedit-worldedit-core-7.x
...
Update dependency com.sk89q.worldedit:worldedit-core to v7.2.6
2021-08-22 11:12:47 +01:00
Renovate Bot
51681529ab
Update dependency com.sk89q.worldedit:worldedit-core to v7.2.6
2021-08-22 05:08:57 +00:00
Renovate Bot
62e6b517a6
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.6
2021-08-22 05:08:54 +00:00
The Busy Bot
35895f4e26
[CI skip] New locale updates from Crowdin
2021-08-20 23:49:33 +02:00
TheBusyBiscuit
c3eed1ed40
[CI skip] Merge pull request #3207 from Slimefun/renovate/ibiqlik-action-yamllint-3.x
...
Update ibiqlik/action-yamllint action to v3.0.4
2021-08-20 23:49:06 +02:00
TheBusyBiscuit
312f308143
[CI skip] Merge pull request #3208 from Slimefun/renovate/org.mockito-mockito-core-3.x
...
Update dependency org.mockito:mockito-core to v3.12.1
2021-08-20 23:48:57 +02:00
