1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Commit Graph

3978 Commits

Author SHA1 Message Date
Sefiraat
002a0e3e46
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/SmithingTableListener.java
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-09-14 07:07:58 +01:00
Sefiraat
83a4d1b65d Comment to show it's the Material/Netherite slot 2021-09-13 14:42:50 +01:00
Sefiraat
153f33a72b Message indentation and remove random && 2021-09-13 14:36:17 +01:00
Sefiraat
20beabcc3b
Apply suggestions from code review
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-09-13 14:13:27 +01:00
Sefiraat
13db44011b Slight wording change 2021-09-13 14:02:09 +01:00
Sefiraat
206e205d1b Deny using Slimefun Netherite in the SmithingTable + Tests 2021-09-13 13:26:35 +01:00
TheBusyBiscuit
79c6c139c6 Fixed #3241 2021-09-09 13:54:48 +02:00
TheBusyBiscuit
68e32cb358 Fixed #3218 2021-09-09 12:58:57 +02:00
TheBusyBiscuit
fc207b6a83
Merge pull request #3232 from svr333/FixCategoryNaming
Rename category -> itemGroup
2021-09-06 14:40:19 +02:00
Daniel Walsh
4d94c043d5
Fix metrics not being able to download
We used REPO_NAME in quite a few places which I didn't expect but here we are. Anyway, this fixes that.
2021-09-06 13:25:38 +01:00
Senne
fd2b8d0578
Rename category to itemgroup in messages.yml 2021-09-06 13:17:11 +02:00
Daniel Walsh
bafcd536f7
Update repo 2021-09-06 11:04:24 +01:00
Senne
f7f2c62ef7
Un-rename android category 2021-09-05 13:24:14 +02:00
Senne
8995005915
Replace category -> itemGroup 2021-09-04 12:52:29 +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
Benjamin Durham
50b6377d5d
Fixed broken import 2021-09-03 11:16:45 +12: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
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
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
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
3b1a5d02e2
Merge pull request #3200 from svr333/ChangeSfGuideMsg
Update message to show category
2021-08-24 08:45:36 +01:00
The Busy Bot
35895f4e26
[CI skip] New locale updates from Crowdin 2021-08-20 23:49:33 +02:00
Daniel Walsh
e187d87828
Merge pull request #3204 from Slimefun/fix/pickup-delay 2021-08-17 13:52:04 +01:00
Daniel Walsh
54efbe9625
Update comment 2021-08-17 12:19:50 +01:00
The Busy Bot
a8081c3eee
[CI skip] New locale updates from Crowdin 2021-08-17 11:16:06 +02:00
WalshyDev
afda035689
remove log 2021-08-17 06:56:25 +01:00
WalshyDev
4a65941e00
Fixes #3203 2021-08-17 06:52:25 +01:00
svr333
5daa0fa5fe
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/WoodcutterAndroid.java 2021-08-13 11:16:54 +02:00
svr333
a6474b92f5
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/MinerAndroid.java 2021-08-13 11:15:50 +02:00
svr333
2fce1e527e
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/MinerAndroid.java 2021-08-13 11:15:45 +02:00
svr333
9da4e5d43a
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/MinerAndroid.java 2021-08-13 11:15:40 +02:00
ItchyDitchy
e56fa84754
Code Format
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
2021-08-13 09:45:31 +08:00
svr333
fef3b745ca
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java 2021-08-12 23:35:05 +02:00
Senne
7b29813385
Update message to show category 2021-08-12 16:28:24 +02:00
ItchyDitchy
c0a4ef4946
Shorter Code
Title says it all
2021-08-08 19:09:08 +08:00
ItchyDitchy
1a08f1a36d
Move Support
Just noticed that an android may move in a border, so this is a fix for it.
2021-08-08 19:02:58 +08:00
ItchyDitchy
60df36975c
Code Format Fix 2021-08-06 21:40:41 +08:00