RobotHanzo
|
a000c92d93
|
Null checks
|
2021-04-02 20:50:28 +08:00 |
|
RobotHanzo
|
8b9705a0b4
|
Added a test
|
2021-04-02 20:47:29 +08:00 |
|
RobotHanzo
|
1bc51f4d80
|
Fixes #2837
|
2021-04-02 17:40:00 +08:00 |
|
TheBusyBiscuit
|
0b6bbb453e
|
[CI skip] Merge pull request #2928 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.33.0
|
2021-04-02 00:50:08 +02:00 |
|
Renovate Bot
|
7d2c71d47e
|
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.33.0
|
2021-04-01 21:06:19 +00:00 |
|
TheBusyBiscuit
|
0bec76f6e0
|
[CI skip] Merge pull request #2925 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.184
|
2021-04-01 12:35:11 +02:00 |
|
Renovate Bot
|
92188d94e8
|
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.184
|
2021-03-31 23:44:23 +00:00 |
|
TheBusyBiscuit
|
ee8d421189
|
Ancient Pedestals can now be found under "Magical Gadgets"
|
2021-03-31 19:13:21 +02:00 |
|
TheBusyBiscuit
|
ca3715a0dc
|
Added Crafting Motor (crafting ingredient for Auto-Crafters)
Also retextured the Cargo Motor
|
2021-03-31 19:02:34 +02:00 |
|
TheBusyBiscuit
|
816cc0613b
|
Added "Slimeballs -> Slime Block" recipe to Electric Press
|
2021-03-31 18:31:59 +02:00 |
|
TheBusyBiscuit
|
61f0fa5d0d
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
|
2021-03-31 18:30:04 +02:00 |
|
TheBusyBiscuit
|
32c60ad5ac
|
[CI skip] Refactoring
|
2021-03-31 18:29:43 +02:00 |
|
TheBusyBiscuit
|
0ee724e1e5
|
Merge pull request #2919 from GallowsDove/master
Fixed damageable items not respecting `unbreakable` tag
|
2021-03-31 17:20:50 +02:00 |
|
TheBusyBiscuit
|
5ce2283141
|
[CI skip] Updated changelog
|
2021-03-31 17:20:18 +02:00 |
|
TheBusyBiscuit
|
c3722bcb62
|
Merge pull request #2924 from J3fftw1/feature/empty-message-multiblocks
Added a new message to multiblocks to see if inventory is empty
|
2021-03-31 16:51:54 +02:00 |
|
J3fftw
|
567b5397cf
|
Update src/main/resources/languages/messages_en.yml
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
|
2021-03-31 15:36:19 +02:00 |
|
Jeffrey Kosse
|
5649f95174
|
Added a new message to multiblocks to see if inventory is empty
|
2021-03-31 14:37:24 +02:00 |
|
TheBusyBiscuit
|
f157f96213
|
[CI skip] Merge pull request #2923 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.183
|
2021-03-31 09:32:27 +02:00 |
|
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 |
|
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 |
|