mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-19 19:25:48 +00:00
Merge branch 'master' into tags
This commit is contained in:
commit
6b3ae3b1cf
@ -30,6 +30,7 @@
|
|||||||
* Added various new fuel types to the Coal Generator
|
* Added various new fuel types to the Coal Generator
|
||||||
* Added a config option for Grappling Hooks to not be consumed on use
|
* Added a config option for Grappling Hooks to not be consumed on use
|
||||||
* Added Talisman of the Caveman
|
* 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
|
* (API) Added custom tags for developers
|
||||||
|
|
||||||
#### Changes
|
#### Changes
|
||||||
@ -50,12 +51,12 @@
|
|||||||
* Fixed some cargo incompatibilities with overflowing inventories
|
* Fixed some cargo incompatibilities with overflowing inventories
|
||||||
* Fixed #2353
|
* Fixed #2353
|
||||||
* Fixed #2359
|
* Fixed #2359
|
||||||
* Fixed #2238
|
|
||||||
* Fixed #2356
|
* Fixed #2356
|
||||||
* Fixed #2358
|
* Fixed #2358
|
||||||
* Fixed #2360
|
* Fixed #2360
|
||||||
* Fixed #2351
|
* Fixed #2351
|
||||||
* Fixed #2357
|
* Fixed #2357
|
||||||
|
* Fixed #2238
|
||||||
|
|
||||||
## Release Candidate 16 (07 Sep 2020)
|
## Release Candidate 16 (07 Sep 2020)
|
||||||
https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#16
|
https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#16
|
||||||
|
@ -53,6 +53,36 @@ public class OreCrusher extends MultiBlockMachine {
|
|||||||
recipes.add(SlimefunItems.GOLD_4K);
|
recipes.add(SlimefunItems.GOLD_4K);
|
||||||
recipes.add(SlimefunItems.GOLD_DUST);
|
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.GRAVEL));
|
||||||
recipes.add(new ItemStack(Material.SAND));
|
recipes.add(new ItemStack(Material.SAND));
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user