mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

Merge branch 'master' into tags

Browse Source
This commit is contained in:
TheBusyBiscuit 2020-10-03 22:05:13 +02:00 committed by GitHub
commit 6b3ae3b1cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -30,6 +30,7 @@
* Added various new fuel types to the Coal Generator
* Added a config option for Grappling Hooks to not be consumed on use
* Added Talisman of the Caveman
* You can now convert any gold ingot into gold dust with slightly less returns
* (API) Added custom tags for developers
#### Changes
@ -50,12 +51,12 @@
* Fixed some cargo incompatibilities with overflowing inventories
* Fixed #2353
* Fixed #2359
* Fixed #2238
* Fixed #2356
* Fixed #2358
* Fixed #2360
* Fixed #2351
* Fixed #2357
* Fixed #2238
## Release Candidate 16 (07 Sep 2020)
https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#16

30
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreCrusher.java
View File

@ -53,6 +53,36 @@ public class OreCrusher extends MultiBlockMachine {
recipes.add(SlimefunItems.GOLD_4K);
recipes.add(SlimefunItems.GOLD_DUST);
recipes.add(SlimefunItems.GOLD_6K);
recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 2));
recipes.add(SlimefunItems.GOLD_8K);
recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 2));
recipes.add(SlimefunItems.GOLD_10K);
recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 3));
recipes.add(SlimefunItems.GOLD_12K);
recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 3));
recipes.add(SlimefunItems.GOLD_14K);
recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 4));
recipes.add(SlimefunItems.GOLD_16K);
recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 4));
recipes.add(SlimefunItems.GOLD_18K);
recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 5));
recipes.add(SlimefunItems.GOLD_20K);
recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 5));
recipes.add(SlimefunItems.GOLD_22K);
recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 6));
recipes.add(SlimefunItems.GOLD_24K);
recipes.add(new SlimefunItemStack(SlimefunItems.GOLD_DUST, 6));
recipes.add(new ItemStack(Material.GRAVEL));
recipes.add(new ItemStack(Material.SAND));