TheBusyBiscuit
|
3b11db60d5
|
[CI skip] Merge pull request #2922 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.32.2
|
2021-03-31 09:32:15 +02:00 |
|
Renovate Bot
|
d6ff59cfb4
|
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.183
|
2021-03-31 00:00:26 +00:00 |
|
Renovate Bot
|
a019d3892f
|
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.32.2
|
2021-03-30 11:18:14 +00:00 |
|
GallowsDove
|
ae7c22703e
|
requested changes
|
2021-03-29 20:39:55 +02:00 |
|
GallowsDove
|
062adb4cb7
|
Hopefully improved code
|
2021-03-28 22:49:45 +02:00 |
|
GallowsDove
|
7536f01145
|
Added unbreakable support for damageable items
|
2021-03-28 22:33:04 +02:00 |
|
GallowsDove
|
560d45e005
|
Merge pull request #1 from Slimefun/master
upkeep
|
2021-03-28 22:17:35 +02:00 |
|
TheBusyBiscuit
|
82366191b0
|
Merge pull request #2916 from Slimefun/fix/issue-2650
Fixed 2650
|
2021-03-28 15:03:58 +02:00 |
|
TheBusyBiscuit
|
d7e236a962
|
Merge pull request #2907 from Sfiguz7/master
Added 2 missing researches
|
2021-03-28 15:02:13 +02:00 |
|
Daniel Walsh
|
526c2cc76c
|
Update src/main/resources/languages/researches_en.yml
|
2021-03-28 13:56:50 +01:00 |
|
Sfiguz7
|
7d92fe45b6
|
Gitlost I'm coming
|
2021-03-28 14:54:54 +02:00 |
|
Sfiguz7
|
25fd2120dc
|
FUCK YOU
|
2021-03-28 14:53:15 +02:00 |
|
Sfiguz7
|
07c0e88bec
|
Fuck the research_en file
|
2021-03-28 14:50:14 +02:00 |
|
TheBusyBiscuit
|
fb8c2ede7f
|
Merge branch 'master' into fix/issue-2650
|
2021-03-28 14:47:47 +02:00 |
|
Sfiguz7
|
78d1a8b21a
|
More merge conflicts
|
2021-03-28 14:45:03 +02:00 |
|
Daniel Walsh
|
1b15e04782
|
This damn changelog
|
2021-03-28 13:45:02 +01:00 |
|
Sfiguz7
|
7ee4b98745
|
Resolved merge conflicts
|
2021-03-28 14:43:57 +02:00 |
|
Daniel Walsh
|
449a2524e9
|
Merge pull request #2917 from Slimefun/feature/animal-produce
|
2021-03-28 13:41:39 +01:00 |
|
Daniel Walsh
|
ec37fb142a
|
Requested changes
|
2021-03-28 13:26:57 +01:00 |
|
TheBusyBiscuit
|
9e2867870f
|
Added missing recipe
|
2021-03-28 14:22:19 +02:00 |
|
TheBusyBiscuit
|
95a2d9e385
|
Fixed Multimeter not working on Auto-Crafters
|
2021-03-28 14:18:43 +02:00 |
|
TheBusyBiscuit
|
2cf3ede10b
|
Fixed some concurrency issues
|
2021-03-28 11:44:47 +02:00 |
|
Rothes
|
2f7335e65b
|
no static import
|
2021-03-28 16:55:39 +08:00 |
|
Rothes
|
c500b825c5
|
no static import
|
2021-03-28 16:55:10 +08:00 |
|
Rothes
|
f01f31bfc1
|
no static import
|
2021-03-28 16:49:48 +08:00 |
|
Rothes
|
fe82adf0ba
|
no static import
|
2021-03-28 16:49:16 +08:00 |
|
Rothes
|
bfb3c4f58d
|
Update AutoDisenchanter.java
|
2021-03-28 12:39:55 +08:00 |
|
Daniel Walsh
|
488ffd951b
|
Fix test? (Im super tired... not sure why this didnt occur to me...)
|
2021-03-28 03:23:10 +01:00 |
|
Daniel Walsh
|
5283f02903
|
Fixes #2650
|
2021-03-28 03:16:50 +01:00 |
|
TheBusyBiscuit
|
0dc1ac3894
|
Added Produce Collector to automate Milk and Mushroom Stew
Also fixed Auto Crafters not handling milk buckets properly
And allowed Block Placers to place down cakes
|
2021-03-28 01:40:19 +01:00 |
|
Daniel Walsh
|
73b5ef8b52
|
Merge pull request #2915 from Slimefun/fix/issue-2914
Fixes #2914
|
2021-03-27 23:02:13 +00:00 |
|
Daniel Walsh
|
cb2052ec93
|
Fixes #2914
|
2021-03-27 22:52:14 +00:00 |
|
TheBusyBiscuit
|
b64be98274
|
Added Unit Tests for disabling recipes
|
2021-03-27 22:34:23 +01:00 |
|
TheBusyBiscuit
|
fd16306b61
|
Auto-Crafters can now be turned on and off via the gui
|
2021-03-27 22:26:15 +01:00 |
|
TheBusyBiscuit
|
235d3f4d57
|
Added Auto-Crafter for the Armor Forge
|
2021-03-27 18:58:31 +01:00 |
|
TheBusyBiscuit
|
70db23bdc5
|
Fixes #2913
|
2021-03-27 18:36:30 +01:00 |
|
Daniel Walsh
|
f7352895ae
|
Merge pull request #2909 from RobotHanzo/master
Fixes #2903
|
2021-03-27 17:14:40 +00:00 |
|
RobotHanzo
|
a7ee828209
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Crucible.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
|
2021-03-28 00:47:20 +08:00 |
|
TheBusyBiscuit
|
6eb5235cf7
|
Automated Crafting Chamber is now disabled.
|
2021-03-27 11:55:00 +01:00 |
|
TheBusyBiscuit
|
090a0f7791
|
Merge branch 'chore/cleanup-deprecated-crafter'
|
2021-03-27 11:52:54 +01:00 |
|
Rothes
|
efaca45045
|
Update AutoDisenchanter.java
|
2021-03-27 07:13:40 +08:00 |
|
Rothes
|
09c3367985
|
Replaced §
|
2021-03-27 07:12:25 +08:00 |
|
Rothes
|
685824c325
|
Update AutoDisenchanter.java
|
2021-03-27 06:28:14 +08:00 |
|
Rothes
|
50b1b2b980
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoEnchanter.java
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
|
2021-03-27 06:26:22 +08:00 |
|
Rothes
|
4b962cd810
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
|
2021-03-27 06:25:41 +08:00 |
|
BuildTools
|
02c990cf29
|
a
|
2021-03-27 05:48:50 +08:00 |
|
TheBusyBiscuit
|
342b969b77
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
|
2021-03-26 20:58:46 +01:00 |
|
TheBusyBiscuit
|
ba984728e7
|
Added "Netherite Ingot -> Netherite Block" recipe to Electric Press
|
2021-03-26 20:58:22 +01:00 |
|
TheBusyBiscuit
|
dba628f99c
|
[CI skip] Small performance optimization
|
2021-03-26 20:56:15 +01:00 |
|
RobotHanzo
|
50aaa08ccc
|
Update Crucible.java
|
2021-03-27 00:36:20 +08:00 |
|